Skip to content

Commit fa0b6be

Browse files
pirakaplantpirakaplant
authored
Hospitality Director (funky-station#329)
* renamed hospitalitydirector.yml to conform with standards, added full loadout * updated job spawner * added HD dresser * changed my mind on the outerclothing minlimit & reordered some stuff for consistency * added clothing recipes * updated playtime and chameleon outfit * uhhhhhhhhhhh actually make it 20h Service * forgot to add the flash like other command roles * fixed HD getting two glove sections for their loadout
1 parent 79571cb commit fa0b6be

47 files changed

Lines changed: 439 additions & 10 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Resources/Locale/en-US/_Funkystation/preferences/loadout-groups.ftl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,10 @@ fu-loadout-group-cmo-uniform = Chief Medical Officer's uniform
2323
2424
fu-loadout-group-medical-intern-head = Medical Intern head
2525
fu-loadout-group-medical-intern-uniform = Medical Intern uniform
26+
27+
# Service
28+
fu-loadout-group-hd-head = Hospitality Director's head
29+
fu-loadout-group-hd-outerclothing = Hospitality Director's outer clothing
30+
fu-loadout-group-hd-uniform = Hospitality Director's uniform
31+
fu-loadout-group-hd-gloves = Hospitality Director's gloves
32+
fu-loadout-group-hd-shoes = Hospitality Director's shoes

‎Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,14 @@
137137
- ClothingUniformJumpskirtMime
138138
- ClothingUniformJumpsuitMusician
139139
- ClothingUniformJumpsuitTramDriver
140+
# Funky start
141+
- FuClothingUniformShirtPantsHd
142+
- FuClothingUniformShirtSkirtHd
143+
- FuClothingOuterCoatHd
144+
- FuClothingOuterVestHd
145+
- FuClothingOuterWinterHd
146+
- FuClothingHeadHatHd
147+
# Funky end
140148

141149
- type: latheRecipePack
142150
id: WinterCoats

‎Resources/Prototypes/_Funkystation/Catalog/Fills/Lockers/dressers.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
- type: entity
2+
id: DresserHospitalityDirectorFilled
3+
parent: Dresser
4+
suffix: Filled, HospitalityDirector
5+
components:
6+
- type: EntityTableContainerFill
7+
containers:
8+
storagebase: !type:AllSelector
9+
children:
10+
- id: ClothingHeadHatTophat
11+
- id: FuClothingHeadHatHd
12+
- id: FuClothingUniformShirtPantsHd
13+
- id: FuClothingUniformShirtSkirtHd
14+
- id: FuClothingOuterCoatHd
15+
- id: FuClothingOuterVestHd
16+
- id: FuClothingOuterWinterHd
17+
- id: ClothingHandsGlovesColorWhite

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,19 @@
117117
- type: Tag
118118
tags:
119119
- ClothMade
120+
121+
# Hospitality Director's hat
122+
- type: entity
123+
parent: [ClothingHeadBase, BaseCommandContraband]
124+
id: FuClothingHeadHatHd
125+
name: hospitality director's pillbox hat
126+
description: A simple yet elegant red hat with gold trim.
127+
components:
128+
- type: Sprite
129+
sprite: _Funkystation/Clothing/Head/Hats/hd.rsi
130+
- type: Clothing
131+
sprite: _Funkystation/Clothing/Head/Hats/hd.rsi
132+
- type: Tag
133+
tags:
134+
- ClothMade
135+
- WhitelistChameleon

‎Resources/Prototypes/_Funkystation/Entities/Clothing/OuterClothing/coats.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,16 @@
4646
Slash: 0.95
4747
Heat: 0.90
4848
Caustic: 0.75
49+
50+
# HD coat - non-toggleable
51+
52+
- type: entity
53+
parent: [ClothingOuterStorageBase, BaseCommandContraband]
54+
id: FuClothingOuterCoatHd
55+
name: hospitality director's coat
56+
description: A red coat with gold buttons and embroidery. Unfortunately, the cufflinks are missing.
57+
components:
58+
- type: Sprite
59+
sprite: _Funkystation/Clothing/OuterClothing/Coats/hd.rsi
60+
- type: Clothing
61+
sprite: _Funkystation/Clothing/OuterClothing/Coats/hd.rsi

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# HD's vest
2+
3+
- type: entity
4+
parent: [ClothingOuterBase, BaseCommandContraband]
5+
id: FuClothingOuterVestHd
6+
name: hospitality director's vest
7+
description: A lovely red vest for yelling at waitstaff in.
8+
components:
9+
- type: Sprite
10+
sprite: _Funkystation/Clothing/OuterClothing/Vests/hd.rsi
11+
- type: Clothing
12+
sprite: _Funkystation/Clothing/OuterClothing/Vests/hd.rsi

‎Resources/Prototypes/_Funkystation/Entities/Clothing/OuterClothing/wintercoats.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,14 @@
8383
parent: [ClothingOuterStorageFoldableBaseOpened, FuClothingOuterWinterCmo]
8484
id: FuClothingOuterWinterCmoOpened
8585
name: chief medical officer's insulated labcoat
86+
87+
- type: entity
88+
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
89+
id: FuClothingOuterWinterHd
90+
name: hospitality director's winter coat
91+
description: A stylish, gold-trimmed coat for when the distro becomes a bit chilly. Comes with a superfluous belt.
92+
components:
93+
- type: Sprite
94+
sprite: _Funkystation/Clothing/OuterClothing/Wintercoats/NoHood/hd.rsi
95+
- type: Clothing
96+
sprite: _Funkystation/Clothing/OuterClothing/Wintercoats/NoHood/hd.rsi

‎Resources/Prototypes/_Funkystation/Entities/Clothing/Uniforms/service.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Hospitality Director
2+
3+
- type: entity
4+
parent: [ClothingUniformBase, BaseCommandContraband]
5+
id: FuClothingUniformShirtPantsHd
6+
name: hospitality director's uniform
7+
description: A gold-buttoned dress shirt matched with a pair of gold-lined pants. They've just been ironed.
8+
components:
9+
- type: Sprite
10+
sprite: _Funkystation/Clothing/Uniforms/Service/TwoPiecePants/hd.rsi
11+
- type: Clothing
12+
sprite: _Funkystation/Clothing/Uniforms/Service/TwoPiecePants/hd.rsi
13+
14+
- type: entity
15+
parent: [ClothingUniformBase, BaseCommandContraband]
16+
id: FuClothingUniformShirtSkirtHd
17+
name: hospitality director's uniform
18+
description: A gold-buttoned dress shirt matched with a gold-lined pencil skirt. They've just been ironed.
19+
components:
20+
- type: Sprite
21+
sprite: _Funkystation/Clothing/Uniforms/Service/TwoPieceSkirt/hd.rsi
22+
- type: Clothing
23+
sprite: _Funkystation/Clothing/Uniforms/Service/TwoPieceSkirt/hd.rsi

‎Resources/Prototypes/_Funkystation/Entities/Markers/Spawners/jobs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@
4242
- type: SpawnPoint
4343
job_id: HospitalityDirector
4444
- type: Sprite
45+
sprite: _Funkystation/Markers/jobs.rsi
4546
layers:
4647
- state: green
47-
- state: hop
48+
- state: hd
4849

4950
- type: entity
5051
id: SpawnPointExecutiveOfficer

‎Resources/Prototypes/_Funkystation/Loadouts/Jobs/Service/hd.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# hats
2+
3+
- type: loadout
4+
id: FuHdPillboxHat
5+
equipment:
6+
head: FuClothingHeadHatHd
7+
8+
- type: loadout
9+
id: FuHdTopHat
10+
equipment:
11+
head: ClothingHeadHatTophat
12+
13+
# uniforms
14+
15+
- type: loadout
16+
id: FuHdShirtPants
17+
equipment:
18+
jumpsuit: FuClothingUniformShirtPantsHd
19+
20+
- type: loadout
21+
id: FuHdShirtSkirt
22+
equipment:
23+
jumpsuit: FuClothingUniformShirtSkirtHd
24+
25+
# outer clothing
26+
27+
- type: loadout
28+
id: FuHdCoat
29+
equipment:
30+
outerClothing: FuClothingOuterCoatHd
31+
32+
- type: loadout
33+
id: FuHdVest
34+
equipment:
35+
outerClothing: FuClothingOuterVestHd
36+
37+
- type: loadout
38+
id: FuHdWinterCoat
39+
equipment:
40+
outerClothing: FuClothingOuterWinterHd
41+
42+
# shoes
43+
44+
# These can fit a knife/sidearm in them but this doesn't have the knife in it plus it's on a command role
45+
# So it's probably okay
46+
- type: loadout
47+
id: FuHdHighHeelBoots
48+
equipment:
49+
shoes: ClothingShoesHighheelBoots
50+
51+
- type: loadout
52+
id: FuHdLaceupBoots
53+
equipment:
54+
shoes: ClothingShoesBootsLaceup

0 commit comments

Comments
 (0)