Merge pull request #162 from ITamiokiI/Centcom-airlocks

Добавление Центком доступа, Шкафчика Центком, и новых шлюзов.
AdventureTimeSS14 · Nov 29, 2023 · 7d61e9c · 7d61e9c
2 parents 2b1a286 + 4f2aff4
commit 7d61e9c
Show file tree

Hide file tree

Showing 164 changed files with 1,540 additions and 7 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -73,6 +73,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "Security",
         "Service",
         "Theatre",
+        "Centcom",
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl
@@ -1,4 +1,5 @@
 id-card-access-level-command = Командование
+id-card-access-level-centcom = ЦентКом
 id-card-access-level-captain = Капитан
 id-card-access-level-head-of-personnel = Глава персонала
 id-card-access-level-head-of-security = Глава службы безопасности
@@ -12,7 +13,7 @@ id-card-access-level-atmospherics = Атмосферный
 id-card-access-level-research-director = Научный руководитель
 id-card-access-level-research = Научный
 id-card-access-level-chief-medical-officer = Главный врач
-id-card-access-level-medical = Медотсек
+id-card-access-level-medical = Медицинский
 id-card-access-level-chemistry = Химия
 id-card-access-level-paramedic = Парамедик
 id-card-access-level-quartermaster = Квартирмейстер

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
@@ -25,6 +25,9 @@ ent-AirlockServiceCaptainLocked = { ent-Airlock }
 ent-AirlockExternalLocked = { ent-AirlockExternal }
     .suffix = Внешний, Закрыт
     .desc = { ent-AirlockExternal.desc }
+ent-AirlockExternalCentcomLocked = { ent-AirlockExternal }
+    .suffix = Внешний, Центком, Закрыт
+    .desc = { ent-AirlockExternal.desc }
 ent-AirlockExternalCargoLocked = { ent-AirlockExternal }
     .suffix = Внешний, Карго, Снабжение, Закрыт
     .desc = { ent-AirlockExternal.desc }
@@ -79,6 +82,27 @@ ent-AirlockMedicalScienceLocked = { ent-AirlockScience }
 ent-AirlockCommandLocked = { ent-AirlockCommand }
     .suffix = Командный, Закрыт
     .desc = { ent-AirlockCommand.desc }
+ent-AirlockCentcomLocked = { ent-AirlockCommand }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCentcomClassicLocked = { ent-AirlockCommand }
+    .suffix = Центком, Классический, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCentcomCommandClassicLocked = { ent-AirlockCommand }
+    .suffix = Командный, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCentcomHatchLocked = { ent-AirlockCommand }
+    .suffix = Центком, Раздвижной, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCentcomCommandHatchLocked = { ent-AirlockCommand }
+    .suffix = Командный, Раздвижной, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCorporateLocked = { ent-AirlockCommand }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockCommand.desc }
+ent-AirlockCorporateCommandLocked = { ent-AirlockCommand }
+    .suffix = Командный, Закрыт
+    .desc = { ent-AirlockCommand.desc }
 ent-AirlockCaptainLocked = { ent-AirlockCommand }
     .suffix = Капитан, Закрыт
     .desc = { ent-AirlockCommand.desc }
@@ -124,6 +148,9 @@ ent-AirlockBarGlassLocked = { ent-AirlockGlass }
 ent-AirlockExternalGlassLocked = { ent-AirlockExternalGlass }
     .suffix = Внешний, Стеклянный, Закрыт
     .desc = { ent-AirlockExternalGlass.desc }
+ent-AirlockExternalGlassCentcomLocked = { ent-AirlockExternalGlass }
+    .suffix = Внешний, Стеклянный, Центком, Закрыт
+    .desc = { ent-AirlockExternalGlass.desc }
 ent-AirlockExternalGlassCargoLocked = { ent-AirlockExternalGlass }
     .suffix = Внешний, Стеклянный, Карго, Снабжение, Закрыт
     .desc = { ent-AirlockExternalGlass.desc }
@@ -178,6 +205,15 @@ ent-AirlockMedicalScienceGlassLocked = { ent-AirlockScienceGlass }
 ent-AirlockCommandGlassLocked = { ent-AirlockCommandGlass }
     .suffix = Командный, Закрыт
     .desc = { ent-AirlockCommandGlass.desc }
+ent-AirlockCentcomGlassLocked = { ent-AirlockCommandGlass }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockCommandGlass.desc }
+ent-AirlockCorporateGlassLocked = { ent-AirlockCommandGlass }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockCommandGlass.desc }
+ent-AirlockCorporateCommandGlassLocked = { ent-AirlockCommandGlass }
+    .suffix = Командный, Закрыт
+    .desc = { ent-AirlockCommandGlass.desc }
 ent-AirlockCaptainGlassLocked = { ent-AirlockCommandGlass }
     .suffix = Капитан, Закрыт
     .desc = { ent-AirlockCommandGlass.desc }
