Skip to content

Commit

Permalink
Merge pull request #21 from Merrokitsune/Add-Blackburn-Items
Browse files Browse the repository at this point in the history
Add blackburn items
  • Loading branch information
RonRonstation authored Apr 28, 2024
2 parents 25e645f + a434f1a commit 36b9ef2
Show file tree
Hide file tree
Showing 12 changed files with 135 additions and 0 deletions.
Binary file added Resources/Audio/Items/Toys/fox.ogg
Binary file not shown.
29 changes: 29 additions & 0 deletions Resources/Prototypes/Entities/Caldera/clothing/costumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: entity
parent: ClothingUniformSkirtBase
id: BKTurtleSkirt
name: Blackburna Turtle Skirt
description: A uniform consisting of snow coloured Turtleneck sweater with a navy blue skirt and gold belt straps.
components:
- type: Sprite
sprite: Caldera/clothing/YTS.rsi
- type: Clothing
sprite: Caldera/clothing/YTS.rsi

- type: entity
parent: ClothingMaskBase
id: BKKitsuneMask
name: Blackburna Kitsune Mask
description: A mask of a fox usually worn by the blackburna army of certain rank
components:
- type: Item
size: Tiny
- type: Sprite
sprite: Caldera/clothing/BKKitsuneMask.rsi
- type: Clothing
sprite: Caldera/clothing/BKKitsuneMask.rsi
- type: BreathMask
- type: IngestionBlocker
- type: Tag
tags:
- WhitelistChameleon
- HidesNose
59 changes: 59 additions & 0 deletions Resources/Prototypes/Entities/Caldera/objects/plushies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
- type: entity
parent: BasePlushie
id: PlushieBlackburna
name: Blackburn Plushie
description: A stuffed toy that resembles a typical non-altered blackburna.
components:
- type: Sprite
sprite: Caldera/objects/BKPlushie.rsi
state: plushie_Bkv1
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnTrigger
sound:
path: /Audio/Items/Toys/fox.ogg
- type: Food
requiresSpecialDigestion: true
useSound:
path: /Audio/Items/Toys/fox.ogg
- type: MeleeWeapon
wideAnimationRotation: 180
soundHit:
path: /Audio/Items/Toys/fox.ogg

- type: entity
parent: BasePlushie
id: PlushiePlyushkina
name: Plyushkina Plushie
description: A stuffed toy that resembles a sub-species of blackburn created for trench clearing and cannon fodder.
components:
- type: Sprite
sprite: Caldera/objects/BKPlushie.rsi
state: plushie_Bkv2
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/fox.ogg
- type: EmitSoundOnTrigger
sound:
path: /Audio/Items/Toys/fox.ogg
- type: Food
requiresSpecialDigestion: true
useSound:
path: /Audio/Items/Toys/fox.ogg
- type: MeleeWeapon
wideAnimationRotation: 180
soundHit:
path: /Audio/Items/Toys/fox.ogg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions Resources/Textures/Caldera/clothing/BKKitsuneMask.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "AR/molotov/plyush",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
}]}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions Resources/Textures/Caldera/clothing/YTS.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "AR/molotov/plyush",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
}]}
15 changes: 15 additions & 0 deletions Resources/Textures/Caldera/objects/BKPlushie.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "AR/molotov/plyush, merrokitsune/Bellkitsu/Barnacle14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "plushie_Bkv1"
},
{
"name": "plushie_Bkv2"
}]}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 36b9ef2

Please sign in to comment.