Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/reagents/reagent_containers/borghypo.dm

@@ -53,7 +53,7 @@ Borg Hypospray
 		charge_tick = 0
 
 	//update_icon()
-	return 1
+	return TRUE
 
 // Use this to add more chemicals for the borghypo to produce.
 /obj/item/reagent_containers/borghypo/proc/add_reagent(datum/reagent/reagent)

code/modules/reagents/reagent_containers/glass.dm

@@ -29,9 +29,10 @@
 			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
 							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
 			var/R = reagents?.log_list()
-			if(isturf(target) && reagents.reagent_list.len && thrownby)
-				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
-				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+			var/mob/thrown_by = thrownby?.resolve()
+			if(isturf(target) && reagents.reagent_list.len && thrown_by)
+				log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+				message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
 			reagents.reaction(M, TOUCH)
 			log_combat(user, M, "splashed", R)
 			var/turf/UT = get_turf(user)

code/modules/reagents/reagent_containers/patch.dm

@@ -28,8 +28,8 @@
 
 /obj/item/reagent_containers/pill/patch/canconsume(mob/eater, mob/user)
 	if(!iscarbon(eater))
-		return 0
-	return 1 // Masks were stopping people from "eating" patches. Thanks, inheritance.
+		return FALSE
+	return TRUE // Masks were stopping people from "eating" patches. Thanks, inheritance.
 
 /obj/item/reagent_containers/pill/patch/styptic
 	name = "brute patch"

code/modules/reagents/reagent_containers/syringes.dm

@@ -189,7 +189,7 @@
 	if(reagents && reagents.total_volume)
 		return clamp(round((reagents.total_volume / volume * 15),5), 1, 15)
 	else
-		return 0
+		return FALSE
 
 /obj/item/reagent_containers/syringe/epinephrine
 	name = "syringe (epinephrine)"