Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/nano/modules/human_appearance.dm

code/modules/client/client procs.dm

@@ -160,7 +160,7 @@
 
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
 		src << "<span class='info'>You have unread updates in the changelog.</span>"
-		winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
+		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
 		if(config.aggressive_changelog)
 			src.changes()
 

code/modules/mob/living/carbon/carbon.dm

@@ -218,23 +218,23 @@
 		else if (on_fire)
 			playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 			if (M.on_fire)
-				M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames, but to no avail!</span>", \
+				M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames, but to no avail!</span>",
 				"<span class='warning'>You try to pat out [src]'s flames, but to no avail! Put yourself out first!</span>")
 			else
-				M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>", \
+				M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>",
 				"<span class='warning'>You try to pat out [src]'s flames! Hot!</span>")
 				if(do_mob(M, src, 15))
 					if (prob(10) && (M.fire_stacks <= 0))
-						src.fire_stacks -= 2
+						M.fire_stacks -= 0.5
 						M.fire_stacks += 1
 					M.IgniteMob()
 					if (M.on_fire)
-						M.visible_message("<span class='danger'>The fire spreads from [src] to [M]!</span>", \
+						M.visible_message("<span class='danger'>The fire spreads from [src] to [M]!</span>",
 						"<span class='danger'>The fire spreads to you as well!</span>")
 					else
-						src.fire_stacks -= 3 //Less effective than stop, drop, and roll
+						src.fire_stacks -= 1 //Less effective than stop, drop, and roll
 						if (src.fire_stacks <= 0)
-							M.visible_message("<span class='warning'>[M] successfully pats out [src]'s flames.</span>", \
+							M.visible_message("<span class='warning'>[M] successfully pats out [src]'s flames.</span>",
 							"<span class='warning'>You successfully pat out [src]'s flames.</span>")
 							src.ExtinguishMob()
 							src.fire_stacks = 0

code/modules/organs/organ.dm

@@ -30,18 +30,16 @@ var/list/organ_cache = list()
 	if(!owner)
 		return ..()
 
-	if((owner.internal_organs) && (src in owner.internal_organs))
-		owner.internal_organs -= src
-
-	if((owner.internal_organs_by_name) && (src in owner.internal_organs_by_name))
-		owner.internal_organs_by_name -= src
-
-	if((owner.organs) && (src in owner.organs))
-		owner.organs -= src
-
-	if((owner.organs_by_name) && (src in owner.organs_by_name))
-		owner.organs_by_name -= src
-
+	if(istype(owner, /mob/living/carbon))
+		if((owner.internal_organs) && (src in owner.internal_organs))
+			owner.internal_organs -= src
+		if(istype(owner, /mob/living/carbon/human))
+			if((owner.internal_organs_by_name) && (src in owner.internal_organs_by_name))
+				owner.internal_organs_by_name -= src
+			if((owner.organs) && (src in owner.organs))
+				owner.organs -= src
+			if((owner.organs_by_name) && (src in owner.organs_by_name))
+				owner.organs_by_name -= src
 	if(src in owner.contents)
 		owner.contents -= src
 

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -145,26 +145,26 @@
 		environment.add_thermal_energy(-removed_heat)
 		if (prob(5))
 			T.visible_message("<span class='warning'>The water sizzles as it lands on \the [T]!</span>")
-	else
-		if(volume >= 3)
-			if(T.wet >= 1)
+	
+	else if(volume >= 10)
+		if(T.wet >= 1)
+			return
+		T.wet = 1
+		if(T.wet_overlay)
+			T.overlays -= T.wet_overlay
+			T.wet_overlay = null
+		T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
+		T.overlays += T.wet_overlay
+
+		spawn(800) // This is terrible and needs to be changed when possible.
+			if(!T || !istype(T))
 				return
-			T.wet = 1
+			if(T.wet >= 2)
+				return
+			T.wet = 0
 			if(T.wet_overlay)
 				T.overlays -= T.wet_overlay
 				T.wet_overlay = null
-			T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
-			T.overlays += T.wet_overlay
-
-			spawn(800) // This is terrible and needs to be changed when possible.
-				if(!T || !istype(T))
-					return
-				if(T.wet >= 2)
-					return
-				T.wet = 0
-				if(T.wet_overlay)
-					T.overlays -= T.wet_overlay
-					T.wet_overlay = null
 
 /datum/reagent/water/touch_obj(var/obj/O)
 	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
@@ -186,7 +186,7 @@
 /datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
 	if(istype(M, /mob/living/carbon/slime))
 		var/mob/living/carbon/slime/S = M
-		S.adjustToxLoss(15 * removed) // Babies have 150 health, adults have 200; So, 10 units and 13.5
+		S.adjustToxLoss(8 * removed) // Babies have 150 health, adults have 200; So, 10 units and 13.5
 		if(!S.client)
 			if(S.Target) // Like cats
 				S.Target = null