SuitsStorage & Jetpacks & Brigmedic (#492)

* Unlocked + Jetpacks * Changes * Move Brigmed Locker File + Changes * Create suit_storage.yml * Update suit_storage.yml * Update suit_storage.yml * Update suit_storage.yml * Update brigmedic.yml * Update brigmedic.yml * Update suit_storage.yml * Update lockers.yml * Update suit_storage.yml * Update suit_storage.yml * Update suit_storage.yml
new-frontiers-14 · Oct 27, 2023 · 3916305 · 3916305
1 parent 6b6bd04
commit 3916305
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 64 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -69,41 +69,6 @@
         prob: 0.1
       - id: ClothingEyesHudSecurity
 
-- type: entity
-  id: LockerBrigmedicFilled
-  suffix: Brigmedic, Filled
-  parent: LockerBrigmedic
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingEyesHudSecurity
-      - id: WeaponDisabler
-      - id: TrackingImplanter
-        amount: 2
-      - id: ClothingOuterHardsuitBrigmedic
-      - id: BoxSterileMask
-      - id: ClothingHeadHatBeretBrigmedic
-      - id: ClothingOuterCoatAMG
-      - id: ClothingUniformJumpsuitBrigmedic
-      - id: ClothingUniformJumpskirtBrigmedic
-      - id: ClothingUniformJumpskirtOfLife
-        prob: 0.1
-      - id: MedkitFilled
-      - id: MedkitCombatFilled
-        prob: 0.6
-      - id: MedkitAdvancedFilled
-        prob: 0.4
-      - id: MedkitOxygenFilled
-        prob: 0.3
-      - id: MedkitBruteFilled
-        prob: 0.3
-      - id: MedkitToxinFilled
-        prob: 0.3
-      - id: MedkitBurnFilled
-        prob: 0.7
-      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
-        prob: 0.15
-
 - type: entity
   id: LockerDetectiveFilled
   suffix: Filled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -122,7 +122,7 @@
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
   - type: AccessReader
-    # access: [["Engineering"]]
+    # access: [["Engineering"]] # Frontier
 
 #Atmospherics hardsuit
 - type: entity
@@ -137,7 +137,7 @@
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
   - type: AccessReader
-    # access: [["Atmospherics"]]
+    # access: [["Atmospherics"]] # Frontier
 
 #Security hardsuit
 - type: entity
@@ -150,7 +150,11 @@
         - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSecurity
+          orGroup: HardsuitSecurity
+        - id: ClothingOuterHardsuitSecuritypatrol # Frontier - 50% to get the patrol suit
+          orGroup: HardsuitSecurity
         - id: ClothingMaskBreath
+        - id: JetpackSecurityFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
 
@@ -169,7 +173,7 @@
         - id: ClothingOuterHardsuitEngineeringWhite
         - id: ClothingMaskBreath
   - type: AccessReader
-    # access: [["ChiefEngineer"]]
+    # access: [["ChiefEngineer"]] # Frontier
 
 #CMO's hardsuit
 - type: entity
@@ -184,7 +188,7 @@
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
   - type: AccessReader
-    # access: [ [ "ChiefMedicalOfficer" ] ]
+    # access: [ [ "ChiefMedicalOfficer" ] ] # Frontier
 
 #RD's hardsuit
 - type: entity
@@ -199,7 +203,7 @@
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
   - type: AccessReader
-    # access: [ [ "ResearchDirector" ] ]
+    # access: [ [ "ResearchDirector" ] ] # Frontier
 
 #HOS's hardsuit
 - type: entity
@@ -229,6 +233,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
+        - id: JetpackSecurityFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
 
@@ -245,7 +250,7 @@
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
   - type: AccessReader
-    # access: [["Captain"]]
+    # access: [["Captain"]] # Frontier
 
 #Salvage hardsuit
 - type: entity
@@ -260,8 +265,9 @@
       - id: ClothingShoesBootsMag
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingMaskGasExplorer
+      - id: JetpackMiniFilled # Frontier
   - type: AccessReader
-    # access: [["Salvage"]]
+    # access: [["Salvage"]] # Frontier
 
 #Blood-red hardsuit
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -320,7 +320,7 @@
     stateDoorOpen: armory_open
     stateDoorClosed: brigmedic_door
   - type: AccessReader
-    access: [["Medical"]]
+    access: [["Security"]]
 
 # Security Officer
 - type: entity

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -306,26 +306,6 @@
   inhand:
     - WeaponMeleeToolboxRobust
 
-#Brigmedic
-
-- type: startingGear
-  id: BrigmedicGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitBrigmedic
-    outerClothing: ClothingOuterCoatAMG
-    back: ClothingBackpackBrigmedic
-    shoes: ClothingShoesColorRed
-    gloves: ClothingHandsGlovesNitrile
-    eyes: ClothingEyesHudMedical
-    head: ClothingHeadHatBeretBrigmedic
-    id: BrigmedicPDA
-    ears: ClothingHeadsetBrigmedic
-    mask: ClothingMaskBreathMedicalSecurity
-    belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
-  satchel: ClothingBackpackSatchelBrigmedicFilled
-  duffelbag: ClothingBackpackDuffelBrigmedicFilled
-
 #Head Rev Gear
 - type: startingGear
   id: HeadRevGear

diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
@@ -4,8 +4,11 @@
   description: job-description-brigmedic
   playTimeTracker: JobBrigmedic
   requirements:
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 10800 # 3 hrs
     - !type:OverallPlaytimeRequirement
-      time: 21600
+      time: 21600 # 6 hrs
   startingGear: BrigmedicGear
   icon: "JobIconBrigmedic"
   supervisors: job-supervisors-hos
@@ -19,3 +22,20 @@
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
+
+- type: startingGear
+  id: BrigmedicGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+    outerClothing: ClothingOuterCoatAMG
+    back: ClothingBackpackBrigmedicFilled
+    shoes: ClothingShoesBootsJack
+    gloves: ClothingHandsGlovesNitrile
+    eyes: ClothingEyesHudMedical
+    head: ClothingHeadHatBeretSecurity
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    belt: ClothingBeltMedicalFilled
+  innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
@@ -0,0 +1,64 @@
+- type: entity
+  id: LockerBrigmedicFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerBrigmedic
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesHudSecurity
+      - id: WeaponDisabler
+      - id: ClothingOuterHardsuitBrigmedic
+      - id: BoxSterileMask
+      - id: ClothingHeadHatBeretBrigmedic
+      - id: ClothingOuterCoatAMG
+      - id: ClothingUniformJumpsuitBrigmedic
+      - id: ClothingUniformJumpskirtBrigmedic
+      - id: ClothingUniformJumpskirtOfLife
+        prob: 0.1
+      - id: MedkitFilled
+      - id: MedkitCombatFilled
+        prob: 0.6
+      - id: MedkitAdvancedFilled
+        prob: 0.4
+      - id: MedkitOxygenFilled
+        prob: 0.3
+      - id: MedkitBruteFilled
+        prob: 0.3
+      - id: MedkitToxinFilled
+        prob: 0.3
+      - id: MedkitBurnFilled
+        prob: 0.7
+      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+        prob: 0.15
+
+- type: entity
+  id: LockerBrigmedicFilled
+  suffix: Filled
+  parent: LockerBrigmedic
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesHudSecurity
+      - id: WeaponDisabler
+      - id: BoxSterileMask
+      - id: ClothingHeadHatBeretBrigmedic
+      - id: ClothingOuterCoatAMG
+      - id: ClothingUniformJumpsuitBrigmedic
+      - id: ClothingUniformJumpskirtBrigmedic
+      - id: ClothingUniformJumpskirtOfLife
+        prob: 0.1
+      - id: MedkitFilled
+      - id: MedkitCombatFilled
+        prob: 0.6
+      - id: MedkitAdvancedFilled
+        prob: 0.4
+      - id: MedkitOxygenFilled
+        prob: 0.3
+      - id: MedkitBruteFilled
+        prob: 0.3
+      - id: MedkitToxinFilled
+        prob: 0.3
+      - id: MedkitBurnFilled
+        prob: 0.7
+      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+        prob: 0.15
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -0,0 +1,16 @@
+#HARDSUITS
+#Brigmedic's hardsuit
+- type: entity
+  id: SuitStorageBrigmedic
+  parent: SuitStorageBase
+  suffix: Brigmedic
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingOuterHardsuitBrigmedic
+        - id: ClothingMaskBreathMedicalSecurity
+        - id: JetpackSecurityFilled
+  - type: AccessReader
+    access: [["Security"]]