From 77da04420ce377328c0335da665d6a664beccf37 Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Sat, 3 May 2025 12:06:35 -0400
Subject: [PATCH] ClothingOuterEVASuitSyndicate (#36738)

* ClothingOuterEVASuitSyndicate

* Update migration.yml

* Resolve merge conflict in migration.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---
 Resources/Migrations/migration.yml                              | 1 +
 Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml      | 2 +-
 Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml       | 2 +-
 Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml     | 2 +-
 .../Prototypes/Entities/Clothing/OuterClothing/softsuits.yml    | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 48a0d98839..07a722b4a7 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -580,6 +580,7 @@ ToxinChemistryBottle: ChemistryBottleToxin
 ClothingBackpackDuffelSyndicateRaidBundle: ClothingBackpackSyndicateRaidBundle
 
 # 2025-04-19
+ClothingOuterHardsuitSyndicate: ClothingOuterEVASuitSyndicate
 AirlockMaintCommonLocked: AirlockMaintLocked
 AirlockMaintIntLocked: AirlockMaintLocked
 
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 17e721f357..ff0e3b37dd 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -226,7 +226,7 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHelmetSyndicate
-      - id: ClothingOuterHardsuitSyndicate
+      - id: ClothingOuterEVASuitSyndicate
       - id: ClothingMaskGasSyndicate
       - id: ClothingHandsGlovesColorYellowBudget
       - id: DoubleEmergencyOxygenTankFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
index 4505a8cc7b..4ee0d5f9ea 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -74,7 +74,7 @@
         prob: 0.10
       - id: ClothingOuterSanta
         prob: 0.10
-      - id: ClothingOuterHardsuitSyndicate
+      - id: ClothingOuterEVASuitSyndicate
         prob: 0.20
       - id: EmergencyOxygenTankFilled
         prob: 0.25
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 92766b240e..448cbd3d79 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -59,7 +59,7 @@
   - type: StorageFill
     contents:
         - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSyndicate
+        - id: ClothingOuterEVASuitSyndicate
         - id: ClothingHeadHelmetSyndicate
         - id: ClothingMaskGasSyndicate
 
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 030afc3d0c..4f949f84ae 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -19,7 +19,7 @@
 #Syndicate EVA
 - type: entity
   parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ]
-  id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate
+  id: ClothingOuterEVASuitSyndicate
   name: syndicate EVA suit
   description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'"
   components: