From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Fri, 18 Apr 2025 02:38:34 +0000 (-0300) Subject: Add Experiment plushie (#36663) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4d457db9e91096e4635f2704841b1764e5f2106c;p=space-station-14.git Add Experiment plushie (#36663) * Plushie * Add to fills and fix license * minor spelling issue --- diff --git a/Resources/Audio/Items/Toys/arf.ogg b/Resources/Audio/Items/Toys/arf.ogg new file mode 100644 index 0000000000..4d29017a10 Binary files /dev/null and b/Resources/Audio/Items/Toys/arf.ogg differ diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml index cd767ff3d6..2dd0ce9ede 100644 --- a/Resources/Audio/Items/Toys/attributions.yml +++ b/Resources/Audio/Items/Toys/attributions.yml @@ -92,3 +92,8 @@ 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" + +- files: ["arf.ogg"] + license: "CC0-1.0" + copyright: "Created by Orsoniks, from the game Casualties Unknown" + source: "https://orsonik.itch.io/scav-prototype" diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index a345ed724b..af57a565a6 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -10,6 +10,7 @@ - id: PlushieNuke - id: PlushieSlime - id: PlushieSnake + - id: PlushieExperiment - !type:GroupSelector children: - id: PlushieLizard @@ -72,7 +73,7 @@ amount: !type:ConstantNumberSelector value: 3 -- type: entity +- type: entity id: CrateFunSharkPlushieBulk parent: CrateGenericSteel name: bulk soft toy shark crate diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 0c037d93a6..05dd5ce309 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -362,6 +362,62 @@ - Payload - PlushieLizard +- type: entity + parent: BasePlushie + id: PlushieExperiment #Arf! + name: experiment plushie + description: A plushie of a canid of sorts, it yearns to be detonated on a landmine. + components: + - type: Sprite + sprite: Objects/Fun/expiplush.rsi + state: expi + - type: Item + inhandVisuals: + left: + - state: expi-inhand-left + shader: shaded + right: + - state: expi-inhand-right + shader: shaded + heldPrefix: plushielizard + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/arf.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/arf.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/arf.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/arf.ogg + - type: Tag + tags: + - ClothMade + - Payload + - type: Clothing + clothingVisuals: + head: + - state: expi-equipped-HELMET + shader: shaded + quickEquip: false + sprite: Objects/Fun/toys.rsi + equippedPrefix: expi + slots: + - HEAD + - type: entity parent: PlushieLizard id: PlushieRainbowLizard #Weh but gay diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png new file mode 100644 index 0000000000..fafecd67e4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png new file mode 100644 index 0000000000..92a2a36e97 Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png new file mode 100644 index 0000000000..049898a237 Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png new file mode 100644 index 0000000000..0bedfe8f40 Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png differ diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json b/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json new file mode 100644 index 0000000000..deaad8855a --- /dev/null +++ b/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Orsoniks (rivey0 on discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "expi" + }, + { + "name": "expi-inhand-left", + "directions": 4 + }, + { + "name": "expi-inhand-right", + "directions": 4 + }, + { + "name": "expi-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file