From 1c5639be7553dd074ccda54687b0d2d22f7cf5b0 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:27:40 +0300 Subject: [PATCH] Human plushie (#23518) * AAAAAAAAA * TBoI reference * really remove from cargo crate. redescription * pipi --- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 3 +++ .../Prototypes/Entities/Objects/Fun/toys.yml | 21 ++++++++++++++++++ .../Structures/Machines/Computers/arcades.yml | 1 + .../Textures/Objects/Fun/toys.rsi/meta.json | 11 +++++---- .../Objects/Fun/toys.rsi/plushie_human.png | Bin 0 -> 745 bytes 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 52c3d606cb..4fbbcd6851 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -282,6 +282,9 @@ - id: PlushiePenguin prob: 0.01 orGroup: Plushies + - id: PlushieHuman + prob: 0.01 + orGroup: Plushies - id: PlushieLizard prob: 0.01 orGroup: Plushies diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 63d956f7b3..dca8f923d5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1168,3 +1168,24 @@ components: - type: Sprite state: plushie_penguin + +- type: entity + parent: BasePlushie + id: PlushieHuman + name: human plushie + description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming. + components: + - type: Sprite + state: plushie_human + - type: EmitSoundOnUse + sound: + path: /Audio/Voice/Human/malescream_1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Voice/Human/malescream_2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Voice/Human/malescream_3.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Human/malescream_4.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 3e91e929d4..fb59aee638 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -86,6 +86,7 @@ - PlushieMoth - PlushieHampter - PlushiePenguin + - PlushieHuman - type: WiresPanel - type: Wires layoutId: Arcade diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 00999ac01e..8e9d5e1e53 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", + "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 human by TheShuEd", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "plushie_penguin" }, - { + { "name": "plushie_moth" }, { @@ -44,13 +44,13 @@ "name": "bee-inhand-right", "directions": 4 }, - { + { "name": "plushie_hampter" }, { "name": "plushie_lizard" }, - { + { "name": "plushie_lizard_mirrored" }, { @@ -74,6 +74,9 @@ { "name": "plushie_diona" }, + { + "name": "plushie_human" + }, { "name": "plushie_diona1" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png new file mode 100644 index 0000000000000000000000000000000000000000..865da37e3508911ee601691c1cfb238930236bed GIT binary patch literal 745 zcmVPx%qe(!qa4#rE#{9MZd9(%juUT0yX1$dLE${l4G# z`+a}E2j}?Tp`12=S(+8z|M7dzBgKp?po=h->Dp6=GytrYPW;YOso0SO^domjdm$@g z;BSyefwTYsHJeAx=B3EhAr156ya@a#l7Li(!pby-m1*fCG8vK*V3uYD?FImiN}sZ( zFL!=Duv&U(Y*j{pgD>OrFn;o8h0hNGsN8-F#?NB`wQr#@r7~dY>;8M&YsXpflDBkH zkKToLfpi<1rCH&)|HjN~0KUJRaYX>GK^*~S+J=_Cj^hJ|*nzh@9CCK+QgI^TYXmmH5=6RBUMz9xl%b+t8uiz;X`v2yt#6OUn zJ}^j(PINvv^2PqfCjb)JJnHBKqFHC)?z7XGaQD@Hk<8=(_}!?Z*ll8iY1H8>9nvH7 zC9-*}<|Y7^El6f^(jo#k^@W0nkBkAJ#uS&>4_0%N_OBnrN5)8Ia&9StLr_F?VW#qC?wID^`?5wm-SwnpUhR=1vWBr-oMSH@iLO z!vsL5)(KCa`@udixK7P>gDs*kHPA%|0;Pn=8XPSFo%IUk}8m78S1uqgv*| z;}0i-?k!EaB@#`!`R_%b2jWwUicu|N8+u=I2d&z%H*7;cn-WC9-qNHHu@uQnPWll# b$3KHV!TJhz=3t$V00000NkvXXu0mjf#2#Us literal 0 HcmV?d00001 -- 2.51.2