Departmental EVA Suits (new-frontiers-14#1836)

* Departmental EVA Suits * wall locker draft * lathe eva recipes * captain wall locker using generic visualizer * chaplain and boxer eva * wall eva lockers * wall locker sprites, meta info fixes * lathe, vendomats, mailpod and parcel fix * more vendomats * more decals for lockers, more empty lockers * more lockers * cap and sr helmet decals * meta * more files * chapel/spdldr ordering, departmental EVA grammar * Revert random crystal * Multi Locker Drifting * Update locker_wallmount.yml --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
whatston3 · Aug 12, 2024 · 7663266 · 7663266
1 parent 424f724
commit 7663266
Show file tree

Hide file tree

Showing 92 changed files with 4,168 additions and 125 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/mailpod.yml b/Resources/Maps/_NF/Shuttles/mailpod.yml
@@ -866,7 +866,7 @@ entities:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 95
     components:

diff --git a/Resources/Maps/_NF/Shuttles/parcel.yml b/Resources/Maps/_NF/Shuttles/parcel.yml
@@ -1504,7 +1504,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 73
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelCargo: 3
     ClothingBackpackDuffelCargo: 3
     ClothingBackpackMessengerCargo: 3 # Frontier
+    ClothingOuterEVASuitCargo: 3 # Frontier
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
     ClothingShoesColorBlack: 3
@@ -21,6 +22,7 @@
     ClothingBackpackSatchelSalvage: 2
     ClothingBackpackDuffelSalvage: 2
     ClothingBackpackMessengerSalvage: 2 # Frontier
+    ClothingOuterEVASuitSalvage: 2 # Frontier
     ClothingBeltSalvageWebbing: 2
     ClothingUniformJumpsuitSalvageSpecialist: 2
     ClothingOuterWinterMiner: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -15,30 +15,31 @@
     ClothingHeadHatWitch1: 3
     ClothingOuterPlagueSuit: 3
     ClothingMaskPlague: 3
-    ClothingHeadHatKippah: 3
-    ClothingHeadHatWideBrimmed: 3
-    ClothingHeadHatPilgrim: 3
-    ClothingUniformJumpsuitChaplainPilgrimVest: 3
-    ClothingHeadHatBishopMitre: 3
-    ClothingOuterCoatBishop: 3
-    ClothingHeadHatCardinal: 3
-    ClothingOuterCoatCardinal: 3
-    ClothingHeadHatWitchhunter: 3
-    ClothingOuterCoatWitchHunter: 3
-    ClothingNeckScarfChaplainStole: 3
+    ClothingHeadHatKippah: 3 # Frontier
+    ClothingHeadHatWideBrimmed: 3 # Frontier
+    ClothingHeadHatPilgrim: 3 # Frontier
+    ClothingUniformJumpsuitChaplainPilgrimVest: 3 # Frontier
+    ClothingHeadHatBishopMitre: 3 # Frontier
+    ClothingOuterCoatBishop: 3 # Frontier
+    ClothingHeadHatCardinal: 3 # Frontier
+    ClothingOuterCoatCardinal: 3 # Frontier
+    ClothingHeadHatWitchhunter: 3 # Frontier
+    ClothingOuterCoatWitchHunter: 3 # Frontier
+    ClothingNeckScarfChaplainStole: 3 # Frontier
     ClothingNeckStoleChaplain: 3
-    ClothingBeltChaplainSash: 3
+    ClothingBeltChaplainSash: 3 # Frontier
     ClothingHeadsetService: 4
     RubberStampChaplain: 3
     Bible: 3
-    UrnMortuary: 4
-    Censer: 2
-    ClothingNeckCrucifix: 3
     BoxCandle: 2
     BoxCandleSmall: 2
     Urn: 5
+    UrnMortuary: 4 # Frontier
+    Censer: 2 # Frontier
+    ClothingNeckCrucifix: 3 # Frontier
+    ClothingOuterEVASuitChaplain: 3 # Frontier
   emaggedInventory:
-    WoodenStake: 6
+    WoodenStake: 6 # Frontier
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -1,6 +1,7 @@
 - type: vendingMachineInventory
   id: ChefDrobeInventory
   startingInventory:
+    ClothingOuterEVASuitServiceWorker: 2 # Frontier
     ClothingHeadsetService: 2
     ClothingOuterApronChef: 3
     ClothingOuterWinterChef: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelEngineering: 3
     ClothingBackpackEngineering: 3
     ClothingBackpackMessengerEngineering: 3 # Frontier
+    ClothingOuterEVASuitEngineer: 3 # Frontier
     ClothingUniformJumpsuitEngineering: 3
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3
@@ -24,6 +25,7 @@
     ClothingBackpackSatchelAtmospherics: 2
     ClothingBackpackAtmospherics: 2
     ClothingBackpackMessengerAtmospherics: 2 # Frontier
+    ClothingOuterEVASuitAtmosTech: 2 # Frontier
     ClothingUniformJumpsuitAtmos: 3
     ClothingUniformJumpskirtAtmos: 3
     ClothingUniformJumpsuitAtmosCasual: 3

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelHydroponics: 3
     ClothingBackpackDuffelHydroponics: 3
     ClothingBackpackMessengerHydroponics: 3 # Frontier
+    ClothingOuterEVASuitHydro: 3 # Frontier
     ClothingBeltPlant: 3 # Frontier
     ClothingOuterApronBotanist: 3
     ClothingUniformOveralls: 3

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -14,6 +14,7 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadHatHoodBioJanitor: 1 # Frontier - Bio suit
     ClothingOuterBioJanitor: 1 # Frontier - Bio suit
+    ClothingOuterEVASuitJanitor: 1 # Frontier - EVA
   contrabandInventory: # Frontier - Hidden inventory
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelMedical: 4
     ClothingBackpackDuffelMedical: 4
     ClothingBackpackMessengerMedical: 4 # Frontier
+    ClothingOuterEVASuitMedic: 4 # Frontier
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingOuterWinterMed: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelScience: 3
     ClothingBackpackDuffelScience: 3
     ClothingBackpackMessengerScience: 3 # Frontier
+    ClothingOuterEVASuitScientist: 3 # Frontier
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -207,6 +207,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitContractor # Frontier
+      - ClothingOuterEVASuitPilot # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
@@ -818,15 +820,14 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
-      # Frontier Start
-      - ThrusterSecurityMachineCircuitboard
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingHeadHelmetEVALarge
-      - ClothingOuterHardsuitEVAPrisoner
-      # Frontier End
       - WeaponLaserCarbinePractice
       - Zipties
+      - ThrusterSecurityMachineCircuitboard # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterEVASuitNfsd # Frontier
+      - ClothingHeadHelmetEVA # Frontier
+      - ClothingHeadHelmetEVALarge # Frontier
+      - ClothingOuterHardsuitEVAPrisoner # Frontier
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -1006,21 +1007,18 @@
       - Saw
       - Hemostat
       - ClothingEyesGlassesChemical
-      # Frontier Start
-      - ClothingOuterSuitEmergency
-      - ClothingOuterHardsuitVoidParamed
-      # Frontier End
       - WhiteCane
+      - ClothingOuterEVASuitMedic # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterHardsuitVoidParamed # Frontier
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
       - BluespaceBeaker
       - SyringeBluespace
       - Jug
       - SyringeCryostasis
-      # Frontier Start
-      - ClothingOuterHardsuitMedical
-      # Frontier End
+      - ClothingOuterHardsuitMedical # Frontier
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
@@ -7,5 +7,9 @@
     ClothingHandsGlovesBoxingBlue: 2
     ClothingHandsGlovesBoxingGreen: 2
     ClothingHandsGlovesBoxingYellow: 2
+    ClothingOuterEVASuitBoxerRed: 2 # Frontier
+    ClothingOuterEVASuitBoxerGreen: 2 # Frontier
+    ClothingOuterEVASuitBoxerBlue: 2 # Frontier
+    ClothingOuterEVASuitBoxerYellow: 2 # Frontier
   emaggedInventory:
     UniformJabroni: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -23,6 +23,8 @@
   - type: Lathe
     idleState: icon
     runningState: icon
+    staticRecipes: #Frontier
+      - ClothingOuterEVASuitScientist #Frontier
     dynamicRecipes:
       - BluespaceBeaker
       - CryostasisBeaker
@@ -122,10 +124,15 @@
       - Beaker # Frontier
       - LargeBeaker # Frontier
       - ServiceSelectiveDropper # Frontier
-      - ClothingOuterSuitEmergency # Frontier
-      - ClothingHeadHelmetEVA # Frontier
-      - ClothingOuterHardsuitEVA # Frontier
       - ClothingOuterEVASuitHydro # Frontier
+      - ClothingOuterEVASuitJanitor # Frontier
+      - ClothingOuterEVASuitMailman # Frontier
+      - ClothingOuterEVASuitServiceWorker # Frontier
+      - ClothingOuterEVASuitChaplain # Frontier
+      - ClothingOuterEVASuitBoxerRed # Frontier
+      - ClothingOuterEVASuitBoxerGreen # Frontier
+      - ClothingOuterEVASuitBoxerBlue # Frontier
+      - ClothingOuterEVASuitBoxerYellow # Frontier
     dynamicRecipes:
       - Holoprojector
       - HydroponicsToolScythe
@@ -243,6 +250,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitEngineer # Frontier
+      - ClothingOuterEVASuitAtmosTech # Frontier
       - WelderIndustrial # Frontier
       - WelderIndustrialAdvanced # Frontier
       # Engi fab has shuttle power and tech at base

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
@@ -82,3 +82,142 @@
         - id: Cutlass
         - id: WeaponRevolverPirate
         - id: ClothingEyesEyepatch
+
+#Departmental EVA bundles
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitContractor ]
+  id: ClothingBackpackDuffelEVABundleContractor
+  name: contractor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelPilot, StorageFillEVASuitPilot ]
+  id: ClothingBackpackDuffelEVABundlePilot
+  name: pilot EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitSr ]
+  id: ClothingBackpackDuffelEVABundleSr
+  name: station representative EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitCaptain ]
+  id: ClothingBackpackDuffelEVABundleCaptain
+  name: captain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelEngineering, StorageFillEVASuitEngineer ]
+  id: ClothingBackpackDuffelEVABundleEngineer
+  name: engineer EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelAtmospherics, StorageFillEVASuitAtmosTech ]
+  id: ClothingBackpackDuffelEVABundleAtmosTech
+  name: atmospheric technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCargo, StorageFillEVASuitCargo ]
+  id: ClothingBackpackDuffelEVABundleCargo
+  name: cargo technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelSalvage, StorageFillEVASuitSalvage ]
+  id: ClothingBackpackDuffelEVABundleSalvage
+  name: salvage specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMedical, StorageFillEVASuitMedic ]
+  id: ClothingBackpackDuffelEVABundleMedical
+  name: medical specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelScience, StorageFillEVASuitScientist ]
+  id: ClothingBackpackDuffelEVABundleScientist
+  name: scientist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitJanitor ]
+  id: ClothingBackpackDuffelEVABundleJanitor
+  name: janitor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitServiceWorker ]
+  id: ClothingBackpackDuffelEVABundleServiceWorker
+  name: service worker EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitChaplain ]
+  id: ClothingBackpackDuffelEVABundleChaplain
+  name: chaplain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRed ]
+  id: ClothingBackpackDuffelEVABundleBoxerRed
+  name: boxer EVA bundle
+  suffix: Filled, Red
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerGreen ]
+  id: ClothingBackpackDuffelEVABundleBoxerGreen
+  name: boxer EVA bundle
+  suffix: Filled, Green
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerBlue ]
+  id: ClothingBackpackDuffelEVABundleBoxerBlue
+  name: boxer EVA bundle
+  suffix: Filled, Blue
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerYellow ]
+  id: ClothingBackpackDuffelEVABundleBoxerYellow
+  name: boxer EVA bundle
+  suffix: Filled, Yellow
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRandom ]
+  id: ClothingBackpackDuffelEVABundleBoxerRandom
+  name: boxer EVA bundle
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ ClothingBackpackDuffelHydroponics, StorageFillEVASuitHydro ]
+  id: ClothingBackpackDuffelEVABundleHydro
+  name: botanist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitMail ]
+  id: ClothingBackpackDuffelEVABundleMail
+  name: mail carrier EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMercenary, StorageFillEVASuitMercenary ]
+  id: ClothingBackpackDuffelEVABundleMercenary
+  name: mercenary EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitPrivateSec ]
+  id: ClothingBackpackDuffelEVABundlePrivateSec
+  name: private security EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelNfsdBrown, StorageFillEVASuitNfsd ]
+  id: ClothingBackpackDuffelEVABundleNfsd
+  name: nfsd EVA bundle
+  suffix: Filled