Workbench-Team · Elst28 · Jun 20, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 20, 2023
diff --git a/Resources/Audio/Items/stationradio.ogg b/Resources/Audio/Items/stationradio.ogg
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
@@ -298,3 +298,9 @@ ent-ClothingUniformJumpsuitHawaiRed = red hawaiian shirt
 ent-ClothingUniformJumpsuitHawaiYellow = yellow hawaiian shirt
     .desc = Yellow as a bright sun.
     .suffix = { "" }
+ent-ClothingUniformHECU = HECU uniform
+    .desc = The HECU jumpsuit is used to protect against foreign environmental factors (besides, real American patriots like to wear it).
+    .suffix = { "" }
+ent-ClothingUniformJumpsuitCitizen = citizen jumpsuit
+    .desc = Jumpsuit that will definitely make you look like a victim.
+    .suffix = { "" }
diff --git a/...ces/Locale/en-US/ss14-ru/prototypes/workbenchteam/entities/objects/fun/station17Radio.ftl b/...ces/Locale/en-US/ss14-ru/prototypes/workbenchteam/entities/objects/fun/station17Radio.ftl
@@ -0,0 +1,3 @@
+ent-Station17Radio = Station 17 radio
+    .desc = It plays the last signal from space station 17.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
@@ -298,3 +298,9 @@ ent-ClothingUniformJumpsuitHawaiRed = красная гавайская руба
 ent-ClothingUniformJumpsuitHawaiYellow = жёлтая гавайская рубашка
     .desc = Yellow as a bright sun.
     .suffix = { "" }
+ent-ClothingUniformHECU = униформа HECU
+    .desc = Комбинезон HECU используется для защиты от посторонних факторов внешней среды (к тому же его любят носить настоящие американские патриоты).
+    .suffix = { "" }
+ent-ClothingUniformJumpsuitCitizen = комбинезон гражданского
+    .desc = Комбинезон, в котором ты точно будешь похожа на жертву.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
@@ -293,7 +293,7 @@ ent-HighSecArmoryLocked = { ent-HighSecDoor }
     .suffix = Оружейная, Закрыт
     .desc = { ent-HighSecDoor.desc }
 ent-AirlockExternalGlassSyndicateLocked = { ent-AirlockExternalGlass }
-    .suffix = Внешний, Синдикат, Закрыт
+    .suffix = Внешний, Стуклянный, Синдикат, Закрыт
     .desc = { ent-AirlockExternalGlass.desc }
 ent-AirlockExternalSyndicateLocked = { ent-AirlockExternal }
     .suffix = Внешний, Синдикат, Закрыт
@@ -309,4 +309,19 @@ ent-AirlockSyndicateGlassLocked = { ent-AirlockSyndicateGlass }
     .desc = { ent-AirlockSyndicateGlass.desc }
 ent-AirlockSyndicateCommandGlassLocked = { ent-AirlockSyndicateCommandGlass }
     .suffix = Синдикат, Командный, Закрыт
