From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:27:40 +0000 (+0300)
Subject: Human plushie (#23518)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1c5639be7553dd074ccda54687b0d2d22f7cf5b0;p=space-station-14.git

Human plushie (#23518)

* AAAAAAAAA

* TBoI reference

* really remove from cargo crate. redescription

* pipi
---

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 0000000000..865da37e35
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_human.png differ