From f4bbe3603dc4b4aff38eefc496fdb27ed5ebefac Mon Sep 17 00:00:00 2001
From: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date: Sun, 13 Aug 2023 05:05:32 +1000
Subject: [PATCH] Add trash carts and janitorial trash carts (#18996)

* everything

* half loot
---
 .../Mousetrap/MousetrapComponent.cs           |   3 +-
 .../Catalog/Fills/Crates/service.yml          |  88 ++++++++++++++++++
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  16 ++++
 .../Entities/Objects/Devices/mousetrap.yml    |  10 ++
 .../Entities/Objects/Power/lights.yml         |  21 +++++
 .../Structures/Storage/Crates/crates.yml      |  23 +++++
 .../Storage/Crates/trashcart.rsi/base.png     | Bin 0 -> 378 bytes
 .../Storage/Crates/trashcart.rsi/closed.png   | Bin 0 -> 262 bytes
 .../Storage/Crates/trashcart.rsi/icon.png     | Bin 0 -> 380 bytes
 .../Storage/Crates/trashcart.rsi/meta.json    |  39 ++++++++
 .../Storage/Crates/trashcart.rsi/open.png     | Bin 0 -> 233 bytes
 .../Storage/Crates/trashcart.rsi/sparking.png | Bin 0 -> 206 bytes
 .../Storage/Crates/trashcart.rsi/welded.png   | Bin 0 -> 270 bytes
 .../Crates/trashcart_jani.rsi/base.png        | Bin 0 -> 410 bytes
 .../Crates/trashcart_jani.rsi/closed.png      | Bin 0 -> 262 bytes
 .../Crates/trashcart_jani.rsi/icon.png        | Bin 0 -> 412 bytes
 .../Crates/trashcart_jani.rsi/locked.png      | Bin 0 -> 185 bytes
 .../Crates/trashcart_jani.rsi/meta.json       |  45 +++++++++
 .../Crates/trashcart_jani.rsi/open.png        | Bin 0 -> 233 bytes
 .../Crates/trashcart_jani.rsi/sparking.png    | Bin 0 -> 206 bytes
 .../Crates/trashcart_jani.rsi/unlocked.png    | Bin 0 -> 183 bytes
 .../Crates/trashcart_jani.rsi/welded.png      | Bin 0 -> 270 bytes
 22 files changed, 244 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png

diff --git a/Content.Server/Mousetrap/MousetrapComponent.cs b/Content.Server/Mousetrap/MousetrapComponent.cs
index fb31964eec..2cf75e35cb 100644
--- a/Content.Server/Mousetrap/MousetrapComponent.cs
+++ b/Content.Server/Mousetrap/MousetrapComponent.cs
@@ -4,7 +4,8 @@ namespace Content.Server.Mousetrap;
 public sealed class MousetrapComponent : Component
 {
     [ViewVariables]
-    public bool IsActive;
+	[DataField("isActive")]
+    public bool IsActive = false;
 
     /// <summary>
     ///     Set this to change where the
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index ed6970400d..f3c0904574 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -164,3 +164,91 @@
         amount: 2
       - id: ClothingMaskSterile
         amount: 2
+
+- type: entity
+  id: CrateTrashCartFilled
+  suffix: Filled
+  parent: CrateTrashCart
+  components:
+    - type: StorageFill
+      contents:
+          # Food Packaging
+        - id: FoodPacketBoritosTrash
+          prob: 0.1
+        - id: FoodPacketCheesieTrash
+          prob: 0.1
+        - id: FoodPacketChipsTrash
+          prob: 0.1
+        - id: FoodPacketChocolateTrash
+          prob: 0.1
+        - id: FoodPacketEnergyTrash
+          prob: 0.1
+        - id: FoodPacketPopcornTrash
+          prob: 0.1
+        - id: FoodPacketSusTrash
+          prob: 0.1
+        - id: FoodPacketSyndiTrash
+          prob: 0.1
+        - id: FoodPacketChowMeinTrash
+          prob: 0.1
+        - id: FoodPacketDanDanTrash
+          prob: 0.1
+        - id: FoodPacketMRETrash
+          prob: 0.1
+        - id: FoodPacketPistachioTrash
+          prob: 0.1
+        - id: FoodPacketSemkiTrash
+          prob: 0.1
+        - id: FoodPacketRaisinsTrash
+          prob: 0.1
+          # Cans
+        - id: FoodTinBeansTrash
+          prob: 0.15
+        - id: FoodTinPeachesTrash
+          prob: 0.15
+        - id: FoodTinMRETrash
+          prob: 0.15
+          # Cigarette Stuff
+        - id: Ash
+          prob: 0.15
+        - id: CigarSpent
+          prob: 0.15
+        - id: CigaretteSpent
+          prob: 0.15
+          # Bacteria
+        - id: FoodBreadMoldySlice
+          prob: 0.15
+        - id: FoodPizzaMoldySlice
+          prob: 0.15
+          # Botanical Waste
+        - id: TrashBananaPeel
+          prob: 0.15
+        - id: FoodCornTrash
+          prob: 0.15
+          # Misc
+        - id: ShardGlass
+          prob: 0.1
+        - id: DrinkGlass
+          prob: 0.15
+        - id: BrokenBottle
+          prob: 0.15
+        - id: LightTubeBroken
+          prob: 0.15
+        - id: LightBulbBroken
+          prob: 0.15
+        - id: MousetrapArmed
+          prob: 0.15
+        - id: CableApcStack10
+          prob: 0.15
+        - id: MobMouseDead
+          prob: 0.1
+        - id: RagItem
+          prob: 0.1
+        - id: Flare
+          prob: 0.1
+        - id: FoodKebabSkewer
+          prob: 0.1
+        - id: Syringe
+          prob: 0.1
+        - id: ShardGlassPlasma
+          prob: 0.1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 5f64b7a8c0..1cba1ecd2f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1009,6 +1009,22 @@
   - type: Puller
     needsHands: true
 
+- type: entity
+  parent: MobMouse
+  suffix: Dead
+  save: false
+  id: MobMouseDead
+  name: mouse
+  description: Squeak!
+  components:
+  - type: Damageable
+    damage:
+      types:
+        Bloodloss: 6
+        Asphyxiation: 4
+        Slash: 7
+        Blunt: 3
+
 - type: entity
   parent: MobMouse
   id: MobMouseAdmeme
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index 310f1d598d..b5fc3b8cff 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -57,3 +57,13 @@
     - type: Tag
       tags:
         - DroneUsable
+
+- type: entity
+  name: mousetrap
+  suffix: Armed
+  parent: Mousetrap
+  id: MousetrapArmed
+  description: Useful for catching rodents sneaking into your kitchen.
+  components:
+    - type: Mousetrap
+      isActive: true
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index a6d1ed80ca..17b7ec179e 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -90,6 +90,17 @@
     lightRadius: 6
     lightSoftness: 1.1
 
+- type: entity
+  suffix: Broken
+  parent: BaseLightbulb
+  name: incandescent light bulb
+  id: LightBulbBroken
+  description: A light bulb.
+  components:
+  - type: LightBulb
+    startingState: Broken
+    bulb: Bulb
+
 - type: entity
   parent: BaseLightTube
   name: fluorescent light tube
@@ -103,6 +114,16 @@
     lightSoftness: 1
     PowerUse: 25
 
+- type: entity
+  suffix: Broken
+  parent: BaseLightTube
+  name: fluorescent light tube
+  id: LightTubeBroken
+  description: A light fixture.
+  components:
+  - type: LightBulb
+    startingState: Broken
+
 - type: entity
   parent: BaseLightTube
   name: led light tube
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index a789004e59..1f40fa15a6 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -496,3 +496,26 @@
     sprite: Structures/Storage/Crates/syndicate.rsi
   - type: Sprite
     sprite: Structures/Storage/Crates/syndicate.rsi
+
+- type: entity
+  parent: CrateBaseWeldable
+  id: CrateTrashCart
+  name: trash cart
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/trashcart.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/trashcart.rsi
+
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateTrashCartJani
+  name: janitorial trash cart
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/trashcart_jani.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/trashcart_jani.rsi
+  - type: AccessReader
+    access: [["Janitor"]]
+
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..85d7c299925a844f813a6bad656b5d0e30025f3a
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil=1AIbU9UUFz^`!Lm^-D`jjg5`n-QC5-#TPAFBqk<iV4$b0tmNY2<X7Zq
z6JexnuM$>ZBPJ&5;o+vMuW4&*4K$;<{kJ5L5-kbx3;vG<FlgVbeFap&S>O>_%)r2R
z2!t6$HM|;tf{Q&}978Pp-%h&7*JQxsI`h#6*AlP)|D)gDT9<Q@W7dxso)7LVQ-9jp
z$oGT$RDO%1fy>Xk$4<5s+-tNIKIYy2QG21cVA70rv1+19wF++nSR7c`v`g583-)n}
z#ifNPD(Nuk9O#{IG}~cz!WO2d+&^c3Wu5D5vFE^{*bN_oIQb7A>gMKrD$gMnXE4*@
x<xSQ1p$o#rBUd_P#vawr*~~d**530j`Ext1CKuY&c>tZu;OXk;vd$@?2>_9Li$wqc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c11bc8942e213b6ce32fb8445d789012b086eb7
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil21AIbU<@Ka&B8>cs9DV#54)0@#>+v%%(36vs1<E@ru1Ez^oFzei!T+Iv
zA=tk{2qakG5n0T@z;_sg8IR|$NC67Qd%8G=Sops^caiIW0!M42>Dqh$JEt!bxVmlj
z+jY(#lxsFP*4|{Sz0Yvr?h<B~E5*JHN?G64_=Jqr7x}s+<o7WP2qxT9Y53P)TXBwK
sR=lvo^vz2}y5sre${p^%UvQ1v>7i8hwi_?*0Ig#1boFyt=akR{0PQMSBme*a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c212de3288f9ab12fb9d957fdcdd3968d29f526
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilg0(?ST<@Ka&B8>cs9DV#54)0?S7Z;D~@iQ>clarHGR#tLxaniO|2`jJ>
z6BG6DaMRV-w6(PcYP~J?GaN_>l?3?(|3?Q5kM{2u0?Kk0ctjR6Fz_7)VaDV6D^h@h
z8$DedLoEE?_Fv>{R^V}EJlG{Y`|tnxv6<eksUK7OcVC=yuOR5?L*IW*Pt2QE|6~%}
z^L=aF#TEgkuZ$rxl6rzUn7=UDr*}-aV{=~b7-NLTr^$aF8do*`(Vi8+d>}%s%}n%@
zSNI~0oQTaFn#^k#H?YroksHf;hxKgWfnAImf7xDY-N{pUcrftB1y29ILu|rc&%CW$
zd3Ua8cxvinE6#ZT@P~;U5!-tIPTRY>;b}ph>__IsceG#DyIkxBI-bGP)z4*}Q$iB}
D!$y+7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
new file mode 100644
index 0000000000..c4315ace71
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..58f97286f2c2dc5506ecfa52b7346cf7c5ff1a62
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?STMO6esnp|8m%#Hjs%+1Y#!gcu%dVv&MNswRge-L2Uyno4lpa^Gy
zM`SSr1K(i~W;~w1A_XYu=jq}YV&VVxyft5g1BYwihlBsN>#+1#-9L4t>GlN0bS@8b
zOND$RCWFoPzY80aFY!Kzzx9Ek#c|s|VTMoZ!rg>C?p;;ooF>}A<uaf7s_>6e0q-^C
S`?mm1X7F_Nb6Mw<&;$Uc_e;?L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?$P6U!|9apHq&N#aB8wRqxP?HN@zUM8KR`jY
z0G|+7ApQUUOh%6A4L}xSNswPKgTu2MX+Tb*r;B5V#`)v~iN*%b)hn0<iW?-j0@yqn
z4l<t-bPUtt2wuhz${5C!WO85%2SXwECOO7A=K>QXSZ^$5X5FCBs<N0_$7N#k)QyZ%
w!U;<~FT4n7bY0A#vqqd@>LJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..cad0a0f18a1620abb893a548f6f3c51a8a369033
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilo1AIbUGt$!o0s;~f5^5?c^7Hc>8ydnxLL3|%T%4Txy1IgcgC|d(3{-3P
z!Ob5?@s<Sn1^-6^47M+n+JF+A1s;*b3=DjSL74G){)!Z!V7RA?V~B<S+dfCW1_d6L
z@?6$~|NigYrl}_5VN;RnH~ZxThTjS7C;29o8r&>rGPuCb&*2jC^^CKHSa{0P;)%XX
wzSdbQb3E!?u~O`a)V0X}iAn4y?;m)>_@_%xxv*$!7SIX?Pgg&ebxsLQ0L77CyZ`_I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc61d52d0cbbb226034b71b44ebeba738927faa8
GIT binary patch
literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCim50(?ST9UUFz^`!Lm^-D`jjg5`n-QC5-#TPAFBqk<iV4$b0tmNY2<X7Zq
z6Jca;Z=05u#?fHm@9#fNgiqUEC9J?kOia|n!%bIT)7I7+XyhRlr&b^(RTAVE{2v!!
z5K&^d1ysdZ;1OBOz`%D9gc)~C%zg_LT<_`P7-Hf7_R>YZCIg<<#AO`YUbvKa-T&`;
zcb9Wxii_`_FaBF%zop)bI63>D!guL_oijXs#r4ZJ+|Cz~b*R+{sb}r-T~PRTW5jGn
zW%-6)HHR}Ik6nNIFx;7I!V_(EZb70|cFD3GNBK*o7*FsB{Oo>T&9CsX^~>yT@jqAj
zn;Q>tXRw*`9-hX!BU@sd1jm~HjO~fs><pa!NiXe~E5$Ca=27Wc{A=Y;9)-lx{Pc<9
YE7rU1xx2q@Bhcv#p00i_>zopr0RHZp;{X5v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4dc8828b3ce5ca6aaf663a3977732224106f05f
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil21AIbU<@Ka&B8>cs94%D*m%AT`>+v%%(36vs1<HT_%BKRPI7@>3g8xGS
zL$H5^5J<4VBeIx*f$tCqGm2_>H2?+UJzX3_Ed1Y|yU2Awful9ibnU(Wozs^IT-`SN
z?K<ZV$~7AtYi}~v-e<UQcL}r0m1188rL6C2d_u<Ri+tS@^81(t1QYJ5H2mwYtvJUq
sD_+=P`sSq~-SK>K<qr4XFSy3-^iZmL+l?1@fL1Yhy85}Sb4q9e0PzS|(*OVf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cbe507174724928c7264496b05d8a2b73f7d3af
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikF1AIbU<@Ka&B8>cs94%D*m%ASj7Z;D~@iQ>clarHGR#tLxak96!O-oDT
zXt412_n#)hr){qiR$wD0ChFngrmL@MYikWO>8-{TO&}#+666>BA1h#Z=I|^IsD!h?
zBeIx*f$tCqGm2_>H2?+odb&7<Sopu~PZVxa;BjEQ*qI{s^xuE~+#XBMm%lC@zxQ(Q
z+Y0y058VG3e3*S8#cl=5wOf1UZDl=Yc}sfIg3tHL&zXj>|B(r8y2o=kVNZTX^S(cx
z{~j)W)$nWcHU;JbQts1ogjzc7It5-Dv<iJ;d|}0;bHPR5hsUF#TESt@k;*=ygnf)1
zui7elPcL$O%$CTX*W=NywZm9R*2JUH{#Hi`hbNOyzuM0|EI)D%xvL)7vhGg)o82rk
e?wu=juVL)HU~y%dUY!omBMhFdelF{r5}E)Y`=UDl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3d5df9e7a7bd421ca377a0b64b6818dde5dbe0
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pr5CUV@QO1vIOhm1d*PmKm#tfgBl=CL^Crx
zpFz#E2^&}v1*D}DS}vI|Ds(qqG34k!*!BHr_u~LF83V_c4>>zJA-Wit+1MD4ISH2}
T-Yq)|G?~HE)z4*}Q$iB}jLtNo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
new file mode 100644
index 0000000000..b45e84deb3
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..58f97286f2c2dc5506ecfa52b7346cf7c5ff1a62
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?STMO6esnp|8m%#Hjs%+1Y#!gcu%dVv&MNswRge-L2Uyno4lpa^Gy
zM`SSr1K(i~W;~w1A_XYu=jq}YV&VVxyft5g1BYwihlBsN>#+1#-9L4t>GlN0bS@8b
zOND$RCWFoPzY80aFY!Kzzx9Ek#c|s|VTMoZ!rg>C?p;;ooF>}A<uaf7s_>6e0q-^C
S`?mm1X7F_Nb6Mw<&;$Uc_e;?L

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?$P6U!|9apHq&N#aB8wRqxP?HN@zUM8KR`jY
z0G|+7ApQUUOh%6A4L}xSNswPKgTu2MX+Tb*r;B5V#`)v~iN*%b)hn0<iW?-j0@yqn
z4l<t-bPUtt2wuhz${5C!WO85%2SXwECOO7A=K>QXSZ^$5X5FCBs<N0_$7N#k)QyZ%
w!U;<~FT4n7bY0A#vqqd@>LJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..61625a29c20da0c49f6039e534116c0b6dd3d7ce
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppU1EV@QPi+l#w74;b*YJlq_9iRI&ib1ZS1
zbsVB?R~i%k@$<dZ5)}d}EwHJ66V>@^Qc~R^e)UlO*riX)e(yVJcs{juUxJ!e!~ThE
Y_jd8ja#^|E6R4QM)78&qol`;+0Qbr})c^nh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..cad0a0f18a1620abb893a548f6f3c51a8a369033
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilo1AIbUGt$!o0s;~f5^5?c^7Hc>8ydnxLL3|%T%4Txy1IgcgC|d(3{-3P
z!Ob5?@s<Sn1^-6^47M+n+JF+A1s;*b3=DjSL74G){)!Z!V7RA?V~B<S+dfCW1_d6L
z@?6$~|NigYrl}_5VN;RnH~ZxThTjS7C;29o8r&>rGPuCb&*2jC^^CKHSa{0P;)%XX
wzSdbQb3E!?u~O`a)V0X}iAn4y?;m)>_@_%xxv*$!7SIX?Pgg&ebxsLQ0L77CyZ`_I

literal 0
HcmV?d00001