Merge upstream

code/game/objects/effects/anomalies.dm

@@ -17,7 +17,7 @@
 	var/countdown_colour
 	var/obj/effect/countdown/anomaly/countdown
 
-/obj/effect/anomaly/New()
+/obj/effect/anomaly/Initialize(mapload, new_lifespan)
 	..()
 	poi_list |= src
 	START_PROCESSING(SSobj, src)
@@ -31,6 +31,8 @@
 	if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven!
 		aSignal.frequency++
 
+	if(new_lifespan)
+		lifespan = new_lifespan
 	death_time = world.time + lifespan
 	countdown = new(src)
 	if(countdown_colour)
@@ -126,7 +128,7 @@
 	density = 1
 	var/canshock = 0
 	var/shockdamage = 20
-	var/explosive = 1
+	var/explosive = TRUE
 
 /obj/effect/anomaly/flux/New()
 	..()

code/game/objects/effects/decals/cleanable.dm

@@ -6,7 +6,7 @@
 	var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
 	var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
 
-/obj/effect/decal/cleanable/New()
+/obj/effect/decal/cleanable/Initialize(mapload)
 	if (random_icon_states && length(src.random_icon_states) > 0)
 		src.icon_state = pick(src.random_icon_states)
 	create_reagents(300)
@@ -88,4 +88,4 @@
 	if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
 		return bloodiness
 	else
-		return 0
+		return 0

code/game/objects/effects/decals/decal.dm

@@ -54,4 +54,10 @@
 	icon_state = "bot"
 
 /obj/effect/turf_decal/loading_area
-	icon_state = "loading_area"
+	icon_state = "loading_area"
+
+/obj/effect/turf_decal/sand
+	icon_state = "sandyfloor"
+
+/obj/effect/turf_decal/sand/plating
+	icon_state = "sandyplating"

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -73,6 +73,8 @@
 
 /obj/effect/particle_effect/smoke/proc/spread_smoke()
 	var/turf/t_loc = get_turf(src)
+	if(!t_loc)
+		return 
 	var/list/newsmokes = list()
 	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
 		var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!

code/game/objects/effects/spawners/lootdrop.dm

@@ -90,7 +90,7 @@
 				/obj/item/clothing/gloves/color/fyellow = 1,
 				/obj/item/clothing/head/hardhat = 1,
 				/obj/item/clothing/head/hardhat/red = 1,
-				/obj/item/clothing/head/that{throwforce = 1;} = 1,
+				/obj/item/clothing/head/that = 1,
 				/obj/item/clothing/head/ushanka = 1,
 				/obj/item/clothing/head/welding = 1,
 				/obj/item/clothing/mask/gas = 15,
@@ -105,8 +105,8 @@
 				/obj/item/device/radio/off = 2,
 				/obj/item/device/t_scanner = 5,
 				/obj/item/weapon/airlock_painter = 1,
-				/obj/item/stack/cable_coil = 4,
-				/obj/item/stack/cable_coil{amount = 5} = 6,
+				/obj/item/stack/cable_coil/random = 4,
+				/obj/item/stack/cable_coil/random{amount = 5} = 6,
 				/obj/item/stack/medical/bruise_pack = 1,
 				/obj/item/stack/rods{amount = 10} = 9,
 				/obj/item/stack/rods{amount = 23} = 1,