Rubber chicken toy (#29637)
* -added rubber chicken toy * -Removed faulty SolutionContainerManager type -Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide. * fixed raw material cost * adjusted material composition * - Added rubber chicken to CrateFunToyBox - Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance * Update Resources/Prototypes/Entities/Objects/Fun/toys.yml --------- Co-authored-by: gambesun <116504990+gambesun@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
@@ -72,3 +72,18 @@
|
|||||||
license: "CC-BY-SA-3.0"
|
license: "CC-BY-SA-3.0"
|
||||||
copyright: "Taken from ss200, made by Daeberdir"
|
copyright: "Taken from ss200, made by Daeberdir"
|
||||||
source: "https://github.com/ss220-space/Paradise/pull/3756"
|
source: "https://github.com/ss220-space/Paradise/pull/3756"
|
||||||
|
|
||||||
|
- files: ["rubber_chicken_1.ogg"]
|
||||||
|
license: "CC0-1.0"
|
||||||
|
copyright: "Created by xprospero for ss14"
|
||||||
|
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_1.ogg"
|
||||||
|
|
||||||
|
- files: ["rubber_chicken_2.ogg"]
|
||||||
|
license: "CC0-1.0"
|
||||||
|
copyright: "Created by xprospero for ss14"
|
||||||
|
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_2.ogg"
|
||||||
|
|
||||||
|
- files: ["rubber_chicken_3.ogg"]
|
||||||
|
license: "CC0-1.0"
|
||||||
|
copyright: "Created by xprospero for ss14"
|
||||||
|
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_3.ogg"
|
||||||
|
|||||||
BIN
Resources/Audio/Items/Toys/rubber_chicken_1.ogg
Normal file
BIN
Resources/Audio/Items/Toys/rubber_chicken_1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Items/Toys/rubber_chicken_2.ogg
Normal file
BIN
Resources/Audio/Items/Toys/rubber_chicken_2.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Items/Toys/rubber_chicken_3.ogg
Normal file
BIN
Resources/Audio/Items/Toys/rubber_chicken_3.ogg
Normal file
Binary file not shown.
@@ -334,6 +334,7 @@
|
|||||||
- id: ClothingHeadHatMagician
|
- id: ClothingHeadHatMagician
|
||||||
- id: BeachBall
|
- id: BeachBall
|
||||||
- id: ClothingShoesSkates
|
- id: ClothingShoesSkates
|
||||||
|
- id: RubberChicken
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: CrateFunBikeHornImplants
|
id: CrateFunBikeHornImplants
|
||||||
|
|||||||
@@ -116,6 +116,7 @@
|
|||||||
- id: BalloonNT
|
- id: BalloonNT
|
||||||
- id: BalloonCorgi
|
- id: BalloonCorgi
|
||||||
- id: MysteryFigureBox
|
- id: MysteryFigureBox
|
||||||
|
- id: RubberChicken
|
||||||
# Cult
|
# Cult
|
||||||
- !type:AllSelector
|
- !type:AllSelector
|
||||||
children:
|
children:
|
||||||
|
|||||||
@@ -1545,3 +1545,52 @@
|
|||||||
params:
|
params:
|
||||||
volume: -9
|
volume: -9
|
||||||
maxDistance: 3
|
maxDistance: 3
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: BasePlushie
|
||||||
|
id: RubberChicken
|
||||||
|
name: rubber chicken
|
||||||
|
description: A stress inducing parody of nature's most delectable avian.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
state: rubber_chicken
|
||||||
|
- type: EmitSoundOnUse
|
||||||
|
sound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: EmitSoundOnLand
|
||||||
|
sound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: EmitSoundOnActivate
|
||||||
|
sound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: EmitSoundOnCollide
|
||||||
|
sound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: EmitSoundOnTrigger
|
||||||
|
sound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: Food
|
||||||
|
requiresSpecialDigestion: true
|
||||||
|
useSound:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: MeleeWeapon
|
||||||
|
wideAnimationRotation: 110
|
||||||
|
soundHit:
|
||||||
|
collection: RubberChicken
|
||||||
|
params:
|
||||||
|
variation: 0.125
|
||||||
|
- type: PhysicalComposition
|
||||||
|
materialComposition:
|
||||||
|
Plastic: 25
|
||||||
|
|||||||
6
Resources/Prototypes/SoundCollections/rubber_chicken.yml
Normal file
6
Resources/Prototypes/SoundCollections/rubber_chicken.yml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
- type: soundCollection
|
||||||
|
id: RubberChicken
|
||||||
|
files:
|
||||||
|
- /Audio/Items/Toys/rubber_chicken_1.ogg
|
||||||
|
- /Audio/Items/Toys/rubber_chicken_2.ogg
|
||||||
|
- /Audio/Items/Toys/rubber_chicken_3.ogg
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"license": "CC-BY-SA-3.0",
|
||||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder",
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder, rubber_chicken by xprospero",
|
||||||
"size": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -362,6 +362,9 @@
|
|||||||
{
|
{
|
||||||
"name": "beachb-inhand-right",
|
"name": "beachb-inhand-right",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "rubber_chicken"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png
Normal file
BIN
Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 606 B |
Reference in New Issue
Block a user