Removes duplicate CE and paramedic jumpsuits (#39520)

diff --git a/Resources/Maps/Shuttles/ShuttleEvent/flatline.yml b/Resources/Maps/Shuttles/ShuttleEvent/flatline.yml
index b623ec68131447ae5f58ca15a19af0583d502a27..477d3d643353c52c9d5d5914c0178a8867196fb7 100644 (file)
--- a/Resources/Maps/Shuttles/ShuttleEvent/flatline.yml
+++ b/Resources/Maps/Shuttles/ShuttleEvent/flatline.yml
@@ -859,7 +859,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitParamedicNT
+- proto: ClothingUniformJumpsuitParamedic
   entities:
   - uid: 213
     components:

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
index b19f70881d425f35b12e825463ed986a9b4057a7..c6945b9de27fc1d7d7e152f3ab2e706307afb680 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
@@ -49,17 +49,6 @@
     sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
 
 #Paramedic
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitParamedicNT
-  name: paramedic jumpsuit
-  description: A basic white & blue jumpsuit made for Nanotrasen paramedics stationed in combat sectors.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
-
 - type: entity
   parent: [ ClothingUniformBase, BaseSyndicateContraband ]
   id: ClothingUniformJumpsuitParamedicSyndie
@@ -73,17 +62,6 @@
 
 #HEADS OF STAFF
 #Chief Engineer
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitChiefEngineerNT
-  name: chief engineer jumpsuit
-  description: It is often joked that the role of the combat-sector Chief Engineer is where the actual, logistically-minded engineers are promoted to. Good luck.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
-
 - type: entity
   parent: [ ClothingUniformBase, BaseSyndicateContraband ]
   id: ClothingUniformJumpsuitChiefEngineerSyndie

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
index b7db27a9723ceba5168f703e4afead68a50bfe0e..ec9537bb55d9bda9e31a3043b3310dd418509e2a 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@@ -738,7 +738,7 @@
 - type: startingGear
   id: VisitorParamedic
   equipment:
-    jumpsuit: ClothingUniformJumpsuitParamedicNT
+    jumpsuit: ClothingUniformJumpsuitParamedic
     shoes: ClothingShoesSwat
     gloves: ClothingHandsGlovesLatex
     head: ClothingHeadHatParamedicsoft

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644 (file)
index c450e31..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/icon.png
deleted file mode 100644 (file)
index 6fe32e0..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-left.png
deleted file mode 100644 (file)
index ae15d26..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-right.png
deleted file mode 100644 (file)
index 60bea1b..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json
deleted file mode 100644 (file)
index 8b0bae8..0000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644 (file)
index 3ef3486..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/icon.png
deleted file mode 100644 (file)
index 6bffc57..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-left.png
deleted file mode 100644 (file)
index ae15d26..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-right.png
deleted file mode 100644 (file)
index 60bea1b..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json
deleted file mode 100644 (file)
index 8b0bae8..0000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 5f1077da019785ef4ad4144f98cf70420e587747..ef78bc5fdd06b4e358336bd37b544b718b31f323 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -703,3 +703,7 @@ ClothingNeckHeadphones: ClothingMultipleHeadphones
 
 # 2025-08-01
 FoodDonutJellySlugcat: FoodDonutJellyScurret
+
+# 2025-08-11
+ClothingUniformJumpsuitChiefEngineerNT: ClothingUniformJumpsuitChiefEngineer
+ClothingUniformJumpsuitParamedicNT: ClothingUniformJumpsuitParamedic