From 3a3128566dd0a054ca70f41b36b74809cdac6120 Mon Sep 17 00:00:00 2001
From: Justin Trotter <trotter.justin@gmail.com>
Date: Sat, 13 Aug 2022 08:57:49 -0500
Subject: [PATCH] nukie jumpsuits and skirts sensors off (#10267)

---
 .../Uniforms/base_clothinguniforms.yml        | 57 ++++++++++---------
 .../Entities/Clothing/Uniforms/jumpskirts.yml | 13 ++---
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  8 +--
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index e564824e41..ac934f74c3 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -1,7 +1,34 @@
 - type: entity
   abstract: true
   parent: Clothing
-  id: ClothingWithSuitSensor
+  id: UnsensoredClothingUniformBase
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    slots: [innerclothing]
+    equipSound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 3
+
+- type: entity
+  abstract: true
+  parent: UnsensoredClothingUniformBase
+  id: UnsensoredClothingUniformSkirtBase
+  components:
+  - type: Clothing
+    slots: [innerclothing]
+    femaleMask: UniformTop
+
+
+- type: entity
+  abstract: true
+  parent: UnsensoredClothingUniformBase
+  id: ClothingUniformBase
   components:
   - type: SuitSensor
   - type: DeviceNetwork
@@ -12,35 +39,9 @@
 
 - type: entity
   abstract: true
-  parent: ClothingWithSuitSensor
-  id: ClothingUniformBase
-  components:
-  - type: Sprite
-    state: icon
-  - type: Clothing
-    slots: [innerclothing]
-    equipSound:
-      path: /Audio/Items/jumpsuit_equip.ogg
-  - type: Butcherable
-    butcheringType: Knife
-    spawned:
-    - id: MaterialCloth1
-      amount: 3
-
-- type: entity
-  abstract: true
-  parent: ClothingWithSuitSensor
+  parent: ClothingUniformBase
   id: ClothingUniformSkirtBase
   components:
-  - type: Sprite
-    state: icon
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
-    equipSound:
-      path: /Audio/Items/jumpsuit_equip.ogg
-  - type: Butcherable
-    butcheringType: Knife
-    spawned:
-    - id: MaterialCloth1
-      amount: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index a2dbf6c95c..35c65ac28c 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -497,7 +497,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
-    
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCentcomFormalDress
@@ -507,8 +507,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi   
-    
+    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtHosFormal
@@ -518,10 +518,10 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi      
+    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: UnsensoredClothingUniformSkirtBase
   id: ClothingUniformJumpskirtOperative
   name: operative jumpskirt
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.
@@ -529,7 +529,7 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi  
+    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -552,4 +552,3 @@
     sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi
-    
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index e813223be8..4881e73efe 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -670,7 +670,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: UnsensoredClothingUniformBase
   id: ClothingUniformJumpsuitPyjamaSyndicateBlack
   name: black syndicate pyjamas
   description: For those long nights in perma.
@@ -681,7 +681,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: UnsensoredClothingUniformBase
   id: ClothingUniformJumpsuitPyjamaSyndicatePink
   name: pink syndicate pyjamas
   description: For those long nights in perma.
@@ -692,7 +692,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: UnsensoredClothingUniformBase
   id: ClothingUniformJumpsuitPyjamaSyndicateRed
   name: red syndicate pyjamas
   description: For those long nights in perma.
@@ -747,7 +747,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: UnsensoredClothingUniformBase
   id: ClothingUniformJumpsuitOperative
   name: operative jumpsuit
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.