Remove Basic Hardsuit & Associated Files (#37315)

* Remove Basic Hardsuit

* retaliatory action

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 3d6b095b021ba758355c13cb9e841115a11ccca1..a01ba7c3ff642be845c71912d9724b082b9c25ea 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -179,7 +179,7 @@
     - id: ClothingOuterHardsuitCBURN
       prob: 0.001
       orGroup: Clothes
-    - id: ClothingOuterHardsuitBasic
+    - id: ClothingOuterHardsuitSanta
       prob: 0.001
       orGroup: Clothes
     - id: ClothingBackpackERTClown

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 4407b3fca2a19ca9b0f1cea0ce5e62b14193e89b..c47fd9769c77abb0281a3a3aa68febfd0d15d0e6 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -389,7 +389,6 @@
   - type: StorageFill
     contents:
     - id: WeaponRevolverDeckard
-    - id: ClothingOuterHardsuitBasic
     - id: JetpackBlue
     - id: SpaceCash1000
     - id: BeachBall

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index e60794351694da48edee98c7c8e855c79bd2d750..5d64321776e2f3b7c0dd66db4a1fc30dafa242db 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -89,18 +89,6 @@
         - id: ClothingMaskBreath
 
 #HARDSUITS
-#Basic hardsuit
-- type: entity
-  id: SuitStorageBasic
-  parent: SuitStorageBase
-  suffix: Basic Hardsuit
-  components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitBasic
-        - id: ClothingMaskBreath
-
 #Engineering hardsuit
 - type: entity
   id: SuitStorageEngi

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 59d8c87f09eb8971b6062c816f26043113d384d4..7cd873643add79899f0a4a46d4f937bf9f013a0d 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -5,18 +5,6 @@
 #Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor here outside of the above scenario.
 
 #CREW HARDSUITS
-#Standard Hardsuit
-- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitBasic
-  name: basic hardsuit helmet
-  description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/basic.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/basic.rsi
-
 #Atmospherics Hardsuit
 - type: entity
   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index fa023f9144b868fe6565b9eca16e1e85fb50a189..2c73342dbecd3c854bd7a2dc20eb1c1e488ef779 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -1,33 +1,6 @@
 #When adding new hardsuits, please try to keep the organization consistent with hardsuit-helmets.yml (if possible.)
 
 #CREW HARDSUITS
-#Basic Hardsuit
-- type: entity
-  parent: ClothingOuterHardsuitBase
-  id: ClothingOuterHardsuitBasic
-  name: basic hardsuit
-  description: A basic, universal hardsuit that protects the wearer against the horrors of life in space. Beats not having a hardsuit, at least.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Caustic: 0.9
-  - type: ClothingSpeedModifier
-    walkModifier: 0.80
-    sprintModifier: 0.80
-  - type: HeldSpeedModifier
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitBasic
-
 #Atmospherics Hardsuit
 - type: entity
   parent: [ClothingOuterHardsuitBase, BaseEngineeringContraband]

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-monkey.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-monkey.png
deleted file mode 100644 (file)
index 1035858..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-monkey.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644 (file)
index 4bee6de..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/icon.png
deleted file mode 100644 (file)
index 0e73a64..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-left.png
deleted file mode 100644 (file)
index b9cf698..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-right.png
deleted file mode 100644 (file)
index 271fd3b..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
deleted file mode 100644 (file)
index 88e5b35..0000000
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-OUTERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 9f4192204244557c7364b70eaa4d832769448b8b..6cdc3f10da1693810bb098380b5ef4aad75de93c 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -630,3 +630,8 @@ CigaretteMuteToxin: CigaretteSodiumPolyacrylate
 CigaretteSpaceDrugs: CigaretteLipolicide
 CigaretteMilk: CigaretteHaloperidol
 CigaretteBread: CigaretteBbqSauce
+
+# 2025-05-09
+ClothingOuterHardsuitBasic: ClothingOuterHardsuitEVA
+ClothingHeadHelmetHardsuitBasic: null
+SuitStorageBasic: SuitStorageEVA