Skip to content

Commit

Permalink
Resprites Service Uniforms & Adds Rolled Sleeve Variants (#1021)
Browse files Browse the repository at this point in the history
# Description

This PR resprites the service uniforms with the Aurora variants, as well
as doing minor yaml cleanup for the base_clothinguniforms.yml

Aurora has 2-3 variants for service staff; based on which company
they're associated with. So far I've just picked the Nanotrasen variant,
because SS14 uses Nanotrasen.

My question is:
A) Should I port the extra uniforms and stick them in loadouts, for
variety & drip?
i) Should I keep the company names on these uniforms if I port them, or
should I keep it
     Nanotrasen?

This PR also removes in-hand variants; they're not supported in aurora
and it's not critical game info to see someone carrying a shirt & pants.

This PR similarly removes the animal variants; the Vox PR should have
displacement maps to support it.

---

# TODO

- [X] Bartender Jumpsuit
- [X] Bartender Vest
- [X] Bartender Hat

- [X] Janitor Jumpsuit
- [X] Chef Jumpsuit
- [X] Chef Freezer Jacket
- [X] Chef Hat

- [X] Botanist Uniform
- [x] Librarian Uniform 
^ Librarian Jumpsuit has been added with four extra variants, some
corporations who do not employ Librarians still have jumpsuit sprites.

---

<details><summary><h1>Media</h1></summary>
<p>

## Nanotrasen Bartender


![image](https://github.com/user-attachments/assets/f92b9dd2-43ee-4b90-9178-688041b1a47a)

![image](https://github.com/user-attachments/assets/1b363bb6-6243-4c36-b932-ac2068231502)

![image](https://github.com/user-attachments/assets/05fab0ba-f214-4e94-9767-b4b5bb150aca)

![image](https://github.com/user-attachments/assets/ed7941c5-630a-48a0-8825-4df3b1cd3585)

## Nanotrasen Chef


![image](https://github.com/user-attachments/assets/2df1dcfe-3999-499b-a6b5-8005b65ea1d0)

![image](https://github.com/user-attachments/assets/ecaa5b05-ac62-4c77-8420-8055637777e7)

![image](https://github.com/user-attachments/assets/bfb1864b-3dfc-4f9b-b6c1-be8b95bb80f6)

![image](https://github.com/user-attachments/assets/76c44aca-1014-4371-92c6-b3a0498c8b2d)

## Nanotrasen Botanist


![image](https://github.com/user-attachments/assets/f2569669-b862-4bfa-b9ad-4a44e4393eb2)

![image](https://github.com/user-attachments/assets/f3d56d27-11a9-4990-85f6-de53aa78ee31)

![image](https://github.com/user-attachments/assets/9018e2ee-6025-4a4d-ab85-f431423779aa)

![image](https://github.com/user-attachments/assets/8e0761ac-790f-4323-a34a-d51b7dcb6523)

## Nanotrasen Janitor


![image](https://github.com/user-attachments/assets/26bdae8d-dd5a-4653-9288-f4d0e22fbe2c)

![image](https://github.com/user-attachments/assets/6c5aee12-b4ed-4bdb-ab9c-dc7249724458)

![image](https://github.com/user-attachments/assets/da42d89c-e5ce-4f43-8a80-f9f09e68c4fc)

![image](https://github.com/user-attachments/assets/dc0bb874-2ed7-4c22-aa56-6e4adead87ac)

## Nanotrasen Librarian


![image](https://github.com/user-attachments/assets/a3c17db1-bfec-466a-9380-33a33cbfec57)

![image](https://github.com/user-attachments/assets/98687682-d743-41dd-9f27-4cd972ecc57f)

![image](https://github.com/user-attachments/assets/2fdb771d-8b77-421d-9d98-8b1e83b3cdb2)

![image](https://github.com/user-attachments/assets/3465c21e-7da5-4b80-9ed9-3ffbbb008f3b)

</p>
</details>

---

# Changelog

:cl: DangerRevolution
- add: Resprited basic Service Staff uniforms
- add: Add rolled sleeve variants for Service Staff uniforms.
  • Loading branch information
DangerRevolution authored Oct 10, 2024
1 parent 683b8b6 commit 00d83ef
Show file tree
Hide file tree
Showing 137 changed files with 1,219 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
60 changes: 60 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Loading

0 comments on commit 00d83ef

Please sign in to comment.