Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New clothing options for Chaplains [FIXED]. #728

Merged
merged 12 commits into from
Dec 25, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,26 @@
ClothingHeadHatWitch1: 3
ClothingOuterPlagueSuit: 3
ClothingMaskPlague: 3
ClothingHeadHatKippah: 3
ClothingHeadHatWideBrimmed: 3
ClothingHeadHatPilgrim: 3
ClothingUniformJumpsuitChaplainPilgrimVest: 3
ClothingHeadHatBishopMitre: 3
ClothingOuterCoatBishop: 3
ClothingHeadHatCardinal: 3
ClothingOuterCoatCardinal: 3
ClothingHeadHatWitchhunter: 3
ClothingOuterCoatWitchHunter: 3
ClothingNeckScarfChaplainStole: 3
ClothingBeltChaplainSash: 3
ClothingHeadsetService: 4
RubberStampChaplain: 3
Bible: 3
UrnMortuary: 4
Censer: 2
ClothingNeckCrucifix: 3
emaggedInventory:
WoodenStake: 6
ClothingOuterArmorCult: 1
ClothingHeadHelmetCult: 1
ClothingOuterRobesCult: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
- type: Tag
tags:
- Trash
- Ash # Frontier
- type: SolutionContainerManager
solutions:
food:
Expand Down
54 changes: 54 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,57 @@
- type: Clothing
sprite: _NF/Clothing/Belt/arcadia-webbing.rsi

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltChaplainSash
name: chaplain sash
description: Who knew that scarves can be also tied around your waist?
components:
- type: Sprite
sprite: _NF/Clothing/Belt/chaplain_sash.rsi
- type: Clothing
sprite: _NF/Clothing/Belt/chaplain_sash.rsi
- type: Storage
capacity: 45
# TODO: Fill this out more.
whitelist:
tags:
- Book
- Smokable
- Flare
- Matchstick
- Flashlight
- Trash
- CigPack
- Radio
- Crayon
- Bottle
- WeaponMeleeStake
- Censer
- ReligiousSymbol
- Crucifix
- type: ItemMapper
mapLayers:
book:
whitelist:
tags:
- Book
bottle:
whitelist:
tags:
- Bottle
censer:
whitelist:
tags:
- Censer
stake:
whitelist:
tags:
- WeaponMeleeStake
crucifix:
whitelist:
tags:
- Crucifix
sprite: _NF/Clothing/Belt/chaplain_sash_overlay.rsi
- type: Appearance

105 changes: 105 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,108 @@
id: ClothingHeadHatBH
name: "bounty hunter's hat"
description: "There's a new bounty hunter in the sector."

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatPilgrim
name: pilgrim's hat
description: "Thou shalt not suffer a turkey to live."
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatWideBrimmed
name: wide-brimmed hat
description: Works great as frisbee substitute.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCardinal
name: cardinal's hat
description: Keeps your head well protected from sun and reason.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatWitchhunter
name: witch hunter's hat
description: "Thou shalt not suffer a witch to live."
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBishopMitre
name: bishop's mitre
description: How to wear this thing? Ah! The other way around!
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatKippah
name: kippah
description: Basic version without built-in ATM.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/kippah.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/kippah.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoodCardinalHood
noSpawn: true
name: cardinal's hood
description: Hides your eyes, ensteels your faith.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/cardinal_hood.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/cardinal_hood.rsi
- type: Tag
tags:
- WhitelistChameleon
20 changes: 20 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifix
name: crucifix
description: Damn, it feels good to be so pious.
components:
- type: Item
size: 5
- type: Sprite
sprite: _NF/Clothing/Neck/Misc/crucifix.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Misc/crucifix.rsi
- type: ReactionMixer # I'm assuming that this is used to make holy water
mixMessage: "bible-mixing-success"
reactionTypes:
- Holy
- type: Tag
tags:
- ObjectOfSpiritualSignificance
- Crucifix
13 changes: 13 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckScarfChaplainStole
name: chaplain's stole
description: A necessary evil for ordained priests outfit. Gives at least +2 to your holiness.
components:
- type: Tag
tags:
- ObjectOfSpiritualSignificance
- type: Sprite
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
37 changes: 37 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,40 @@
Heat: 0.9
- type: ExplosionResistance
damageCoefficient: 0.80

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatBishop
name: bishop's robes
description: Golden threads aren't actually made of gold. Bummer.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Misc/bishop_robe.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Misc/bishop_robe.rsi

- type: entity
parent: ClothingOuterBaseToggleable
id: ClothingOuterCoatWitchHunter
name: witch hunter's coat
description: Looks even better under constant rain with storm wind.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Misc/witch_hunter_coat.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Misc/witch_hunter_coat.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodChaplainHood

- type: entity
parent: ClothingOuterBaseToggleable
id: ClothingOuterCoatCardinal
name: cardinal's coat
description: Nobody expects the spanish inquisition!
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Misc/cardinal_robe.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Misc/cardinal_robe.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodCardinalHood
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,14 @@
id: ClothingUniformJumpsuitBH
name: bounty hunter's hard-worn suit
description: Someone who wears this means business.

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChaplainPilgrimVest
name: pilgrim jumpsuit
description: Knock-knock. Would you care to have a word about our Lord-n-Savior Nar-Sss.. Err.. Space Jeebus?
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi
56 changes: 56 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Misc/censer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
- type: entity
name: censer
parent: BaseItem
id: Censer
description: Usually you put incense in there.
components:
- type: Smokable
exposeTemperature: 1173.15
- type: Tag
tags:
- ObjectOfSpiritualSignificance
- Censer
- type: StaticPrice
price: 5
- type: InjectableSolution
solution: smokable
- type: ContainerContainer
containers:
bowl_slot: !type:ContainerSlot
- type: ItemSlots
- type: SmokingPipe
bowl_slot:
name: Bowl
whitelist:
tags:
- Smokable
insertSound:
path: /Audio/Weapons/Guns/Empty/empty.ogg
ejectSound:
path: /Audio/Weapons/Guns/Empty/empty.ogg
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 20
- type: Sprite
sprite: _NF/Objects/Misc/censer.rsi
state: unlit-icon
- type: Clothing
sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi
slots: [ belt ]
equippedPrefix: unlit
- type: Item
size: 10
sprite: _NF/Objects/Misc/censer.rsi
- type: Appearance
- type: BurnStateVisuals
unlitIcon: unlit-icon
- type: MeleeWeapon
wideAnimationRotation: 0
attackRate: 1
damage:
types:
Blunt: 3
Heat: 3
# - type: IgniteOnMeleeHit
# fireStacks: 1
Loading
Loading