-
Notifications
You must be signed in to change notification settings - Fork 599
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New clothing options for Chaplains [FIXED]. (#728)
* fixed version * fixed wooden stake recipe * nerfed wooden stake (dmg 8 -> 6) * removed glass breaking sound from stake * added mortuary urn, tweaked tags a bit * fixed error in tags * added inhand graphics for urn * fixed urn lable slot * maybe fixed merge conflict * reverted mortuary urn from cool "alternative item interaction" mode to lame "staightforward item interaction" mode
- Loading branch information
1 parent
cd6ef8c
commit 9aabca7
Showing
116 changed files
with
1,061 additions
and
0 deletions.
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 |
|---|---|---|
|
|
@@ -108,6 +108,7 @@ | |
| - type: Tag | ||
| tags: | ||
| - Trash | ||
| - Ash # Frontier | ||
| - type: SolutionContainerManager | ||
| solutions: | ||
| food: | ||
|
|
||
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
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: 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
13
Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.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,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 |
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
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,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 |
Oops, something went wrong.