added new suits to storage with access

FFATroop · Feb 26, 2024 · a61fb7c · a61fb7c
1 parent 14fb14d
commit a61fb7c
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 22 deletions.
diff --git a/Resources/Prototypes/TS/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/TS/Catalog/Fills/Lockers/suit_storage.yml
@@ -12,7 +12,7 @@
     - id: ClothingMaskGas
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
+    access: [["Marine"]]
 
 # New
 - type: entity
@@ -26,11 +26,10 @@
     - id: OxygenTankFilled
     - id: ClothingOuterHardsuitOBS4Marine
     - id: ClothingHelmetHardsuitOBH4Marine
-    #- id: ClothingMaskGas
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
-    
+    access: [["Marine"]]
+
 - type: entity
   id: SuitStorageMarinePilot
   suffix: OBS-4, Pilot
@@ -44,8 +43,23 @@
     - id: ClothingHelmetHardsuitOBH4Pilot
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
-
+    access: [["MarinePilot"]]
+
+- type: entity
+  id: SuitStorageMechPilot
+  suffix: OBS-4, MechPilot
+  parent: SuitStorageBase
+  components:
+  - type: StorageFill
+    contents:
+    - id: NitrogenTankFilled
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitOBS4Pilot
+    - id: ClothingHelmetHardsuitOBH4Pilot
+    - id: ClothingShoesBootsMagMarine
+  - type: AccessReader
+    access: [["MarineMechPilot"]]
+
 - type: entity
   id: SuitStorageMarineMedic
   suffix: OBS-4, Medic
@@ -59,8 +73,8 @@
     - id: ClothingHelmetHardsuitOBH4Medic
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
-        
+    access: [["Marine"],["Medical"]]
+
 - type: entity
   id: SuitStorageMarineEngineer
   suffix: OBS-4, Engineer
@@ -74,8 +88,8 @@
     - id: ClothingHelmetHardsuitOBH4Engineer
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
-    
+    access: [["Marine"],["Engineering"]]
+
 - type: entity
   id: SuitStorageMarinePlatoonCommander
   suffix: OBS-4, PlatoonCommander
@@ -89,19 +103,49 @@
     - id: ClothingHelmetHardsuitOBH4PlatoonCommander
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
-
+    access: [["PlatoonCommander"]]
+
+- type: entity
+  id: SuitStorageMarineMechPlatoonCommander
+  suffix: OBS-4, MechPlatoonCommander
+  parent: SuitStorageBase
+  components:
+  - type: StorageFill
+    contents:
+    - id: NitrogenTankFilled
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitOBS4MechPlatoonCommander
+    - id: ClothingHelmetHardsuitOBH4MechPlatoonCommander
+    - id: ClothingShoesBootsMagMarine
+  - type: AccessReader
+    access: [["MechPlatoonCommander"]]
+
+- type: entity
+  id: SuitStorageMarineRoboPlatoonCommander
+  suffix: OBS-4, RoboPlatoonCommander
+  parent: SuitStorageBase
+  components:
+  - type: StorageFill
+    contents:
+    - id: NitrogenTankFilled
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitOBS4RoboPlatoonCommander
+    - id: ClothingHelmetHardsuitOBH4RoboPlatoonCommander
+    - id: ClothingShoesBootsMagMarine
+  - type: AccessReader
+    access: [["RoboPlatoonCommander"]]
+
 - type: entity
   id: SuitStorageMarineCommander
-  suffix: OBS-4, Commander
+  suffix: OBS-4, CompanyCommander
   parent: SuitStorageBase
   components:
   - type: StorageFill
     contents:
     - id: NitrogenTankFilled
     - id: OxygenTankFilled
-    - id: ClothingOuterHardsuitOBS4Commander
-    - id: ClothingHelmetHardsuitOBH4Commander
+    - id: ClothingOuterHardsuitOBS4CompanyCommander
+    - id: ClothingHelmetHardsuitOBH4CompanyCommander
     - id: ClothingShoesBootsMagMarine
   - type: AccessReader
-    access: [["Security"]]
+    access: [["CompanyCommander"]]
diff --git a/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml b/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml
@@ -163,18 +163,52 @@
         name: power-cell-slot-component-slot-name-default
         startingItem: PowerCellHigh
 
