-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* MAID AND BOMZH (#605) * First * Second * oops * translate * rework * resprite * resprite1 * a * forgot * Reorganisation * whatthefuckiamdoing * blyat * REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE * character-requirements, loadouts and other * burnthis * *clap*
- Loading branch information
1 parent
71ab3cc
commit 60d7000
Showing
84 changed files
with
808 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
job-name-maid = Maid | ||
job-name-hobo = Hobo | ||
# Role timers - Make these alphabetical or I cut you | ||
JobMaid = Maid | ||
JobHobo = Hobo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -767,3 +767,5 @@ | |
- state: equipped-INNERCLOTHING-jumpskirt | ||
- state: equipped-INNERCLOTHING-shirt | ||
color: "#b30000" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/_White/Entities/Clothing/Eyes/glasses.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
- type: entity | ||
parent: ClothingEyesBase | ||
id: ClothingEyesGlassesMaid | ||
name: maid's sunglasses | ||
description: Maid's sunglasses. Clean and cute. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Eyes/Glasses/maidglasses.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Eyes/Glasses/maidglasses.rsi | ||
- type: FlashImmunity | ||
- type: Tag | ||
tags: | ||
- WhitelistChameleon | ||
- type: ShowSecurityIcons |
43 changes: 43 additions & 0 deletions
43
Resources/Prototypes/_White/Entities/Clothing/Head/hats.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ClothingHeadHatHoboHat | ||
name: hobo hat | ||
description: An old century hat. It's worn out and looks unkempt. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Head/hobohat.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Head/hobohat.rsi | ||
- type: Tag | ||
tags: | ||
- HidesHair | ||
- type: Armor | ||
modifiers: | ||
coefficients: | ||
Blunt: 0.95 | ||
|
||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ClothingHeadHatHoboCap | ||
name: hobo cap | ||
description: Uninvited guest cap. Doesn't inspire confidence. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Head/hobocap.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Head/hobocap.rsi | ||
- type: Armor | ||
modifiers: | ||
coefficients: | ||
Blunt: 0.95 | ||
|
||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ClothingHeadHatMobCap | ||
name: maid's mob cap | ||
description: The headdress of a true servant. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Head/maidhat.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Head/maidhat.rsi |
20 changes: 20 additions & 0 deletions
20
Resources/Prototypes/_White/Entities/Clothing/OuterClothing/coats.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
- type: entity | ||
parent: ClothingOuterStorageBase | ||
id: ClothingOuterOverCoatHobo | ||
name: hobo's overcoat | ||
description: The jacket has been through a lot, time has not been tolerant of it and has left its scars. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/OuterClothing/Coats/jacket.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/OuterClothing/Coats/jacket.rsi | ||
- type: StorageFill | ||
contents: | ||
- id: SmokingPipeFilledTobacco | ||
- type: Armor | ||
modifiers: | ||
coefficients: | ||
Blunt: 0.90 | ||
Slash: 0.90 | ||
Piercing: 0.90 | ||
Heat: 0.75 |
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/_White/Entities/Clothing/Shoes/specific.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
parent: ClothingShoesBaseButcherable | ||
id: ClothingShoesMaid | ||
name: maid shoes | ||
description: The maid's shoes. Shiny. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Shoes/maidshoes.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Shoes/maidshoes.rsi |
21 changes: 21 additions & 0 deletions
21
Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpskirts.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
- type: entity | ||
parent: ClothingUniformSkirtBase | ||
id: ClothingUniformJumpskirtMaid | ||
name: maid's jumpskirt | ||
description: Elegant maid's dress. Makes you feel comfortable, safe and clean around you. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Uniforms/Jumpskirt/maid.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Uniforms/Jumpskirt/maid.rsi | ||
|
||
- type: entity | ||
parent: ClothingUniformSkirtBase | ||
id: ClothingUniformJumpskirtMaidMini | ||
name: maid's mini jumpskirt | ||
description: Elegant shortened maid's servant's dress. Makes you feel comfortable, safe and clean around you. This view expands your horizon in your eyes. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Uniforms/Jumpskirt/maidmini.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Uniforms/Jumpskirt/maidmini.rsi |
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpsuits.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
parent: ClothingUniformBase | ||
id: ClothingUniformJumpsuitWhiteHobo | ||
name: hobo uniform | ||
description: The ragged form of a man who has been through a lot. It's not so much the holes in all the places that strike you as the smell of her. | ||
components: | ||
- type: Sprite | ||
sprite: _White/Clothing/Uniforms/Jumpsuit/hobo.rsi | ||
- type: Clothing | ||
sprite: _White/Clothing/Uniforms/Jumpsuit/hobo.rsi |
23 changes: 23 additions & 0 deletions
23
Resources/Prototypes/_White/Entities/Markers/Spawners/jobs.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
- type: entity | ||
id: SpawnPointHobo | ||
parent: SpawnPointJobBase | ||
name: hobo | ||
components: | ||
- type: SpawnPoint | ||
job_id: Hobo | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- state: hobo | ||
|
||
- type: entity | ||
id: SpawnPointMaid | ||
parent: SpawnPointJobBase | ||
name: maid | ||
components: | ||
- type: SpawnPoint | ||
job_id: Maid | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- state: maid |
19 changes: 19 additions & 0 deletions
19
Resources/Prototypes/_White/Entities/Objects/Devices/pda.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
- type: entity | ||
parent: BasePDA | ||
id: HoboPDA | ||
name: hobo PDA | ||
description: Life has passed and all that's left to do is move forward. | ||
components: | ||
- type: Pda | ||
id: HoboIDCard | ||
state: pda-hobo | ||
|
||
- type: entity | ||
parent: BasePDA | ||
id: MaidPDA | ||
name: maid PDA | ||
description: Shining from her own purity. | ||
components: | ||
- type: Pda | ||
id: MaidIDCard | ||
state: pda-maid |
23 changes: 23 additions & 0 deletions
23
Resources/Prototypes/_White/Entities/Objects/Misc/identification_cards.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
- type: entity | ||
parent: IDCardStandard | ||
id: HoboIDCard | ||
name: Hobo ID card | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: silver | ||
- state: idhobo | ||
- type: PresetIdCard | ||
job: Passenger | ||
|
||
- type: entity | ||
parent: IDCardStandard | ||
id: MaidIDCard | ||
name: Maid ID card | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: silver | ||
- state: idmaid | ||
- type: PresetIdCard | ||
job: Maid |
Oops, something went wrong.