Merge branch 'master' into placeholder

code/game/objects/items/weapons/chaplain_items.dm

@@ -4,6 +4,10 @@
 	name = "null rod"
 	desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae."
 	icon = 'icons/obj/weapons.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_nullrod.dmi',
+		slot_r_hand_str = 'icons/mob/items/weapons/righthand_nullrod.dmi',
+		)
 	icon_state = "nullrod"
 	item_state = "nullrod"
 	slot_flags = SLOT_BELT

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -216,7 +216,8 @@
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
-	return
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
 
 
 /obj/structure/closet/wardrobe/white

code/game/objects/structures/watercloset.dm

@@ -529,7 +529,7 @@
 	// Short of a rewrite, this is necessary to stop monkeycubes being washed.
 	else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
 		return
-	else if(istype(O, /obj/item/mop))
+	else if(istype(O, /obj/item/mop) || istype(O, /obj/item/reagent_containers/glass/rag))
 		O.reagents.add_reagent(/decl/reagent/water, 5)
 		to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)