From 885eb7bc352feadae29deeaa1c3916e2947715e1 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/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 +- Resources/migration.yml | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 27bbedec0a..0e2b5f84e1 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -222,7 +222,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 a8fd6e2b2d..e607943516 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 e6b12f336d..f8de438402 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -18,7 +18,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: diff --git a/Resources/migration.yml b/Resources/migration.yml index 808149b4c1..db41ec5194 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -612,6 +612,7 @@ MediumXenoArtifactItem: ComplexXenoArtifactItem VariedXenoArtifactItem: ComplexXenoArtifactItem # 2025-04-19 +ClothingOuterHardsuitSyndicate: ClothingOuterEVASuitSyndicate AirlockMaintCommonLocked: AirlockMaintLocked AirlockMaintIntLocked: AirlockMaintLocked -- 2.51.2