From 7790f8f6f65d70d0c78504478f6780f9155be90f Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Sun, 27 Dec 2020 08:24:08 +0000
Subject: [PATCH] Adds hugbox. (#2826)

* Box and sprites

* Added to clowns fills
---
 .../Prototypes/Catalog/Fills/backpack.yml     |   2 +-
 .../Entities/Objects/Boxes/boxes_general.yml  |  13 +
 .../Objects/Storage/boxes.rsi/box_hug.png     | Bin 0 -> 207 bytes
 .../Objects/Storage/boxes.rsi/clown.png       | Bin 0 -> 156 bytes
 .../Objects/Storage/boxes.rsi/heart.png       | Bin 0 -> 115 bytes
 .../Storage/boxes.rsi/hug-inhand-left.png     | Bin 0 -> 305 bytes
 .../Storage/boxes.rsi/hug-inhand-right.png    | Bin 0 -> 300 bytes
 .../Objects/Storage/boxes.rsi/meta.json       | 252 ++++--------------
 8 files changed, 66 insertions(+), 201 deletions(-)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/clown.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/heart.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png

diff --git a/Resources/Prototypes/Catalog/Fills/backpack.yml b/Resources/Prototypes/Catalog/Fills/backpack.yml
index 052000f62d..2b1fbcd9bb 100644
--- a/Resources/Prototypes/Catalog/Fills/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/backpack.yml
@@ -14,7 +14,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: BoxSurvival
+      - name: BoxHug
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
index 9efecea57d..e570d028ec 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
@@ -102,3 +102,16 @@
   - type: Storage
     capacity: 15
     size: 15
+
+- type: entity
+  name: box of hugs
+  parent: BoxSurvival
+  id: BoxHug
+  description: A special box for sensitive people.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_hug
+      - state: heart
+  - type: Item
+    HeldPrefix: hug
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f0e4dbf3d4554746911228558ef46807683909
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*tS!iVkel>>+3fda
znVpfrpXN^9zJ2@6n>RC@?U@#_76Mf=mIV0)GdMiEkp|?%d%8G=XiQ8_kZ@@T6yRZb
zz~po+VSz_1qpE=eN5_taM&%d>0j>v3iJe|reqKo{IT`~d)M!j{sBm?6uhyK@P{A%B
zqQvRZz#{dLGa<v#yd+6O!s8IDMS9ag7PcrxhKn{@(rj$HbAVPcc)I$ztaD0e0svak
BK%4*o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4f0527018d6d98710c6329d87fe2fdfd85e938c
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*e5#k&v}x1B99{;7
z|NsAk@Xeby|1%iBc=oJ8aa$@-C1XjDUoeBivm0qZj*h2`V~EDY<OB&;6Q(Af9;OpD
zZjP$1jv}JR)}2e!VDb@l&1lQex^O7-2s6Wy*G%ibE#WH$>SOS9^>bP0l+XkKWR*3B

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cbf6867821302c0e9800bd8ab19801b34db05fa
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)Tn`*L@To9yBAa|7P=v80
z$S;_|;n|HeAV=EM#W93qW^%#;!vt>zp+E8g9N*X-ntn1E-eUaD#maa8V@L&18H1;*
KpUXO@geCw;p&#e~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4633be563f5d12617fa22bed87a13e020520364
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KRjI=Ln`LHy=BOC$U&g>VW>{-
zn=KmzZ5k4CAIt7pYc2p}t)AOko5JeIGI5RZx$fWfzN>uV<Ywn?;sk03f~hYf_rI&!
zvm<``;>yYEcb{JPLozol=lt(Q>0i3v{Yo&7HQoI1NJ`ke$<HgFoH@h&f$O#D^;Fi9
zlLxF`f2^7`@B67e4f$ra=Of>T{O1g4aA*q<QJA18!pf1t;mXJ)=@dwmP-uL^&-EMQ
zE9OXhu<d_jwVUbFPR8!d%=I5RZPs^eTXmm#mHvXsvlEIeIv5!kv?d4bV)UD&zG#pC
RX#tQIJYD@<);T3K0RU_&cB23Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b8f34a9c5ad29694c84ade2ec38d85f6ffcc33
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=pFLe1Ln`LHy{X8@WGLc#k>4?C
z0tXK#Q-7M|X3=X0!Xmik9GhH|J~(?h1zkO7GU311dqWAQJo%Z1ra;|5V3Ib;>RsaP
zuMa=}*`c<7dB*k|dv5nn58hNeD?9%D^lNLs)%v#c?_F5k@rL1J|Gy1CvyYYW$vuca
zTl9RF?fX#K+MN8N2C4YE<k_?9StJ}5928~dFxipB(8w0fqj2Ft7bA;QjA4UAvo@PR
zM!``ACf;?JidOw(+*IDIIp4Zs^%p5!4LOB<ZR_4LnTCDgIP$;d?W}rs6MKh`)(f6J
fmt$Z!aOMrG6Q|mF^M&0NAm@9!`njxgN@xNAzZG<b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index c2a70f35aa..bce379dc40 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,299 +1,151 @@
 {
   "version": 1,
+  "license": "CC-BY-SA 3",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/17dc39d12005f3279a90212b5c61a781c08693a5",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA 3",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/commit/9216a1754b1e1d25b8f771b15fbaf4e086fcade9",
   "states": [
     {
       "name": "beaker",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "bodybags",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
+    },
+    {
+      "name": "clown",
+      "directions": 1
+    },
+    {
+      "name": "heart",
+      "directions": 1
     },
     {
       "name": "meson",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "sechud",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "box",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
+    },
+    {
+      "name": "box_hug",
+      "directions": 1
     },
     {
       "name": "box_donk_pocket",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "box_id",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "box_of_doom",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "box_of_doom_big",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "box_security",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "circuit",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "disk",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "flashbang",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "glasses",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "handcuff",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "implant",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "latex",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "light",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "lightmixed",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "lighttube",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "mousetraps",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "pda",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "pillbox",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "solution_trays",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "sterile",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "syringe",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "writing",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "writing_of_doom",
-      "directions": 1,
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
+    },
+    {
+      "name": "hug-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "hug-inhand-right",
+      "directions": 4
     }
   ]
 }