Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

code/game/objects/effects/aliens.dm

@@ -82,11 +82,6 @@
 	healthcheck()
 	return
 
-/obj/effect/alien/resin/meteorhit()
-	health-=50
-	healthcheck()
-	return
-
 /obj/effect/alien/resin/hitby(AM as mob|obj)
 	..()
 	for(var/mob/O in viewers(src, null))
@@ -262,7 +257,7 @@ Alien plants should do something if theres a lot of poison
 
 
 /obj/effect/alien/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 300)
+	if(exposed_temperature > 300 + T0C)
 		health -= 5
 		healthcheck()
 
@@ -433,7 +428,7 @@ Alien plants should do something if theres a lot of poison
 		Burst()
 
 /obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 500)
+	if(exposed_temperature > 500 + T0C)
 		health -= 5
 		healthcheck()
 

code/game/objects/effects/chem/water.dm

@@ -3,6 +3,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
 	mouse_opacity = 0
+	pass_flags = PASSTABLE | PASSGRILLE
 
 /obj/effect/effect/water/New(loc)
 	..()
@@ -30,7 +31,7 @@
 				else if(ismob(A) && !M)
 					M = A
 			if(M)
-				reagents.splash_mob(M, reagents.total_volume)
+				reagents.splash(M, reagents.total_volume)
 				break
 			if(T == get_turf(target))
 				break
@@ -53,4 +54,3 @@
 	name = "chemicals"
 	icon = 'icons/obj/chempuff.dmi'
 	icon_state = ""
-	pass_flags = PASSTABLE | PASSGRILLE

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -20,10 +20,12 @@ var/global/list/image/splatter_cache=list()
 	var/basecolor="#A10808" // Color when wet.
 	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
+	var/drytime
 
 /obj/effect/decal/cleanable/blood/Destroy()
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
+	processing_objects -= src
 	return ..()
 
 /obj/effect/decal/cleanable/blood/New()
@@ -38,7 +40,11 @@ var/global/list/image/splatter_cache=list()
 					if (B.blood_DNA)
 						blood_DNA |= B.blood_DNA.Copy()
 					qdel(B)
-	spawn(DRYING_TIME * (amount+1))
+	drytime = world.time + DRYING_TIME * (amount+1)
+	processing_objects += src
+
+/obj/effect/decal/cleanable/blood/process()
+	if(world.time > drytime)
 		dry()
 
 /obj/effect/decal/cleanable/blood/update_icon()
@@ -91,6 +97,7 @@ var/global/list/image/splatter_cache=list()
 	desc = drydesc
 	color = adjust_brightness(color, -50)
 	amount = 0
+	processing_objects -= src
 
 /obj/effect/decal/cleanable/blood/attack_hand(mob/living/carbon/human/user)
 	..()
@@ -125,8 +132,7 @@ var/global/list/image/splatter_cache=list()
 
 /obj/effect/decal/cleanable/blood/drip/New()
 	..()
-	spawn(1)
-		drips |= icon_state
+	drips |= icon_state
 
 /obj/effect/decal/cleanable/blood/writing
 	icon_state = "tracks"

code/game/objects/effects/landmarks.dm

@@ -88,16 +88,7 @@
 
 	return 1
 
-/obj/effect/landmark/start/ninja
-	name = "ninja"
-
-/obj/effect/landmark/start/ninja/New()
-	..()
-	ninjastart += loc
-	qdel(src)
-
 //Costume spawner landmarks
-
 /obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
 
 	var/list/options = typesof(/obj/effect/landmark/costume)

code/game/objects/effects/spiders.dm

@@ -48,7 +48,7 @@
 		qdel(src)
 
 /obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 300)
+	if(exposed_temperature > 300 + T0C)
 		health -= 5
 		healthcheck()