+- type: entity
+  parent: ClothingHelmetHardsuitOBH4Base
+  id: ClothingHelmetHardsuitOBH4MechPlatoonCommander
+  name: OBH-4
+  suffix: MechPlatoonCommander
+  description: Modern armor helmet, version 4, mech platoon commander edition
+  components:
+  - type: Sprite
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-mech-platoon-commander.rsi
+  - type: Clothing
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-mech-platoon-commander.rsi
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
+- type: entity
+  parent: ClothingHelmetHardsuitOBH4Base
+  id: ClothingHelmetHardsuitOBH4RoboPlatoonCommander
+  name: OBH-4
+  suffix: RoboPlatoonCommander
+  description: Modern armor helmet, version 4, robo platoon commander edition
+  components:
+  - type: Sprite
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-robo-platoon-commander.rsi
+  - type: Clothing
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-robo-platoon-commander.rsi
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
 # Gold
 - type: entity
   parent: ClothingHelmetHardsuitOBH4Base
-  id: ClothingHelmetHardsuitOBH4Commander
+  id: ClothingHelmetHardsuitOBH4CompanyCommander
   name: OBH-4
   suffix: Commander
   description: Modern armor helmet, version 4, commander edition
   components:
   - type: Sprite
-    sprite: TS/Clothing/Head/Hardsuits/obh-4-commander.rsi
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-company-commander.rsi
   - type: Clothing
-    sprite: TS/Clothing/Head/Hardsuits/obh-4-commander.rsi
+    sprite: TS/Clothing/Head/Hardsuits/obh-4-company-commander.rsi
   - type: ItemSlots
     slots:
       cell_slot:

diff --git a/Resources/Prototypes/TS/Entities/Clothing/OuterClothing/hardsuits-marine.yml b/Resources/Prototypes/TS/Entities/Clothing/OuterClothing/hardsuits-marine.yml
@@ -132,15 +132,54 @@
     walkModifier: 0.8
     sprintModifier: 0.8
 
+- type: entity
+  parent: ClothingOuterHardsuitOBS4Base
+  id: ClothingOuterHardsuitOBS4MechPlatoonCommander
+  name: OBS-4
+  suffix: MechPlatoonCommander
+  description: Modern armor suit, version 4, mech platoon commander edition
+  components:
+  - type: Sprite
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-mech-platoon-commander.rsi
+  - type: Clothing
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-mech-platoon-commander.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.7
+        Heat: 0.7
+        Cold: 0.7
+        Radiation: 0.7
+
+- type: entity
+  parent: ClothingOuterHardsuitOBS4Base
+  id: ClothingOuterHardsuitOBS4RoboPlatoonCommander
+  name: OBS-4
+  suffix: RoboPlatoonCommander
+  description: Modern armor suit, version 4, robo platoon commander edition
+  components:
+  - type: Sprite
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-robo-platoon-commander.rsi
+  - type: Clothing
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-robo-platoon-commander.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+
 # Gold
 - type: entity
   parent: ClothingOuterHardsuitOBS4Base
-  id: ClothingOuterHardsuitOBS4Commander
+  id: ClothingOuterHardsuitOBS4CompanyCommander
   name: OBS-4
   suffix: Commander
   description: Modern armor suit, version 4, commander edition
   components:
   - type: Sprite
-    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-commander.rsi
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-company-commander.rsi
   - type: Clothing
-    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-commander.rsi
+    sprite: TS/Clothing/OuterClothing/Hardsuits/obs-4-company-commander.rsi
diff --git a/Resources/Textures/TS/Markers/jobs.rsi/meta.json b/Resources/Textures/TS/Markers/jobs.rsi/meta.json
@@ -15,6 +15,9 @@
     },
 	{
       "name": "marine-pilot"
+    },
+	{
+      "name": "mech-pilot"
     },
     {
       "name": "marine-engineer"
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,9 @@ @@
         },
     	{
           "name": "marine-pilot"
+        },
+    	{
+          "name": "mech-pilot"
         },
         {
           "name": "marine-engineer"
@@ Expand Down @@