From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 22 May 2024 16:59:49 +0000 (+0200)
Subject: Remove dupe closet janitor bombsuit (#28177)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c082773b5fa50741cd6d35dea95452a940feb36e;p=space-station-14.git

Remove dupe closet janitor bombsuit (#28177)

* Remove dupe closet janitor bombsuit

* Update Resources/migration.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index ebcd9dfc5e..d2ca08e116 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -173,7 +173,7 @@
   icon:
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
     state: icon
-  product: CrateJanitorExplosive
+  product: ClosetJanitorBombFilled
   cost: 1000
   category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 35e66ac4d3..5b16b91f8b 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -321,16 +321,3 @@
           prob: 0.1
         - id: ShardGlassPlasma
           prob: 0.1
-
-- type: entity
-  id: CrateJanitorExplosive
-  parent: ClosetJanitorBomb
-  name: janitorial bomb suit crate
-  description: Supplies a bomb suit for cleaning up any explosive compounds, buy one today!
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterSuitJanitorBomb
-        amount: 1
-      - id: ClothingHeadHelmetJanitorBombSuit
-        amount: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 945ae0dd7b..6d0577a16e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -130,7 +130,7 @@
 - type: entity
   id: ClosetJanitorBombFilled
   parent: ClosetJanitorBomb
-  suffix: Filled
+  suffix: DO NOT MAP, Filled
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 28d63be992..c19f140870 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -339,3 +339,6 @@ DrinkBottleGoldschlager: DrinkBottleGildlager
 # 2024-05-14
 soda_dispenser: SodaDispenser
 chem_master: ChemMaster
+
+# 2024-05-21
+CrateJanitorExplosive: ClosetJanitorBombFilled