From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Sun, 31 Mar 2024 02:01:28 +0000 (-0500)
Subject: Removes SCAF armor (#26566)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1f3f1d7d972bfd7671a5023779198e0ab776f813;p=space-station-14.git

Removes SCAF armor (#26566)

* removes scaf armor

* replace maint loot spawner spot with basic helmet
---

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 48aa43fa55..2c5cb54094 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -147,29 +147,6 @@
         Piercing: 0.9
         Heat: 0.9
 
-#SCAF Helmet
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetScaf
-  name: scaf helmet
-  description: A robust, strong helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
-  - type: Tag
-    tags:
-    - HidesHair
-    - WhitelistChameleon
-
 #Space Ninja Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index fdaee45ccc..9a1f142740 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -183,32 +183,6 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
-- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorScaf
-  name: scaf suit
-  description: A green and brown tactical suit for combat situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.8
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorCaptainCarapace
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index df61726a99..450b501d1a 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -77,7 +77,7 @@
         - ClothingHeadHatCone
         - ClothingNeckBling
         - ClothingHeadHelmetCosmonaut
-        - ClothingHeadHelmetScaf
+        - ClothingHeadHelmetBasic
         - ClothingShoeSlippersDuck
         - ClothingUnderSocksBee
         - ClothingUnderSocksCoder
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png
deleted file mode 100644
index ec1c408550..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png
deleted file mode 100644
index 7a44f388c8..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png
deleted file mode 100644
index 4432f6604a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png
deleted file mode 100644
index c90ef79456..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
deleted file mode 100644
index e0ee93d642..0000000000
--- a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e93c024893..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png
deleted file mode 100644
index cd7f486a89..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png
deleted file mode 100644
index ce718ad300..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png
deleted file mode 100644
index 6bfef738a4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
deleted file mode 100644
index 659ed1dddf..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index acdfbdf4dc..147e322fb5 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -249,3 +249,8 @@ ImprovisedExplosiveFuel: FireBombFuel
 
 # 2024-03-21
 RPED: null
+
+# 2024-03-30
+# These are technically not equivalent, but it probably makes more sense to replace any existing SCAF stuff with SOME kind of armor, instead of just deleting it outright.
+ClothingHeadHelmetScaf: ClothingHeadHelmetBasic
+ClothingOuterArmorScaf: ClothingOuterArmorBasic
\ No newline at end of file