Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/game/objects/structures/artstuff.dm

@@ -111,14 +111,16 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 		if(thePix != theOriginalPix) //colour changed
 			DrawPixelOn(theOriginalPix,pixX,pixY)
 		qdel(masterpiece)
-		return
+		return 1
 
 	//Drawing one pixel with a crayon
 	if(istype(I, /obj/item/toy/crayon))
 		var/obj/item/toy/crayon/C = I
-		if(masterpiece.GetPixel(pixX, pixY)) // if the located pixel isn't blank (null))
+		var/pix = masterpiece.GetPixel(pixX, pixY)
+		if(pix && pix != C.colour) // if the located pixel isn't blank (null))
 			DrawPixelOn(C.colour, pixX, pixY)
-		return
+		qdel(masterpiece)
+		return 1
 
 	..()
 

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -78,6 +78,7 @@
 		new /obj/item/weapon/defibrillator/loaded(src)
 		new /obj/item/weapon/storage/belt/medical(src)
 		new /obj/item/clothing/glasses/hud/health(src)
+		new /obj/item/clothing/shoes/sandal/white(src)
 		return
 
 //Exam Room

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -21,6 +21,7 @@
 		new /obj/item/device/radio/headset/headset_sci(src)
 		new /obj/item/weapon/tank/air(src)
 		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/clothing/shoes/sandal/white(src)
 		return
 
 

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -224,6 +224,7 @@
 		new /obj/item/clothing/under/rank/security/brigphys(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/device/radio/headset/headset_sec/alt(src)
+		new /obj/item/clothing/shoes/sandal/white(src)
 		return
 
 /obj/structure/closet/secure_closet/blueshield
@@ -255,6 +256,7 @@
 		new /obj/item/clothing/shoes/centcom(src)
 		new /obj/item/clothing/accessory/holster(src)
 		new /obj/item/clothing/accessory/blue(src)
+		new /obj/item/clothing/shoes/jackboots/jacksandals(src)
 		return
 
 /obj/structure/closet/secure_closet/ntrep
@@ -280,6 +282,7 @@
 		new /obj/item/clothing/under/lawyer/black(src)
 		new /obj/item/clothing/under/lawyer/female(src)
 		new /obj/item/clothing/head/ntrep(src)
+		new /obj/item/clothing/shoes/sandal/fancy(src)
 		return
 
 

code/game/objects/structures/signs.dm

@@ -201,17 +201,17 @@
 	icon_state = "chinese"
 
 /obj/structure/sign/directions/science
-	name = "\improper Science department"
-	desc = "A direction sign, pointing out which way the Science department is."
+	name = "\improper Research Division"
+	desc = "A direction sign, pointing out which way the Research Division is."
 	icon_state = "direction_sci"
 
 /obj/structure/sign/directions/engineering
-	name = "\improper Engineering department"
+	name = "\improper Engineering Department"
 	desc = "A direction sign, pointing out which way the Engineering department is."
 	icon_state = "direction_eng"
 
 /obj/structure/sign/directions/security
-	name = "\improper Security department"
+	name = "\improper Security Department"
 	desc = "A direction sign, pointing out which way the Security department is."
 	icon_state = "direction_sec"
 

code/game/objects/structures/watercloset.dm

@@ -424,51 +424,15 @@
 		user << "<span class='warning'>Someone's already washing here!</span>"
 		return
 
-	if(istype(O, /obj/item/weapon/reagent_containers))
-		var/obj/item/weapon/reagent_containers/RG = O
-		if(RG.is_open_container())
-			RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
-			user << "<span class='notice'>You fill [RG] from [src].</span>"
-			return
-
-	O.water_act(20,310.15,src)
-
-	if(istype(O, /obj/item/weapon/melee/baton))
-		var/obj/item/weapon/melee/baton/B = O
-		if(B.bcell)
-			if(B.bcell.charge > 0 && B.status == 1)
-				flick("baton_active", src)
-				var/stunforce = B.stunforce
-				user.Stun(stunforce)
-				user.Weaken(stunforce)
-				user.stuttering = stunforce
-				B.deductcharge(B.hitcost)
-				user.visible_message("<span class='warning'>[user] shocks themself while attempting to wash the active [B.name]!</span>", \
-									"<span class='userdanger'>You unwisely attempt to wash [B] while it's still on.</span>")
-				playsound(src, "sparks", 50, 1)
-				return
-
-	if(istype(O, /obj/item/weapon/mop))
-		O.reagents.add_reagent("water", 5)
-		user << "<span class='notice'>You wet [O] in [src].</span>"
-		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-
-	var/obj/item/I = O
-	if(!I || !istype(I))
-		return
-	if(I.flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand.
+	if(!(istype(O)))
 		return
 
-	user << "<span class='notice'>You start washing [I]...</span>"
 	busy = 1
-	if(!do_after(user, 40, target = src))
-		busy = 0
-		return
+	var/wateract = 0
+	wateract = (O.wash(user, src))
 	busy = 0
-	O.clean_blood()
-	user.visible_message("<span class='notice'>[user] washes [I] using [src].</span>", \
-						"<span class='notice'>You wash [I] using [src].</span>")
-
+	if (wateract)
+		O.water_act(20,310.15,src)
 
 /obj/structure/sink/kitchen
 	name = "kitchen sink"