Revert "Temporarily Revert "Resprites Service Uniforms & Adds Rolled …

…Sleeve Variants (#1021)""

This reverts commit c3a5e10.

Resources/Locale/en-US/foldable/components/foldable-component.ftl

@@ -4,7 +4,11 @@ foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
 
+# Hat
 fold-flip-verb = Flip
-
+# Coat
 fold-zip-verb = Zip up
 fold-unzip-verb = Unzip
+# Jumpsuits
+fold-rollsleeves-verb = roll sleeves up
+fold-unrollsleeves-verb = roll sleeves down

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -258,6 +258,36 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadHatChef
+  id: ClothingHeadHatChefNt
+  name: nanotrasen chef's hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/chefhat_nt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/chefhat_nt.rsi
+
+- type: entity
+  parent: ClothingHeadHatChef
+  id: ClothingHeadHatChefIdris
+  name: idris incorporated chef's hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/chefhat_idris.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/chefhat_idris.rsi
+
+- type: entity
+  parent: ClothingHeadHatChef
+  id: ClothingHeadHatChefOrion
+  name: orion express' chef hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/chefhat_orion.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/chefhat_orion.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatFedoraBrown
@@ -1098,3 +1128,33 @@
     sprite: Clothing/Head/Hats/beret_medic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_medic.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatFlatcapBartenderNanotrasen
+  name: bartender's nanotrasen flatcap
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/flatcap_nt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/flatcap_nt.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatFlatcapBartenderIdris
+  name: bartender's idris incorporated flatcap
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/flatcap_idris.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/flatcap_idris.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatFlatcapBartenderOrion
+  name: bartender's orion express flatcap
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/flatcap_orion.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/flatcap_orion.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml

@@ -56,6 +56,39 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/chef.rsi
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterJacketChefNt
+  name: nanotrasen chef jacket
+  description: An apron-jacket used by a high class Nanotrasen Corporation chef.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/chef_nt.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/chef_nt.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterJacketChefIdris
+  name: idris chef jacket
+  description: An apron-jacket used by a high class Idris Incorporated chef.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/chef_idris.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/chef_idris.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterJacketChefOrion
+  name: orion chef jacket
+  description: An apron-jacket used by a high class Orion Expresschef.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/chef_orion.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/chef_orion.rsi
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterHoodieBlack

Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

@@ -87,3 +87,36 @@
     sprite: Clothing/OuterClothing/Vests/vest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/vest.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestNt
+  name: nanotrasen vest
+  description: A thick vest with a rubbery, water-resistant shell coloured in blue.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/vest_nt.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/vest_nt.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestIdris
+  name: idris incorporated vest
+  description: A thick vest with a rubbery, water-resistant shell coloured in teal.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/vest_idris.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/vest_idris.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestOrion
+  name: orion express vest
+  description: A thick vest with a rubbery, water-resistant shell coloured in brown.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/vest_orion.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/vest_orion.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -9,6 +9,12 @@
     slots: [innerclothing]
     equipSound:
       path: /Audio/Items/jumpsuit_equip.ogg
+  - type: EmitSoundOnPickup # Not sure why this wasn't set to the base; as all clothes should have clothing sounds.
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
   - type: Butcherable
     butcheringType: Knife
     spawned:
@@ -36,7 +42,7 @@
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
-  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+  - type: Tag # Needed for species with nonhuman legs/can only wear skirts
     tags:
     - Skirt
     - ClothMade
@@ -53,12 +59,6 @@
   - type: WirelessNetworkConnection
     range: 1200
   - type: StationLimitedNetwork
-  - type: EmitSoundOnPickup
-    sound: /Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg
-  - type: EmitSoundOnDrop
-    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
-  - type: EmitSoundOnLand
-    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
 
 - type: entity
   abstract: true
@@ -68,7 +68,87 @@
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
-  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+  - type: Tag # Needed for species with nonhuman legs/can only wear skirts
+              # And for moths to be able to eat this.
     tags:
     - Skirt
-    - ClothMade # Delta-V - allows moths to eat this
+    - ClothMade
+
+- type: entity # For clothes that need suit sensors.
+  parent: [UnsensoredClothingUniformBase, BaseFoldable]
+  id: ClothingUniformBaseUnsensoredFlippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-unrollsleeves-verb
+    foldVerbText: fold-rollsleeves-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity # For clothes that need suit sensors.
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingUniformBaseUnsensoredFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true
+
+- type: entity # For clothes that don't need suit sensors.
+  parent: ClothingUniformBaseUnsensoredFlippable
+  id: ClothingUniformBaseFlippable
+  abstract: true
+  components:
+  - type: SuitSensor
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    transmitFrequencyId: SuitSensor
+  - type: WirelessNetworkConnection
+    range: 1200
+  - type: StationLimitedNetwork
+
+- type: entity # For clothes that don't need suit sensors.
+  parent: ClothingUniformBaseFlippable
+  id: ClothingUniformBaseFlipped
+  suffix: flipped
+  abstract: true
+  components: # I *think* I can just disregard the components;
+              # and inherit from ClothingUniformBaseFlippable
+              # and ClothingUniformBaseUnsensoredFlipped but I don't want to
+              # test that right now.
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true