@@ -223,6 +259,9 @@ ent-AirlockMaintLocked = { ent-AirlockMaint }
 ent-AirlockMaintGlassLocked = { ent-AirlockMaintGlass }
     .suffix = Закрыт
     .desc = { ent-AirlockMaintGlass.desc }
+ent-AirlockMaintCentcomLocked = { ent-AirlockMaint }
+    .suffix = Центком, Закрыт
+    .desc = { ent-AirlockMaint.desc }
 ent-AirlockMaintSalvageLocked = { ent-AirlockMaint }
     .suffix = Утилизаторы, Закрыт
     .desc = { ent-AirlockMaint.desc }
@@ -295,6 +334,9 @@ ent-AirlockSyndicateNukeopLocked = { ent-AirlockSyndicate }
 ent-AirlockExternalShuttleLocked = { ent-AirlockShuttle }
     .suffix = Внешний, Закрыт
     .desc = { ent-AirlockShuttle.desc }
+ent-AirlockExternalShuttleCentcomLocked = { ent-AirlockShuttle }
+    .suffix = Внешний, Стыковочный, Центком, Закрыт
+    .desc = { ent-AirlockShuttle.desc }
 ent-AirlockExternalShuttleSyndicateLocked = { ent-AirlockShuttle }
     .suffix = Внешний, Стыковочный, Синдикат, Закрыт
     .desc = { ent-AirlockShuttle.desc }
@@ -304,6 +346,9 @@ ent-AirlockExternalShuttleNukeopLocked = { ent-AirlockShuttle }
 ent-AirlockExternalGlassShuttleLocked = { ent-AirlockGlassShuttle }
     .suffix = Внешний, Стеклянный, Стыковочный, Закрыт
     .desc = { ent-AirlockGlassShuttle.desc }
+ent-AirlockExternalGlassShuttleCentcomLocked = { ent-AirlockGlassShuttle }
+    .suffix = Внешний, Центком, Стеклянный, Стыковочный, Закрыт
+    .desc = { ent-AirlockGlassShuttle.desc }
 ent-AirlockExternalGlassShuttleEmergencyLocked = { ent-AirlockGlassShuttle }
     .suffix = Внешний, ШаттлЭвак, Стеклянный, Стыковочный, Закрыт
     .desc = { ent-AirlockGlassShuttle.desc }
@@ -322,3 +367,6 @@ ent-HighSecCaptainLocked = { ent-HighSecDoor }
 ent-HighSecArmoryLocked = { ent-HighSecDoor }
     .suffix = Оружейная, Закрыт
     .desc = { ent-HighSecDoor.desc }
