The blue shield and the magistrate, as well as the change of the deba…

…glient logo Together with Rinary
Rxup · Feb 26, 2024 · 751a172 · 751a172
1 parent 4a141ca
commit 751a172
Show file tree

Hide file tree

Showing 72 changed files with 617 additions and 13 deletions.
diff --git a/Resources/Locale/ru-RU/backmen/job/job-names.ftl b/Resources/Locale/ru-RU/backmen/job/job-names.ftl
@@ -1,3 +1,5 @@
 job-name-fugitive = Беглец
 job-name-prisoner = Заключенный
-job-name-roboticist = Робототехник
+job-name-roboticist = Робототехник
+job-name-blueshield = Офицер Синий Щит
+job-name-magistrat = Магистрат
diff --git a/Resources/Locale/ru-RU/backmen/job/nyano-desc.ftl b/Resources/Locale/ru-RU/backmen/job/nyano-desc.ftl
@@ -1,2 +1,4 @@
 job-description-prisoner = Сидеть в тюрьме. Играйте с сокамерниками. Поговорите с надзирателем. Напишите свои мемуары.
 job-description-roboticist = Создавайте услужливых работников или машин для убийств.
+job-description-blueshield = Ваша задача охранять и спасать глав и капитана, вы показатель порядка, смелости и крепкости на этой станции.
+job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
diff --git a/Resources/Locale/ru-RU/backmen/prototypes/entities/structures/furniture/chairs.ftl b/Resources/Locale/ru-RU/backmen/prototypes/entities/structures/furniture/chairs.ftl
@@ -0,0 +1,8 @@
+nt-LeatherSofaCorner = Кожаный Диван
+    .desc = Угол Кожаного Дивана
+ent-LeatherSofaLeft = Кожаный Диван
+    .desc = Левая Часть Кожаного Дивана
+ent-LeatherSofaMiddle = Кожаный Диван
+    .desc = Центр Кожаного Дивана
+ent-LeatherSofaRight = Кожаный Диван
+    .desc = Правая Часть Кожаного Дивана
diff --git a/...s/Locale/ru-RU/backmen/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/...s/Locale/ru-RU/backmen/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
@@ -0,0 +1,2 @@
+ent-LockerBlueShield = Шкаф СинегоЩита
+    .desc = { ent-LockerBaseSecure.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/catalog/fills/locker/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/catalog/fills/locker/suit_storage.ftl
@@ -4,3 +4,6 @@ ent-SuitStorageCentcomCarporatHardsuit = { ent-SuitStorageBase }
 ent-SuitStorageCargoEVAHardsuit = { ent-SuitStorageBase }
     .suffix = EVA cargo
     .desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageBlueshield = { ent-SuitStorageBase }
+    .suffix = Blueshield
+    .desc = { ent-SuitStorageBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/catalog/fills/locker/wardrobe_job.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/catalog/fills/locker/wardrobe_job.ftl
@@ -1,3 +1,6 @@
 ent-WardrobeCargoPostalFilled = { ent-WardrobeCargoPostal }
     .desc = This locker? Maybe move it to the place of profit?.
     .suffix = Filled
+ent-WardrobeBlueshieldFilled = { ent-LockerBlueShield }
+    .desc = { ent-LockerBlueShield.desc }
+    .suffix = Filled
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/eyes/glasses.ftl
@@ -1,4 +1,6 @@
 ent-ClothingEyesGlassesMonocle = Монокль аристократа.
     .desc = Монокль является признаком высокого происхождения и интелекта.
 ent-ClothingEyesGlassesWelding = Сварочные Очки
-    .desc = Это сварочные очки. Это небольшой предмет. Защищает глаза от сварщиков.
+    .desc = Это сварочные очки. Это небольшой предмет. Защищает глаза от сварщиков.
+ent-ClothingEyesGlassesSunglassesMed = медецинские Солнцезащитные очки
+    .desc = Солнцезащитные очки с медецинским визором
diff --git a/...urces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/head/hardsuit-helmets.ftl b/...urces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/head/hardsuit-helmets.ftl
@@ -10,3 +10,5 @@ ent-ClothingHeadHelmetHardsuitMystagogue = шлем защитного кост
     .desc = Легкий шлем скафандра, оснащенный первой в галактике системой псионического прохождения.
 ent-ClothingHeadHelmetHardsuitUEG = Шлем скафандра охраны ОПЗ
     .desc = Этот шлем был нагло скопирован с шлема лидера ОБР NanoTrasen
+ent-ClothingHeadHelmetHardsuitBlueshield = Шлем скафандра синего щита
+    .desc = Усиленный Шлем Скафандра, сделан для синего щита
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/head/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/head/masks.ftl
@@ -20,3 +20,5 @@ ent-ClothingihsGasmask = Противогаз IHS
 ent-ClothingMaskblacksilense = Трофейная маска черной тишины
     .desc = Маска знаменитого охотника по прозвищу Черная тишина. Источает отчаяние.
     .suffix = Одежда
+ent-ClothingMaskGasBlueSwat = Синий противогаз спецназа
+    .desc = Элитный противогаз Службы безопасности.
diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/outerclothing/hardsuits.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/clothing/outerclothing/hardsuits.ftl
@@ -8,3 +8,5 @@ ent-ClothingOuterHardsuitCentcomCarporate = Скафандр ЦК (Корпор
     .desc = Специальный космический костюм Корпорат сделаный для различных ситуация и весьма лёгкий в ношении.
 ent-ClothingOuterHardsuitUEG = Скафандр С.О.Н
     .desc = Обычный скафандр С.О.Н который выдаётся оперативникам С.О.Н и некоторым офицерам ОПЗ
+ent-ClothingOuterHardsuitBlueshield = Скафандр Синего Щита
+    .desc = Бронированный Скафандр, Сделанный для Синего Щита.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/markers/spawners/jobs.ftl
@@ -17,4 +17,8 @@ ent-SpawnPointDelivery = Доставщик
 ent-SpawnPointPrisoner = Заключенный
     .desc = { ent-SpawnPointJobBase.desc }
 ent-SpawnPointRoboticist = Робототехник
-    .desc = { ent-SpawnPointJobBase.desc }
+    .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointBlueshield = Синий Щит
+    .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointMagistrat = Магистрат
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/pda.ftl
@@ -4,3 +4,5 @@ ent-DeliveryPDA = КПК доставщика
     .desc = Пахнет пиццой
 ent-PrisonerPDA = КПК заключённого
     .desc = Чисто, чтобы вы могли убедиться, что внутри нет ничего контрабандного.
+ent-BlueshieldPDA = КПК Синего щита
+    .desc = { ent-CaptainPDA.desc }
diff --git a/...s/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/misc/indentification_cards.ftl b/...s/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/misc/indentification_cards.ftl
@@ -10,3 +10,5 @@ ent-UEGrepIDCard = ID карта представителя ОПЗ
     .desc = { ent-IDCardStandard.desc }
 ent-UEGoffIDCard = ID карта офицера ОПЗ
     .desc = { ent-IDCardStandard.desc }
+ent-BlueshieldIDCard = ID карта Синего Щита
+    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -32,3 +32,4 @@
   - Chapel
   - Hydroponics
   - Atmospherics
+  - Blueshield #Backmen
diff --git a/Resources/Prototypes/Backmen/Access/centcom.yml b/Resources/Prototypes/Backmen/Access/centcom.yml
@@ -14,6 +14,14 @@
   id: CCAdmiral
   name: ЦК Адмирал
 
+- type: accessLevel
+  id: Blueshield
+  name: id-card-access-level-blueshield
+
+- type: accessLevel
+  id: Magistrat
+  name: id-card-access-level-magistrat
+
 - type: accessGroup
   id: CentCom
   tags:
@@ -22,4 +30,6 @@
   - CentralCommand
   - CCOfficer
   - CCAdmiral
+  - Magistrat
+  - Blueshield
 
diff --git a/Resources/Prototypes/Backmen/Catalog/Fills/Locker/suit_storage.yml b/Resources/Prototypes/Backmen/Catalog/Fills/Locker/suit_storage.yml
@@ -13,11 +13,25 @@
 - type: entity
   id: SuitStorageCargoEVAHardsuit
   parent: SuitStorageBase
-  suffix: EVA cargo 
+  suffix: EVA cargo
   components:
   - type: StorageFill
     contents:
         - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCargoEVA
-        - id: ClothingMaskBreath
+        - id: ClothingMaskBreath
+
+- type: entity
+  id: SuitStorageBlueshield
+  parent: SuitStorageBase
+  suffix: Blueshield
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingOuterHardsuitBlueshield
+        - id: ClothingMaskGasSecurity
+  - type: AccessReader
+    access: [["Blueshield"]]
diff --git a/Resources/Prototypes/Backmen/Catalog/Fills/Locker/wardrobe_job.yml b/Resources/Prototypes/Backmen/Catalog/Fills/Locker/wardrobe_job.yml
@@ -12,4 +12,18 @@
        - id: ClothingShoesColorBlack
        - id: ClothingUniformJumpskirtCargoPostal
        - id: ClothingHandsGlovesFingerless
-       - id: BoxFolderYellow
+       - id: BoxFolderYellow
+
+ - type: entity
+   id: WardrobeBlueshieldFilled
+   suffix: Filled
+   parent: LockerBlueShield
+   components:
+   - type: StorageFill
+     contents:
+       - id: BriefcaseBrown
+       - id: ClothingBeltSecurityFilled
+       - id: MedkitAdvancedFilled
+       - id: ClothingMaskGasSecurity
+       - id: FlashlightSeclite
+       - id: ClothingMaskGasBlueSwat
diff --git a/Resources/Prototypes/Backmen/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Backmen/Entities/Clothing/Eyes/glasses.yml
@@ -25,4 +25,25 @@
   - type: Tag
     tags:
     - HamsterWearable
-    - WhitelistChameleon
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesSunglassesMed
+  name: medical HUDSunglasses
+  description: Sunglasses with a medical HUD.
+  components:
+  - type: Sprite
+    sprite: Backmen/Clothing/Eyes/Glasses/sunglasseshudmed.rsi
+  - type: Clothing
+    sprite: Backmen/Clothing/Eyes/Glasses/sunglasseshudmed.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
diff --git a/Resources/Prototypes/Backmen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Backmen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -138,3 +138,19 @@
         Piercing: 0.9
         Heat: 0.9
         Radiation: 0.9
+
+#Blueshield Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSecurity
+  id: ClothingHeadHelmetHardsuitBlueshield
+  noSpawn: true
+  name: Blueshield's hardsuit helmet
+  description: Strong hardsuit helmet, made for the blueshield.
+  components:
+  - type: PointLight
+    color: "#daffad"
+  - type: BreathMask
+  - type: Sprite
+    sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi
+  - type: Clothing
+    sprite: Backmen/Clothing/Head/Hardsuits/blueshield.rsi
diff --git a/Resources/Prototypes/Backmen/Entities/Clothing/Head/masks.yml b/Resources/Prototypes/Backmen/Entities/Clothing/Head/masks.yml
@@ -139,3 +139,14 @@
     sprite: Backmen/Clothing/Head/Masks/blacksilense.rsi
   - type: Clothing
     sprite: Backmen/Clothing/Head/Masks/blacksilense.rsi
+
+- type: entity
+  parent: ClothingMaskGasExplorer
+  id: ClothingMaskGasBlueSwat
+  name: swat blue gas mask
+  description: A elite issue Security gas mask.
+  components:
+  - type: Sprite
+    sprite: Backmen/Clothing/Head/Masks/swat_blue.rsi
+  - type: Clothing
+    sprite: Backmen/Clothing/Head/Masks/swat_blue.rsi
diff --git a/Resources/Prototypes/Backmen/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Backmen/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -160,3 +160,29 @@
     sprintModifier: 0.85
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitUEG
+
+#Blueshield Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitCap
+  id: ClothingOuterHardsuitBlueshield
+  name: blueshield's armored spacesuit
+  description: Armored spacesuit, made for the blueshield.
+  components:
+  - type: Sprite
+    sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi
+  - type: Clothing
+    sprite: Backmen/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.4
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.5
+        Heat: 0.3
+        Radiation: 0.4
+        Caustic: 0.5
+        Stun: 0.4
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitBlueshield
diff --git a/Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml
@@ -332,3 +332,31 @@
     - state: ai
     - state: jobicon
       sprite: Backmen/Markers/jobs.rsi
+
+- type: entity
+  id: SpawnPointBlueshield
+  parent: SpawnPointJobBase
+  name: Blueshield
+  components:
+  - type: SpawnPoint
+    job_id: Blueshield
+  - type: Sprite
+    sprite: Backmen/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: blueshield
+      - state: jobicon
+
+- type: entity
+  id: SpawnPointMagistrat
+  parent: SpawnPointJobBase
+  name: Magistrat
+  components:
+  - type: SpawnPoint
+    job_id: Magistrat
+  - type: Sprite
+    sprite: Backmen/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: magistrat
+      - state: jobicon
diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Backmen/Entities/Objects/Devices/pda.yml
@@ -30,7 +30,7 @@
     - type: Icon
       sprite: Backmen/Objects/Devices/pda.rsi
       state: pda-orden
-      
+
 - type: entity
   parent: BasePDA
   id: DeliveryPDA
@@ -63,7 +63,7 @@
     - type: Icon
       sprite: Backmen/Objects/Devices/pda.rsi
       state: pda-Delivery
-      
+
 
 - type: entity
   parent: BasePDA
@@ -106,4 +106,42 @@
           - Write
     - type: Icon
       sprite: Backmen/Objects/Devices/pda.rsi
-      state: pda-Roboticist
+      state: pda-Roboticist
+
+- type: entity
+  parent: CaptainPDA
+  id: BlueshieldPDA
+  name: blueshield PDA
+  components:
+  - type: Pda
+    id: BlueshieldIDCard
+    state: pda-captain
+    penSlot:
+      startingItem: Pen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#7C5D00"
+  - type: Icon
+    state: pda-captain
+
+- type: entity
+  parent: CaptainPDA
+  id: MagistratPDA
+  name: magistrat PDA
+  components:
+  - type: Pda
+    id: MagistratIDCard
+    state: pda-captain
+    penSlot:
+      startingItem: Pen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: PdaBorderColor
+    borderColor: "#7C5D00"
+  - type: Icon
+    state: pda-captain
diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Backmen/Entities/Objects/Misc/identification_cards.yml
@@ -71,3 +71,28 @@
         - state: idfreelancer
     - type: PresetIdCard
       job: Freelancer
+
+#Blue Shield and Magistrate
+- type: entity
+  parent: IDCardStandard
+  id: BlueshieldIDCard
+  name: Blueshield ID Card
+  components:
+    - type: Sprite
+      layers:
+        - state: silver
+        - state: idblueshield
+    - type: PresetIdCard
+      job: Blueshield
+
+- type: entity
+  parent: IDCardStandard
+  id: MagistratIDCard
+  name: Magistrate ID Card
+  components:
+    - type: Sprite
+      layers:
+        - state: silver
+        - state: idiaa
+    - type: PresetIdCard
+      job: Magistrat
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-LockerBlueShield = Шкаф СинегоЩита
		.desc = { ent-LockerBaseSecure.desc }