Skip to content

Refurbished Combat Information Centre (2) - USS Almayer#12626

Open
Steelpoint wants to merge 5 commits into
cmss13-devs:masterfrom
Steelpoint:CICV2
Open

Refurbished Combat Information Centre (2) - USS Almayer#12626
Steelpoint wants to merge 5 commits into
cmss13-devs:masterfrom
Steelpoint:CICV2

Conversation

@Steelpoint

Copy link
Copy Markdown
Contributor

About the pull request

This PR refurbishes the CIC of the Almayer, updating it with a newer design.

Remake of: #12560 due to merge conflicts

Content wise the CIC retains the same items and equipment as the current CIC possesses, however this CIC features two additional Overwatch stations, currently they are surplus to requirement but they may be used by CICs for additional squads (Intel, Echo or Foxtrot), for the future they can be used for support squads.

Drathek has also provided code changes to prevent people from being able to use Alt-Click to interact with certain vendors/items that are underneath false walls.

Explain why it's good for the game

The intention of this redesign is three fold.

  • Future proofs the CIC for future content updates, such as the A.S.S. system.
  • Hopes to improve internal CIC communication and coordination between Staff Officers and the Commander.
  • Improves the aesthetic disposition of the CIC to make it feel more of a commander bunker for the senior heads and command staff.

This design is being worked with CO and other relevant stakeholder players/maintainers to ensure a broad amount of support is behind it for its addition.

Testing Photographs and Procedure

Screenshots & Videos

In-game view of CIC.
ssda

View of the armory being opened.

test_armory.mp4

Changelog

