From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 17 May 2025 06:15:29 +0000 (-0400) Subject: Remove Basic Hardsuit & Associated Files (#37315) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=542443360420ea271ecdb6787fd2b86557029eaf;p=space-station-14.git 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 3d6b095b02..a01ba7c3ff 100644 --- 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 4407b3fca2..c47fd9769c 100644 --- 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 e607943516..5d64321776 100644 --- 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 59d8c87f09..7cd873643a 100644 --- 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 fa023f9144..2c73342dbe 100644 --- 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 index 10358583f4..0000000000 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 index 4bee6de2be..0000000000 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 index 0e73a64eec..0000000000 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 index b9cf69845c..0000000000 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 index 271fd3b31c..0000000000 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 index 88e5b353cb..0000000000 --- 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 9f41922042..6cdc3f10da 100644 --- 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