diff --git a/code/game/objects/items/reagent_containers/spray.dm b/code/game/objects/items/reagent_containers/spray.dm index aff905039d..83018d06e6 100644 --- a/code/game/objects/items/reagent_containers/spray.dm +++ b/code/game/objects/items/reagent_containers/spray.dm @@ -3,7 +3,7 @@ desc = "A spray bottle, with an unscrewable top." icon = 'icons/obj/items/spray.dmi' icon_state = "spray" - item_state = "cleaner" + item_state = "spray" flags_atom = OPENCONTAINER|FPRINT flags_item = NOBLUDGEON flags_equip_slot = SLOT_WAIST @@ -104,8 +104,8 @@ //space cleaner /obj/item/reagent_container/spray/cleaner - name = "space cleaner" - desc = "BLAM!-brand non-foaming space cleaner!" + name = "cleaning bottle" + desc = "A blue spray bottle containing a foamless cleaning agent." icon_state = "cleaner" /obj/item/reagent_container/spray/cleaner/drone @@ -113,9 +113,16 @@ desc = "BLAM!-brand non-foaming space cleaner!" volume = 50 +/obj/item/reagent_container/spray/cleaner/alt + name = "cleaning bottle" + desc = "A brownish-tan spray bottle containing a foamless cleaning agent." + icon_state = "cleaner_alt" + item_state = "cleaner_alt" + /obj/item/reagent_container/spray/cleaner/Initialize() . = ..() reagents.add_reagent("cleaner", src.volume) + //pepperspray /obj/item/reagent_container/spray/pepper name = "pepperspray" diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 679eec14fd..0c49a440fa 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -1,8 +1,8 @@ /obj/structure/janitorialcart name = "janitorial cart" - desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!" + desc = "A blue janitorial cart that has space for water, mops, signs, and trash bags." icon = 'icons/obj/janitor.dmi' - icon_state = "cart" + icon_state = "cart_blue" anchored = FALSE density = TRUE drag_delay = 1 @@ -16,6 +16,9 @@ var/obj/item/reagent_container/glass/bucket/janibucket/mybucket var/signs = 0 //maximum capacity hardcoded below +/obj/structure/janitorialcart/brown + desc = "A brown janitorial cart that has space for water, mops, signs, and trash bags." + icon_state = "cart_brown" /obj/structure/janitorialcart/New() ..() diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index 3419fbe0e4..88e9822db8 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index 6089b19dcd..694eb426b3 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/obj/items/spray.dmi b/icons/obj/items/spray.dmi index ec4762b3e4..775bcf7236 100644 Binary files a/icons/obj/items/spray.dmi and b/icons/obj/items/spray.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 3c18f1a60f..e418c4eb2e 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