Merge branch 'master' into hair-fix

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,18 +104,25 @@
 
 //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
 	name = "space cleaner"
 	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"

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()
 	..()