🆑 Steelpoint, Drathek
code: Closets and cm_vending vendors now are not interactable when they are in the same tile as a dense door (allowing them to be hidden in the door's tile)
maptweak: The Combat Information Centre of the USS Almayer has been refurnished and overhauled.
maptweak: An additional two Overwatch stations have been installed in the CIC.
maptweak: The CIC armory has been concealed within the CIC for ease of comfort.
maptweak: The Identification and Squad Change computers have been relocated to the reception area. This is to ensure the security of the CIC, as now non-USCM personnel do not need to enter CIC proper to receive formal USCM clearance/identification.
maptweak: The CIC lockdown has been changed from a single overall lockdown, to three different tiers of lockdown. The external blast doors that lead into the general CIC adjacent corridors are now the External Lockdown. The blastdoors that prevent entry into the main CIC area is now the Interior Lockdown, with the final lockdown being reserved for the central command bunker. This will permit CIC staff to better control how they wish to secure the CIC during an emergency.
/:cl:

@Steelpoint
Steelpoint requested a review from Nanu308 as a code owner July 12, 2026 07:48
@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Jul 12, 2026
@cmss13-ci cmss13-ci Bot added Mapping did you remember to save in tgm format? Code Improvement Make the code longer size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. labels Jul 12, 2026
7d3a096: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cm13-github

cm13-github commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

Test merge deployment history:

Test Merge Deployed @ 07/12/2026 14:29:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: a7286eb
Pull Request: 8eee928
Server: 3e2503c

Test Merge Updated @ 07/13/2026 03:51:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: f13ad67
Pull Request: 8eee928
Server: 86f527ec67832df2274e76d6ce736e080058ae87

Test Merge Updated @ 07/13/2026 12:53:38 +00:00:
Server Instance

CM13 Live

Revision

Origin: f13ad67
Pull Request: f8b8a4e
Server: 1b07c7a

Test Merge Updated @ 07/13/2026 22:56:43 +00:00:
Server Instance

CM13 Live

Revision

Origin: bc766ac
Pull Request: f8b8a4e
Server: 8ba2aa436044d50e4164e7ab5429939b3d01e48a

Test Merge Updated @ 07/14/2026 00:57:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: 81ef6b1
Pull Request: f8b8a4e
Server: 0fe9c1ef382e605e28e59deb1b4bea378193c157

Test Merge Updated @ 07/14/2026 01:28:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 81ef6b1
Pull Request: f8b8a4e
Server: d1845c9

Test Merge Updated @ 07/14/2026 02:59:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: b98bd5e
Pull Request: f8b8a4e
Server: b3bf76c928111139dff83e2d7fec28778776400d

Test Merge Updated @ 07/14/2026 06:01:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6032ee8
Pull Request: f8b8a4e
Server: 9cd98972ae6fcee0e947c15a7db1e251f3e7f76d

Test Merge Updated @ 07/14/2026 12:07:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: 6032ee8
Pull Request: f8b8a4e
Server: 38e1f20

Test Merge Updated @ 07/14/2026 13:03:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 75d6fba
Pull Request: f8b8a4e
Server: bd852761806b8662cf3444fe7c075d61d08300d6

Test Merge Updated @ 07/15/2026 03:08:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: 27e8bd5
Pull Request: f8b8a4e
Server: 9f78e765d74aa942f0be0d294c2cb649aa132a4a

Test Merge Updated @ 07/16/2026 01:44:52 +00:00:
Server Instance

CM13 Live

Revision

Origin: 27e8bd5
Pull Request: f8b8a4e
Server: 03d4259

Test Merge Updated @ 07/16/2026 03:16:07 +00:00:
Server Instance

CM13 Live

Revision

Origin: 27e8bd5
Pull Request: f8b8a4e
Server: 31b7de3

Test Merge Updated @ 07/16/2026 05:17:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 27e8bd5
Pull Request: f8b8a4e
Server: 83971d7

Test Merge Updated @ 07/16/2026 06:18:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: bbc523c
Pull Request: f8b8a4e
Server: 6bcf5f30502efbdc9823841147d82cb498ce7181

Test Merge Updated @ 07/16/2026 07:19:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: bbc523c
Pull Request: f8b8a4e
Server: 0f1ddae

Test Merge Updated @ 07/16/2026 11:51:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: bbc523c
Pull Request: f8b8a4e
Server: 9795ad7

Test Merge Updated @ 07/17/2026 00:08:37 +00:00:
Server Instance

CM13 Live

Revision

Origin: bbc523c
Pull Request: f8b8a4e
Server: 29f87fa

Test Merge Updated @ 07/17/2026 06:57:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2edb173
Pull Request: f8b8a4e
Server: df663d68a79baa9df8bebe80a4d9711300725228

Test Merge Updated @ 07/17/2026 20:27:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2edb173
Pull Request: f8b8a4e
Server: 1ddf415

Test Merge Updated @ 07/18/2026 03:05:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: f8b8a4e
Server: bdf9fe128758200c72f5555bc77cc94d2d067e6f

Test Merge Updated @ 07/18/2026 04:04:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: f8b8a4e
Server: 62b2c3b

Test Merge Updated @ 07/18/2026 09:08:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: a212c0e
Server: e77d0d2

Test Merge Updated @ 07/18/2026 13:26:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: a212c0e
Server: f09f6ee

Test Merge Updated @ 07/18/2026 14:11:21 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: a212c0e
Server: 21b09b4

Test Merge Updated @ 07/18/2026 15:18:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: a212c0e
Server: cf0ce73

Test Merge Updated @ 07/18/2026 16:11:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8f06b5c
Pull Request: a212c0e
Server: 42b5963

Test Merge Updated @ 07/19/2026 05:15:51 +00:00:
Server Instance

CM13 Live

Revision

Origin: 236040e
Pull Request: a212c0e
Server: 4bb6b9e67ab477c644efb963683e637d65756bcb

Test Merge Updated @ 07/19/2026 08:17:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: a212c0e
Server: ef14afe0b104c2f0ba3dd346d4427075b8df2806

Test Merge Updated @ 07/19/2026 13:44:35 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: a212c0e
Server: ae73755

Test Merge Updated @ 07/19/2026 15:20:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: 36e499a
Pull Request: a212c0e
Server: bba7789

Test Merge Updated @ 07/19/2026 17:21:49 +00:00:
Server Instance

CM13 Live

Revision

Origin: a53136d
Pull Request: a212c0e
Server: 9c7ac020e9b5579222f1b32114e3dd14533f70a4

Test Merge Updated @ 07/20/2026 03:55:36 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0bdad2e
Pull Request: a212c0e
Server: 83b0e90edb7d2d4c41ca87ea36018f187fcbca6c

Test Merge Updated @ 07/20/2026 15:00:04 +00:00:
Server Instance

CM13 Live

Revision

Origin: 0bdad2e
Pull Request: 16d5f0a
Server: 7a0b9b7

Test Merge Updated @ 07/20/2026 17:31:53 +00:00:
Server Instance

CM13 Live

Revision

Origin: d868ecf
Pull Request: 16d5f0a
Server: 2798a09150618681cd1ea768d8625a220f7c174f

Test Merge Updated @ 07/20/2026 18:02:45 +00:00:
Server Instance

CM13 Live

Revision

Origin: bcf2ba5
Pull Request: 16d5f0a
Server: 36e496a065632a3fba3030883b61fa6a4192c8f3

Test Merge Updated @ 07/20/2026 18:33:37 +00:00:
Server Instance

CM13 Live

Revision

Origin: bcd8a3f
Pull Request: 16d5f0a
Server: 59f1a998f5a4b1dba1ca702f165dfc95ec207cf8

Test Merge Updated @ 07/21/2026 03:37:14 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 16d5f0a
Server: cfd3b89312c445cdf6fbc9aa040e7c2bd3ee4097

Test Merge Updated @ 07/21/2026 09:03:03 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 16d5f0a
Server: bcd732b

Test Merge Updated @ 07/21/2026 10:10:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 16d5f0a
Server: add6cc8

Test Merge Updated @ 07/21/2026 10:27:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 16d5f0a
Server: c1199db

Test Merge Updated @ 07/21/2026 14:22:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: f572452
Pull Request: 16d5f0a
Server: a01ad4e

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Improvement Make the code longer Mapping did you remember to save in tgm format? size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files.

Projects

Status: Awaiting Review

Development

Successfully merging this pull request may close these issues.

2 participants