+ent-HighSecCentcomLocked = { ent-HighSecDoor }
+    .suffix = Центком, Закрыт
+    .desc = { ent-HighSecDoor.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
@@ -25,6 +25,18 @@ ent-AirlockScience = { ent-Airlock }
 ent-AirlockCommand = { ent-Airlock }
     .suffix = Командный
     .desc = { ent-Airlock.desc }
+ent-AirlockCentcom = { ent-Airlock }
+    .suffix = Центком
+    .desc = { ent-Airlock.desc }
+ent-AirlockCentcomClassic = { ent-Airlock }
+    .suffix = Центком, Классический
+    .desc = { ent-Airlock.desc }
+ent-AirlockCentcomHatch = { ent-Airlock }
+    .suffix = Центком, Раздвижной
+    .desc = { ent-Airlock.desc }
+ent-AirlockCorporate = { ent-Airlock }
+    .suffix = Корпоративный
+    .desc = { ent-Airlock.desc }
 ent-AirlockSecurity = { ent-Airlock }
     .suffix = СлужбаБезопасности
     .desc = { ent-Airlock.desc }
@@ -59,6 +71,12 @@ ent-AirlockScienceGlass = { ent-AirlockGlass }
 ent-AirlockCommandGlass = { ent-AirlockGlass }
     .desc = { ent-AirlockGlass.desc }
     .suffix = Командный
+ent-AirlockCorporateGlass = { ent-AirlockGlass }
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = Корпоративный
+ent-AirlockCentcomGlass = { ent-AirlockGlass }
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = Центком
 ent-AirlockSecurityGlass = { ent-AirlockGlass }
     .desc = { ent-AirlockGlass.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
@@ -35,6 +35,9 @@ ent-WindoorSecureChemistryLocked = { ent-WindoorSecure }
 ent-WindoorSecureCommandLocked = { ent-WindoorSecure }
     .suffix = Командный, Закрыт
     .desc = { ent-WindoorSecure.desc }
+ent-WindoorSecureCentcomLocked = { ent-WindoorSecure }
+    .suffix = Центком, Закрыт
+    .desc = { ent-WindoorSecure.desc }
 ent-WindoorSecureEngineeringLocked = { ent-WindoorSecure }
     .suffix = Инженерный, Закрыт
     .desc = { ent-WindoorSecure.desc }

diff --git a/...s/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/...s/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
@@ -59,3 +59,11 @@ ent-LockerSyndicatePersonal = оружейный шкаф
 ent-LockerBluespaceStation = блюспейс шкаф
     .desc = Передовая технология шкафчикостроения.
     .suffix = once to station
+ent-LockerCentcom = шкаф ЦентКом
+    .desc = Более дорогая версия обычного шкафчика для хранения. На задней стороне дверцы красуется маленькая надпись "Сделано NanoTrasen".
+ent-LockerRepresentative = шкаф NanoTrasen
+    .desc = Более дорогая версия обычного шкафчика для хранения. На задней стороне дверцы красуется маленькая надпись "Сделано NanoTrasen".
+ent-LockerMime = шкаф мима
+    .desc = { ent-LockerBaseSecure.desc }
+ent-LockerClown = шкаф клоуна
+    .desc = { ent-LockerBaseSecure.desc }
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/airlocks.yml b/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/airlocks.yml
@@ -0,0 +1,72 @@
+- type: entity
+  parent: Airlock
+  id: AirlockCorporate
+  suffix: Corporate
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Standard/corporate.rsi
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+
+- type: entity
+  parent: Airlock
+  id: AirlockCentcomHatch
+  suffix: Centcom, Hatch
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Standard/centcom_hatch.rsi
+  - type: WiresPanel
+  - type: WiresPanelSecurity
+    securityLevel: maxSecurity
+  - type: Wires
+    boardName: wires-board-name-highsec
+    layoutId: HighSec
+
+- type: entity
+  parent: Airlock
+  id: AirlockCentcomClassic
+  suffix: Centcom, Classic
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Standard/centcom_classic.rsi
+  - type: WiresPanel
+  - type: WiresPanelSecurity
+    securityLevel: maxSecurity
+  - type: Wires
+    boardName: wires-board-name-highsec
+    layoutId: HighSec
+
+- type: entity
+  parent: Airlock
+  id: AirlockCentcom
+  suffix: Centcom
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Standard/centcom.rsi
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+
+#Glass
+- type: entity
+  parent: AirlockGlass
+  id: AirlockCorporateGlass
+  suffix: Corporate
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Glass/corporate.rsi
+  - type: PaintableAirlock
+    group: Glass
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockCentcomGlass
+  suffix: Centcom
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Doors/Airlocks/Glass/centcom.rsi
+  - type: PaintableAirlock
+    group: Glass
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -0,0 +1,13 @@
+# Centcom
+- type: entity
+  id: LockerCentcom
+  name: CentCom locker
+  parent: LockerBaseSecure
+  components:
+  - type: Appearance
+  - type: AccessReader
+    access: [["Centcom"]]
+  - type: EntityStorageVisuals
+    stateBaseClosed: cc
+    stateDoorOpen: cc_open
+    stateDoorClosed: cc_door
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/OfficerBlueShield/OfficerBlueSheld.yml b/Resources/Prototypes/ADT/Roles/Jobs/OfficerBlueShield/OfficerBlueSheld.yml
@@ -26,6 +26,7 @@
     - Medical
     - Engineering
     - Cargo
+    - Centcom
     - BlueShield
   special:
   - !type:AddImplantSpecial

diff --git a/Resources/Prototypes/Access/centcom.yml b/Resources/Prototypes/Access/centcom.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Centcom
+  name: id-card-access-level-centcom
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -31,8 +31,42 @@
   - Chapel
   - Hydroponics
   - Atmospherics
+
+- type: accessGroup
+  id: AllAccessCentcom
+  tags:
+  - EmergencyShuttleRepealAll
+  - Captain
+  - HeadOfPersonnel
+  - ChiefEngineer
+  - ChiefMedicalOfficer
+  - HeadOfSecurity
+  - ResearchDirector
+  - Command
+  - Security
+  - Detective
+  - Armory
+  - Brig
+  - Lawyer
+  - Engineering
+  - Medical
+  - Quartermaster
+  - Salvage
+  - Cargo
+  - Research
+  - Service
+  - Maintenance
+  - External
+  - Janitor
+  - Theatre
+  - Bar
+  - Chemistry
+  - Kitchen
+  - Chapel
+  - Hydroponics
+  - Atmospherics
+  - Centcom
   - IAA
   - Magistrate
   - BlueShield
   - Investigator
-
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -455,7 +455,7 @@
     jobIcon: JobIconNanotrasen
   - type: Access
     groups:
-    - AllAccess
+    - AllAccessCentcom
 
 - type: entity
   parent: CentcomIDCard