733 (#88)

AdventureTimeSS14/space_station#733 Перенос противогаза СИ, и цели на него для Вора no cl --------- Co-authored-by: Alazell <[email protected]> Co-authored-by: Schrodinger71 <[email protected]> Co-authored-by: Schrödinger <[email protected]>
AdventureTimeSS14 · Aug 7, 2024 · 4da24dc · 4da24dc
1 parent 4301274
commit 4da24dc
Show file tree

Hide file tree

Showing 11 changed files with 366 additions and 1 deletion.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl
@@ -0,0 +1,13 @@
+### TODO: Для переносимых масок оставил, нужно будет доделать при переносе
+###ent-ADTClothingMaskGasLapkeeSet = белый противогаз СБ
+###    .desc = Не стандартный, но тем не менее одобренный ЦентКоммом очень плотно прилегающий к лицу противогаз с повышенной защитой от жары, взамен не защищающий от ударов тупыми предметами по лицу.
+###    .suffix = { "Именное, Lapkee" }
+###ent-ADTClothingMaskBorodaDedMoroz = Борода и усы Дед Мороза
+###    .desc = Борода Деда Мороза с усами люкс качества, позволит создать вам полный образ Деда Мороза или Санта Клауса. Дети не узнают папу, соседа, или актера.
+###    .suffix = { "Новый Год" }
+###    
+###ent-ADTChronosMask = визор "Жертва Хроноса"
+###    .desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К.
+###
+ent-ADTClothingMaskGasCE = противогаз старшего инженера
+    .desc = Это элитный противогаз Старшего Инженера, которому может позавидовать даже Центральное Командование. Защищает от сварки.
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml
@@ -0,0 +1,288 @@
+# TODO: Не стал удалять прототипы, можно будет их по нужде в будущем переносить, или все сразу скопом
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTJasonHockeyMask
+#   name: hockey mask of maniac
+#   description: hockey mask of maniac
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/jason.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/jason.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTSquidGameWorkerMask
+#   name: squid game worker mask
+#   description: squid game worker mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/squidgame_worker.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/squidgame_worker.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTSquidGameSoldierMask
+#   name: squid game soldier mask
+#   description: squid game soldier mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/squidgame_soldier.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/squidgame_soldier.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTSquidGameManagerMask
+#   name: squid game manager mask
+#   description: squid game manager mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/squidgame_manager.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/squidgame_manager.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# - type: entity
+#   parent: WeldingMaskBase
+#   id: ADTClothingHeadHatTagilla
+#   name: Tagilla mask
+#   description: Tagilla mask
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/tagilla_mask.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/tagilla_mask.rsi
+#   - type: Armor
+#     modifiers:
+#       coefficients:
+#         Piercing: 0.95
+#         Heat: 0.95
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTClothingHeadHatClownArmor
+#   name: ballistic mask of a psychopathic clown
+#   description: OMFG YOU DO NOT KILL CLOWN! CLOWN KILLS YOU!
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/clownballistic_mask.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/clownballistic_mask.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+#   - type: Armor
+#     modifiers:
+#       coefficients:
+#         Piercing: 0.95
+#         Heat: 0.95
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTMichaelMyersMask
+#   name: Michael Myers mask
+#   description: Michael Myers mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/michael_myersmask.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/michael_myersmask.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# # PayDay2 mask
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTPayDayChainsMask
+#   name: squid game worker mask
+#   description: squid game worker mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/payday_chains.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/payday_chains.rsi
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTPayDayDallasMask
+#   name: squid game worker mask
+#   description: squid game worker mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/payday_dallas.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/payday_dallas.rsi
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTPayDayHoustonMask
+#   name: squid game worker mask
+#   description: squid game worker mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/payday_houston.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/payday_houston.rsi
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTPayDayWolfMask
+#   name: squid game worker mask
+#   description: squid game worker mask
+#   suffix: Halloween
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/payday_wolf.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/payday_wolf.rsi
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskGasSecurity
+#   id: ADTClothingMaskGasLapkeeSet
+#   name: white sec mask
+#   description: white sec mask
+#   suffix: Personal, Lapkee
+#   components:
+#   - type: BreathMask
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/lapkeeset_mask.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/lapkeeset_mask.rsi
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTClothingMaskBorodaDedMoroz
+#   suffix: New Year
+#   name: Boroda ded moroz
+#   description: Boroda ded moroz
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/ded_morozsetboroda.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/ded_morozsetboroda.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskBase
+#   id: ADTChronosMask
+#   name: chronos victim mask
+#   description: chronos victim mask
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/chronosvisor.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/chronosvisor.rsi
+#   - type: BreathMask
+#   - type: ShowSecurityIcons
+#   - type: FlashImmunity
+#   - type: EyeProtection
+#     protectionTime: 5
+
+# #противогаз СССП
+
+# - type: entity
+#   parent: ClothingMaskGasSyndicate
+#   id: ADTClothingMaskGasUSSP
+#   name: PMG-40 gasmask
+#   description: The gas mask of the army of USSP.
+#   suffix: USSP
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/usspgasmask.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/usspgasmask.rsi
+#   - type: Tag
+#     tags:
+#     - HidesHair
+#   - type: ShowSecurityIcons
+
+# - type: entity
+#   parent: ClothingMaskGasSecurity
+#   id: ADTClothingMaskGasDarkRavenFriskis
+#   suffix: Only Friskis
+#   name: raven gas mask
+#   description: raven gas mask
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Mask/raven.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Mask/raven.rsi
+#     clothingVisuals:
+#       mask:
+#       - state: equipped-MASK
+#       - state: equipped-MASK-unshaded
+#         shader: unshaded
+#   - type: BreathMask
+
+# - type: entity
+#   parent: ClothingMaskGas
+#   id: ADTClothingMaskGasIlisium
+#   name:  gas mask
+#   description: A close-fitting tactical mask that can be connected to an air supply.
+#   components:
+#   - type: Sprite
+#     sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi
+#   - type: Clothing
+#     sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi
+#   - type: FlashImmunity
+#   - type: EyeProtection
+#     protectionTime: 5
+
+- type: entity
+  parent: ClothingMaskGasAtmos
+  id: ADTClothingMaskGasCE
+  name: Chief Engineer's gas mask
+  description: This is an elite gas mask of the chief engineer, which even Centcom can envy. Protects against welding.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Mask/gasCE.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Mask/gasCE.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Caustic: 0.90
+        Radiation: 0.80
+        Heat: 0.80
+  - type: StealTarget
+    stealGroup: ADTClothingMaskGasCE
diff --git a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml
@@ -0,0 +1,21 @@
+# TODO: В будущем перенести закоменченные прототипы
+# - type: stealTargetGroup
+#   id: NesGravityGeneratorCore
+#   name: гравитационное ядро
+#   sprite:
+#     sprite: NES/GraviCore.rsi
+#     state: GraviCore
+
+# - type: stealTargetGroup
+#   id: MobileDefibrillator
+#   name: переносной дефибриллятор
+#   sprite:
+#     sprite: ADT/Objects/Specific/Medical/mobile_defib.rsi 
+#     state: icon
+
+- type: stealTargetGroup
+  id: ADTClothingMaskGasCE
+  name: CE's elite gas mask
+  sprite:
+    sprite: ADT/Clothing/Mask/gasCE.rsi
+    state: icon
diff --git a/Resources/Prototypes/ADT/Objectives/thief.yml b/Resources/Prototypes/ADT/Objectives/thief.yml
@@ -0,0 +1,11 @@
+- type: entity
+  noSpawn: true
+  parent: BaseThiefStealObjective
+  id: ADTClothingMaskGasCEStealObjective
+  components:
+  - type: NotJobRequirement
+    job: StationEngineer
+  - type: StealCondition
+    stealGroup: ADTClothingMaskGasCE
+  - type: Objective
+    difficulty: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -144,7 +144,6 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitEngineeringWhite
-      - id: ClothingMaskBreath
       - id: ClothingEyesGlassesMeson
       - id: ClothingBeltChiefEngineerFilled
       - id: ClothingShoesBootsMagAdv
@@ -159,6 +158,12 @@
       - id: AccessConfigurator
       - id: RCD
       - id: RCDAmmo
+      # Start-ADT Tweak
+      - id: OxygenTankFilled
+      - id: NitrogenTankFilled
+      - id: ClothingNeckCloakCe
+      - id: ADTClothingMaskGasCE
+      # End-ADT Tweak
 
 - type: entity
   id: LockerChiefEngineerFilled

diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -78,6 +78,7 @@
     ClothingHeadsetAltMedicalStealObjective: 1
     FireAxeStealObjective: 1                            #eng
     AmePartFlatpackStealObjective: 1
+    ADTClothingMaskGasCEStealObjective: 1    # ADT Tweak: add gas mask CE
     ExpeditionsCircuitboardStealObjective: 1            #sup
     CargoShuttleCircuitboardStealObjective: 1
     SalvageShuttleCircuitboardStealObjective: 1

diff --git a/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/equipped-MASK.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/inhand-left.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/inhand-right.png
diff --git a/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/gasCE.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Username228 (#serj3428)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}