From 58bdc7790bbec6d24949d9a4e8298a5d677da282 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Sun, 6 Dec 2020 11:22:21 +0000
Subject: [PATCH] Removes funny smug plushie (#2711)

* Removes smug plushie

* Prototype

* Removed from medical crate
---
 .../Storage/Crates/Filled/crate_medical.yml      |   2 --
 .../Prototypes/Entities/Objects/Fun/toys.yml     |  15 ---------------
 .../Objects/Fun/toys.rsi/giantsmugplushie.png    | Bin 590 -> 0 bytes
 .../Textures/Objects/Fun/toys.rsi/meta.json      |  11 +----------
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Fun/toys.rsi/giantsmugplushie.png

diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml
index 46e78e885d..e68a49e442 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_medical.yml
@@ -41,8 +41,6 @@
         amount: 1
       - name: ClothingMaskSterile
         amount: 1
-      - name: PlushieSmug
-        amount: 1
 
 - type: entity
   id: CrateMedicalScrubs
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 99a122f7ad..0d61da304d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -60,21 +60,6 @@
   - type: UseDelay
     delay: 1.0
 
-- type: entity
-  name: giant smug plushie
-  parent: BaseItem
-  id: PlushieSmug
-  description: Its smug aura compells you to perform surgery with a slightly higher degree of skill.
-  components:
-  - type: Toys
-  - type: LoopingSound
-  - type: Sprite
-    sprite: Objects/Fun/toys.rsi
-    state: giantsmugplushie
-  - type: ItemCooldown
-  - type: UseDelay
-    delay: 1.0
-
 - type: entity
   name: carp plushie
   parent: BaseItem
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/giantsmugplushie.png b/Resources/Textures/Objects/Fun/toys.rsi/giantsmugplushie.png
deleted file mode 100644
index c4b9072e627675aa1cad321286ca76b988108d72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006NNkl<ZSP9LR
zJx;?w5Jugjhzg0&g%hBhA#D!8IdTDdE)Xt3;{(u9ae;I+T!LoNH~2Z@$=coo2e7o7
z{Ta{qW_H(dRsDzO<GoIQ${~RI`7u?S<#)@`Xl=Xdww&K7bLsOnsTqV90m#qA{wad-
z9aR8`wi;1ryGn0QRZ1`Wrm<Be20Ud909GI#CW-?x8HBF_5LjDtnIn#!tO`RAbzP_X
z>x-o4W;V0_az3{$nG8UOun%Il+a(D;++KF<WLv<w8G=yu_1%><fwbbfEqxEyw{JZ+
z4}>f&o`)iF1?M*9gvRCo(YDY`nD0X_a|!a0ea;V`5=#|i+plFVD1rnf`<yR6C05yY
zAl3`pf2)QMfS~4p(cF5muZs6C>Fcgjek}K2wuSJ53JgpH(D;~&NWh<kj%Za?8e1Y>
z(8G8Dd`bZ%%;}f4Z2K}GIO{{>qAl4hO<ZLMqEptme=%zh;QR6`0f^ZP!~hVA0B+yg
zO696iA}%4a_SOItfQ%x9s-`o+I<S5`3eY%vVfxv?f>2PzCF<Kz;t)6ck1)1#x1Fy_
zevo+sW$&mznmOfc9NRnJ{H_V2&5W$%OCKw+qXZES7Jz6EAiVHY;$rb1pI!(F`Zh)8
zz7SE^k2}Im=7RR`|F}O?1rH;?$;F``gE*@=5V8nG>wV7Fr`!^kNF1L{Sb_NnAs)wP
c75|OkU+S1Q?_WT;YybcN07*qoM6N<$g6-4`C;$Ke

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 97d0863e84..3d31fd265e 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CCBYSA3",
-  "copyright": "https://github.com/tgstation/tgstation, smug plushie by memager",
+  "copyright": "https://github.com/tgstation/tgstation",
   "states": [
     {
       "name": "carpplush",
@@ -368,15 +368,6 @@
         ]
       ]
     },
-    {
-      "name": "giantsmugplushie",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
     {
       "name": "skeletonprize",
       "directions": 1,