From 66b2caeeb8a1bd50cc572f5eb459ab74ab029191 Mon Sep 17 00:00:00 2001 From: Pete Goodfellow Date: Sat, 30 Mar 2013 17:50:25 +0000 Subject: [PATCH] Updating to fit with Cheri's sprite pull. Fixes not being able to store the mop when the cart and mop are dry. --- .../objects/items/weapons/storage/bags.dm | 2 +- code/game/objects/structures/janicart.dm | 5 +++-- icons/obj/janitor.dmi | Bin 10472 -> 10499 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index c17a5c5e967..4f2ec656277 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -28,7 +28,7 @@ /obj/item/weapon/storage/bag/trash name = "trash bag" desc = "It's the heavy-duty black polymer kind. Time to take out the trash!" - icon = 'icons/obj/trash.dmi' + icon = 'icons/obj/janitor.dmi' icon_state = "trashbag0" item_state = "trashbag" diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 6f563cfa8ed..330f5d5f57d 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -45,7 +45,8 @@ reagents.trans_to(I, 5) // user << "You wet [I] in [src]." playsound(loc, 'sound/effects/slosh.ogg', 25, 1) - else if(!mymop) + return + if(!mymop) user.drop_item() mymop = I I.loc = src @@ -154,7 +155,7 @@ if(myreplacer) overlays += "cart_replacer" if(signs) - overlays += "cart_signs[signs]" + overlays += "cart_sign[signs]" //old style retardo-cart diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index d5f5ec8713f3311c7e6b37ef677453160108c86f..aeca4370ed6a8c6e99771cab9646f8655a07fef7 100644 GIT binary patch delta 149 zcmaD6*c`N>Op&o-bGafrd%eT_txsQ6?#W7uU$^~KdDyz`_4dxPF-8s|6_X~e&8aI3 zKm9fBXWyx>N8hKfXuqv^L3VB6$*K*XB<&h|86_NfjTw|zB(l9=SCu<->_dJ;+75+w w)niEpO%iDgZUKjR4sc}6KqyOKG5s%Jl+tG$`&s`H0}yz+viZ5Jb4q9e0NtoP&;S4c delta 121 zcmZn;dJ(vxOp!5mbGafrd)9*&mV53g+&Gn5!9JZwfOXyt``U}rEYUl8-XC;Qa0@uh zbATgj2BU-{ud#!@#zz6Ow)(?HhgmIk48@uSj~Fl;G)bi~peSQdUh(t)ijp$X+J_&1 PF#v(5tDnm{r-UW|ApR``