-    .desc = { ent-AirlockSyndicateCommandGlass.desc }
+    .desc = { ent-AirlockSyndicateCommandGlass.desc }
+ent-AirlockCentcomLocked = { ent-AirlockCentcom }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockSyndicateCommandGlass.desc }
+ent-AirlockCentcomGlassLocked = { ent-AirlockCentcomGlass }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockSyndicateCommandGlass.desc }
+ent-HighSecCentcomLocked = { ent-HighSecDoor }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockSyndicateCommandGlass.desc }
+ent-AirlockExternalGlassCentcomLocked = { ent-AirlockExternalGlass }
+    .suffix = Внешний, Стеклянный, Центком, Закрыт
+    .desc = { ent-AirlockExternalGlass.desc }
+ent-AirlockExternalCentcomLocked = { ent-AirlockExternal }
+    .suffix = Внешний, Центком, Закрыт
+    .desc = { ent-AirlockExternal.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl
@@ -72,4 +72,10 @@ ent-AirlockSyndicateGlass = { ent-AirlockGlass }
     .suffix = Синдикат
 ent-AirlockSyndicateCommandGlass = { ent-AirlockGlass }
     .desc = { ent-Airlock.desc }
-    .suffix = Синдикат, Командный
+    .suffix = Синдикат, Командный
+ent-AirlockCentcom = { ent-Airlock }
+    .desc = { ent-Airlock.desc }
+    .suffix = Центком
+ent-AirlockCentcomGlass = { ent-AirlockGlass }
+    .desc = { ent-Airlock.desc }
+    .suffix = Центком
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
@@ -81,3 +81,6 @@ ent-WindoorJanitorLocked = { ent-Windoor }
 ent-WindoorHeadOfPersonnelLocked = { ent-WindoorSecure }
     .suffix = Глава Персонала, Закрыто
     .desc = { ent-WindoorSecure.desc }
+ent-WindoorCentcomLocked = { ent-WindoorSecure }
+    .suffix = Центком
+    .desc = { ent-WindoorSecure.desc }
diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/workbenchteam/entities/objects/fun/station17Radio.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/workbenchteam/entities/objects/fun/station17Radio.ftl
@@ -0,0 +1,3 @@
+ent-Station17Radio = Радио станции "Единство"
+    .desc = Оно играет последний сигнал полученый со станции "Единство"
+    .suffix = { "" }
diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml
@@ -1,3 +1,7 @@
+- type: accessLevel
+  id: Centcom
+  name: id-card-access-level-centcom
+
 - type: accessLevel
   id: Command
   name: id-card-access-level-command

diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -1,6 +1,7 @@
 - type: accessGroup
   id: AllAccess
   tags:
+  - Centcom
   - EmergencyShuttleRepealAll
   - Captain
   - HeadOfPersonnel
@@ -30,3 +31,10 @@
   - Chapel
   - Hydroponics
   - Atmospherics
+
+- type: accessGroup
+  id: AllSyndicateAccess
+  tags:
+  - Syndicate
+  - NuclearOperative
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -59,7 +59,7 @@
     ClothingHeadFishCap: 2
     ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
-
+    ClothingUniformJumpsuitCitizen: 2
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
     ClothingNeckScarfStripedSyndieRed: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -17,3 +17,4 @@
     ClothingOuterWinterSec: 2
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
+    ClothingUniformHECU: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1148,3 +1148,25 @@
     sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformHECU
+  name: HECU uniform
+  description: The HECU jumpsuit is used to protect against foreign environmental factors (besides, real American patriots like to wear it)
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hecu.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hecu.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCitizen
+  name: Citizen jumpsuit
+  description: jumpsuit that will definitely make you look like a victim
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/civilian.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/civilian.rsi
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -25,15 +25,6 @@
         - PonderingOrb
         - Skub
         - DrinkMugDog
-        - ClothingNeckLGBTPin
-        - ClothingNeckAromanticPin
-        - ClothingNeckAsexualPin
-        - ClothingNeckBisexualPin
-        - ClothingNeckIntersexPin
-        - ClothingNeckLesbianPin
-        - ClothingNeckNonBinaryPin
-        - ClothingNeckPansexualPin
-        - ClothingNeckTransPin
         - CluwneHorn
         - ClothingMaskRat
       rareChance: 0.01
@@ -129,5 +120,6 @@
         - LidSalami
         - ClothingEyesBlindfold
         - PortalRadio
+        - Station17Radio
       chance: 0.6
       offset: 0.0
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -31,6 +31,7 @@
   - type: Access
     groups:
     - AllAccess
+    - AllSyndicateAccess
   - type: UserInterface
     interfaces:
       - key: enum.SolarControlConsoleUiKey.Key

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -323,3 +323,11 @@
   components:
   - type: AccessStorage
     access: [["NuclearOperative"]]
+
+- type: entity
+  id: DoorElectronicsCentcom
+  parent: DoorElectronics
+  suffix: Centcom
+  components:
+  - type: AccessStorage
+    access: [["Centcom"]]
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -526,6 +526,7 @@
     - state: syndie
   - type: Access
     tags:
+    - NuclearOperative
     - Syndicate
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -131,6 +131,17 @@
     containers:
       board: [ DoorElectronicsAtmospherics ]
 
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalCentcomLocked
+  suffix: External, Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalSyndicateLocked
@@ -274,6 +285,17 @@
     containers:
       board: [ DoorElectronicsMedicalScience ]
 
+- type: entity
+  parent: AirlockCentcom
+  id: AirlockCentcomLocked
+  suffix: Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: AirlockCommand
   id: AirlockCommandLocked
@@ -516,6 +538,17 @@
     containers:
       board: [ DoorElectronicsSyndicate ]
 
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassCentcomLocked
+  suffix: External, Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: AirlockExternalGlass
   id: AirlockExternalGlassAtmosphericsLocked
@@ -670,6 +703,17 @@
     containers:
       board: [ DoorElectronicsCommand ]
 
+- type: entity
+  parent: AirlockCentcomGlass
+  id: AirlockCentcomGlassLocked
+  suffix: Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockCaptainGlassLocked
@@ -1119,6 +1163,17 @@
     - type: GridFill
 
 #HighSecDoors
+- type: entity
+  parent: HighSecDoor
+  id: HighSecCentcomLocked
+  suffix: Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: HighSecDoor
   id: HighSecCommandLocked

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -70,6 +70,14 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/command.rsi
 
+- type: entity
+  parent: Airlock
+  id: AirlockCentcom
+  suffix: Centcom
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/centcom.rsi
+
 - type: entity
   parent: Airlock
   id: AirlockSecurity
@@ -214,6 +222,16 @@
   - type: PaintableAirlock
     group: Glass
 
+- type: entity
+  parent: AirlockGlass
+  id: AirlockCentcomGlass
+  suffix: Cemtcom
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/centcom.rsi
+  - type: PaintableAirlock
+    group: Glass
+
 - type: entity
   parent: AirlockGlass
   id: AirlockCommandGlass
@@ -233,6 +251,7 @@
     sprite: Structures/Doors/Airlocks/Glass/security.rsi
   - type: PaintableAirlock
     group: Glass
+
 - type: entity
   parent: AirlockGlass
   id: AirlockSyndicateGlass

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -190,7 +190,18 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsCommand ]
-
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorCentcomLocked
+  suffix: Centcom, Locked
+  components:
+  - type: AccessReaderBoard
+#    access: [["Centcom"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentcom ]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorCaptainLocked

diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -4,6 +4,7 @@
   stylePaths:
     basic:       Structures/Doors/Airlocks/Standard/basic.rsi
     cargo:       Structures/Doors/Airlocks/Standard/cargo.rsi
+    centcom:     Structures/Doors/Airlocks/Standard/centcom.rsi
     command:     Structures/Doors/Airlocks/Standard/command.rsi
     engineering: Structures/Doors/Airlocks/Standard/engineering.rsi
     freezer:     Structures/Doors/Airlocks/Standard/freezer.rsi
@@ -20,6 +21,7 @@
   stylePaths:
     basic:       Structures/Doors/Airlocks/Glass/basic.rsi
     command:     Structures/Doors/Airlocks/Glass/command.rsi
+    centcom:     Structures/Doors/Airlocks/Glass/centcom.rsi
     science:     Structures/Doors/Airlocks/Glass/science.rsi
     cargo:       Structures/Doors/Airlocks/Glass/cargo.rsi
     engineering: Structures/Doors/Airlocks/Glass/engineering.rsi

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1774,6 +1774,8 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: AccessReader
+    access: [["Centcom"]]
   - type: PointLight
     radius: 1.5
     energy: 1.6