Skip to content

Commit 656b731

Browse files
authored
Removal of PlushieKitsuneCaptain and its corresponding sprite. (Floof-Station#511)
* Removal of PlushieKitsuneCaptain and its corresponding sprite. * Removed from prize counter, random spawns, and prizeballs. Yap remapped to PlushieERTFox * Remove two more plushie sprites.
1 parent b3f2334 commit 656b731

9 files changed

Lines changed: 5 additions & 46 deletions

File tree

Resources/Prototypes/_Floof/Catalog/Fills/toy_tables.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
table: !type:GroupSelector
124124
children:
125125
- id: PlushieSlimeTider
126-
- id: PlushieKitsuneCaptain
127126
- id: PlushieSapphicHarpyPlushie
128127
- id: PlushieRatLogisticsOfficer
129128
- id: PlushieBunnyChiefMedicalOfficer

Resources/Prototypes/_Floof/Entities/Objects/Fun/Toys/plushies_personal.yml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,6 @@
6767
- type: EmitSoundOnCollide
6868
sound: *landCentcom
6969

70-
- type: entity
71-
parent: PlushieHuman
72-
id: PlushieKitsuneCaptain
73-
name: Kitsune captain plushie
74-
description: A Kitsune captain, this one seems to be particularly fluffy, especially their tails. the label reads 'Be careful around fire'.
75-
components:
76-
- type: Sprite
77-
sprite: _Floof/Objects/Fun/floof_plush.rsi
78-
state: kitsune
79-
- type: UseDelay
80-
delay: 3.0
81-
- type: EmitSoundOnUse
82-
sound: &yap
83-
path: /Audio/_Floof/Voice/Vulpkanin/yap.ogg
84-
params:
85-
volume: -1
86-
variation: 0.05
87-
- type: EmitSoundOnLand
88-
sound: *yap
89-
- type: EmitSoundOnCollide
90-
sound: *yap
91-
- type: EmitSoundOnActivate
92-
sound: *yap
93-
- type: MeleeWeapon
94-
soundHit: *yap
95-
9670
- type: entity
9771
parent: PlushieHuman
9872
id: PlushieSapphicHarpyPlushie
@@ -520,7 +494,11 @@
520494
params:
521495
volume: 2
522496
- type: EmitSoundOnLand
523-
sound: *yap
497+
sound: &yap
498+
path: /Audio/_Floof/Voice/Vulpkanin/yap.ogg
499+
params:
500+
volume: -1
501+
variation: 0.05
524502
- type: EmitSoundOnCollide
525503
sound: *yap
526504
- type: EmitSoundOnActivate

Resources/Prototypes/_Floof/Recipes/Lathes/Packs/prize_counter.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
- PlushieFRavager
9191
- PlushieSlimeTider
9292
- PlushieChillHuman
93-
- PlushieKitsuneCaptain
9493
- PlushieSapphicHarpyPlushie
9594
- PlushieAvaliHOP
9695
- PlushieKoboldCefJustice

Resources/Prototypes/_Floof/Recipes/Lathes/prize_counter.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -662,14 +662,6 @@
662662
materials:
663663
PrizeTicket: 50
664664

665-
- type: latheRecipe
666-
id: PlushieKitsuneCaptain
667-
result: PlushieKitsuneCaptain
668-
applyMaterialDiscount: false
669-
completetime: 0.1
670-
materials:
671-
PrizeTicket: 50
672-
673665
- type: latheRecipe
674666
id: PlushieSapphicHarpyPlushie
675667
result: PlushieSapphicHarpyPlushie
Binary file not shown.
-1.25 KB
Binary file not shown.

Resources/Textures/_Floof/Objects/Fun/floof_plush.rsi/meta.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
{
1111
"name": "chill"
1212
},
13-
{
14-
"name": "kitsune"
15-
},
1613
{
1714
"name": "salvager"
1815
},
@@ -31,9 +28,6 @@
3128
{
3229
"name": "slime"
3330
},
34-
{
35-
"name": "girlfailure"
36-
},
3731
{
3832
"name": "kobolt"
3933
},

Resources/Textures/_Floof/Objects/Fun/toys.rsi/meta.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
{
3838
"name": "plushie_slips"
3939
},
40-
{
41-
"name": "plushie_trystan"
42-
},
4340
{
4441
"name": "plushie_vulp"
4542
},
-1.08 KB
Binary file not shown.

0 commit comments

Comments
 (0)