Fix EVA suits errors and suit fills (#2216)

* GPS? Magboots * Fix errors
new-frontiers-14 · Oct 14, 2024 · 8b25a54 · 8b25a54
1 parent 5ffec5d
commit 8b25a54
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 170 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -8,7 +8,6 @@
     - id: ClothingOuterHardsuitSpatio
     - id: ClothingMaskGasExplorer
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 - type: entityTable
   id: LockerFillSalvageSpecialist
@@ -17,7 +16,6 @@
     - id: ClothingEyesGlassesMeson # Frontier
     - id: ClothingBeltUtilityEngineering # Frontier: Filled<Engineering
     - id: SurvivalKnife
-    # - id: HandheldGPSBasic # Frontier
     - id: RadioHandheldNF # Frontier - RadioHandheld<RadioHandheldNF
     - id: OreBag # Frontier
     - id: AppraisalTool

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -102,7 +102,6 @@
       - id: ClothingHandsGlovesColorYellow # Frontier
       - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 #     - id: RCD # Frontier
 #     - id: RCDAmmo # Frontier
@@ -143,7 +142,6 @@
       - id: ClothingShoesBootsMag
       - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -72,7 +72,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No laser locker, used when the antique laser is placed in the special display crate
 - type: entity
@@ -182,7 +181,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -241,7 +239,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -294,7 +291,6 @@
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
     - id: JetpackMiniFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
 
 # No hardsuit locker
 - type: entity
@@ -364,7 +360,6 @@
     - id: JetpackSecurityFilled
 #    - id: OxygenTankFilled # Frontier
     - id: AirTankFilled # Frontier
-    - id: HandheldGPSBasic # Frontier
     - id: ClothingShoesBootsMagCombatFilled # Frontier
 
 # No hardsuit locker

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -14,7 +14,6 @@
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Basic EVA (Big Ass Helmet)
 - type: entity
@@ -31,7 +30,6 @@
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Emergency EVA
 - type: entity
@@ -47,7 +45,6 @@
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Prisoner EVA
 - type: entity
@@ -78,7 +75,6 @@
         - id: ClothingHeadHelmetSyndicate
         - id: ClothingMaskGasSyndicate
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Pirate EVA
 - type: entity
@@ -95,7 +91,6 @@
         - id: ClothingMaskGas
         - id: JetpackBlackFilled # Frontier
         - id: ClothingShoesBootsMagPirateFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #NTSRA Voidsuit
 - type: entity
@@ -113,7 +108,6 @@
         - id: ClothingHeadHelmetAncient
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #HARDSUITS
 #Basic hardsuit
@@ -130,7 +124,6 @@
         - id: ClothingOuterHardsuitBasic
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Engineering hardsuit
 - type: entity
@@ -147,7 +140,6 @@
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Engineering"]] # Frontier
 
@@ -165,7 +157,6 @@
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Atmospherics"]] # Frontier
 
@@ -183,7 +174,6 @@
         - id: ClothingOuterHardsuitSecurity
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
         - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -254,7 +244,6 @@
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
         - id: ClothingShoesBootsMagCombatFilled # Frontier
   - type: AccessReader
     access: [["Armory"]]
@@ -300,7 +289,6 @@
         - id: ClothingShoesBootsMagSyndie
         - id: ClothingMaskGasSyndicate
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Pirate Captain's hardsuit
 - type: entity
@@ -318,7 +306,6 @@
         - id: ClothingNeckCloakPirateCap # Frontier
         - id: JetpackBlackFilled # Frontier
         - id: ClothingShoesBootsMagPirateFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
 
 #Wizard
 - type: entity
@@ -334,4 +321,3 @@
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
         - id: JetpackBlackFilled # Frontier
-        - id: HandheldGPSBasic # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml
@@ -22,7 +22,6 @@
       - id: AirTankFilled #Frontier
       - id: ClothingMaskBreathMedical # Frontier
       - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
 
 - type: entity
   id: LockerPsychologistFilled

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -190,7 +190,6 @@
         - id: ClothingOuterHardsuitLuxury
         - id: ClothingMaskGasExplorer
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Mining hardsuit
@@ -206,7 +205,6 @@
         - id: ClothingOuterHardsuitSalvage
         - id: ClothingMaskGasExplorer
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Mercenary hardsuit
@@ -221,8 +219,7 @@
         - id: ClothingOuterHardsuitMercenary
         - id: ClothingMaskGasMercenary
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagMercenaryFilled
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -237,8 +234,7 @@
         - id: ClothingOuterHardsuitPrivateSecurity
         - id: ClothingMaskGasSecurity
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagCombat # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagCombat
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -254,8 +250,7 @@
         - id: ClothingOuterHardsuitScaf
         - id: ClothingMaskGasMercenary
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+        - id: ClothingShoesBootsMagMercenaryFilled
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
@@ -271,7 +266,6 @@
         - id: ClothingOuterHardsuitPilot
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Clown hardsuit
@@ -286,7 +280,6 @@
         - id: ClothingOuterHardsuitClown
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
 #Cadet hardsuit
@@ -301,7 +294,6 @@
         - id: ClothingOuterHardsuitNfsdBronze # Frontier
         - id: ClothingMaskGasNfsd
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -318,7 +310,6 @@
         - id: ClothingOuterHardsuitNfsdSilver # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -335,7 +326,6 @@
         - id: ClothingOuterHardsuitNfsdBrigmedic # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -352,7 +342,6 @@
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -369,7 +358,6 @@
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -386,7 +374,6 @@
         - id: ClothingOuterHardsuitNfsdSheriff # Frontier
         - id: ClothingMaskGasSheriff
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -403,7 +390,6 @@
         - id: ClothingOuterHardsuitNfsdCombat # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]
@@ -420,7 +406,6 @@
         - id: ClothingOuterHardsuitNfsdCommand # Frontier
         - id: ClothingMaskGasNfsd 
         - id: JetpackNfsdFilled
-        - id: HandheldGPSBasic
         - id: ClothingShoesBootsMagNfsd # Frontier
   - type: AccessReader
     access: [["Security"]]