diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml index 290539b984..162ee8c1c3 100644 --- a/Resources/Audio/Items/Toys/attributions.yml +++ b/Resources/Audio/Items/Toys/attributions.yml @@ -72,3 +72,18 @@ license: "CC-BY-SA-3.0" copyright: "Taken from ss200, made by Daeberdir" 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" diff --git a/Resources/Audio/Items/Toys/rubber_chicken_1.ogg b/Resources/Audio/Items/Toys/rubber_chicken_1.ogg new file mode 100644 index 0000000000..e4ba8155a6 Binary files /dev/null and b/Resources/Audio/Items/Toys/rubber_chicken_1.ogg differ diff --git a/Resources/Audio/Items/Toys/rubber_chicken_2.ogg b/Resources/Audio/Items/Toys/rubber_chicken_2.ogg new file mode 100644 index 0000000000..ae79d97ff2 Binary files /dev/null and b/Resources/Audio/Items/Toys/rubber_chicken_2.ogg differ diff --git a/Resources/Audio/Items/Toys/rubber_chicken_3.ogg b/Resources/Audio/Items/Toys/rubber_chicken_3.ogg new file mode 100644 index 0000000000..97d93ed57e Binary files /dev/null and b/Resources/Audio/Items/Toys/rubber_chicken_3.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 4d34fa4290..411dc30721 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -334,6 +334,7 @@ - id: ClothingHeadHatMagician - id: BeachBall - id: ClothingShoesSkates + - id: RubberChicken - type: entity id: CrateFunBikeHornImplants diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 8bd9d8ca30..0aaaaf99b5 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -116,6 +116,7 @@ - id: BalloonNT - id: BalloonCorgi - id: MysteryFigureBox + - id: RubberChicken # Cult - !type:AllSelector children: diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 62e6393549..ffb1611a71 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1545,3 +1545,52 @@ params: volume: -9 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 diff --git a/Resources/Prototypes/SoundCollections/rubber_chicken.yml b/Resources/Prototypes/SoundCollections/rubber_chicken.yml new file mode 100644 index 0000000000..c468516f71 --- /dev/null +++ b/Resources/Prototypes/SoundCollections/rubber_chicken.yml @@ -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 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 4975ba0461..45f429f3e6 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "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": { "x": 32, "y": 32 @@ -362,6 +362,9 @@ { "name": "beachb-inhand-right", "directions": 4 + }, + { + "name": "rubber_chicken" } ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png b/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png new file mode 100644 index 0000000000..543a3fbafe Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png differ