From: Tiniest Shark Date: Wed, 19 Mar 2025 23:14:17 +0000 (-0400) Subject: snake can now be seen inhand and worn on neck like friend (#35323) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b1c89d059c95eb1fcc0e35bd49d37061d37ea070;p=space-station-14.git snake can now be seen inhand and worn on neck like friend (#35323) * snake can now be seen inhand and worn like friend * Roomba's additions Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Update Resources/Textures/Objects/Fun/toys.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Spacing adjustment Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 5dc2c0713c..0c037d93a6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -791,6 +791,8 @@ components: - type: Sprite state: plushie_snake + - type: Item + heldPrefix: plushiesnake - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/rattle.ogg @@ -814,6 +816,13 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/rattle.ogg + - type: Clothing + quickEquip: false + equippedPrefix: plushiesnake + slots: + - NECK + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) - type: entity parent: BasePlushie diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 4bfa1f10d9..837f7e921c 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, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub)", + "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, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub), plushiesnake inhands+neck by TiniestShark (GitHub)", "size": { "x": 32, "y": 32 @@ -141,6 +141,18 @@ { "name": "plushie_snake" }, + { + "name": "plushiesnake-equipped-NECK", + "directions": 4 + }, + { + "name": "plushiesnake-inhand-left", + "directions": 4 + }, + { + "name": "plushiesnake-inhand-right", + "directions": 4 + }, { "name": "plushie_vox" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png new file mode 100644 index 0000000000..0d33d70972 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png new file mode 100644 index 0000000000..677e37a2d6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png new file mode 100644 index 0000000000..1b56d34389 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png differ