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

# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm

code/game/objects/effects/anomalies.dm

@@ -19,8 +19,9 @@
 	var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ))
 	aSignal.set_frequency(new_frequency)
 	poi_list |= src
-	
+
 /obj/effect/anomaly/Destroy()
+	QDEL_NULL(aSignal)
 	poi_list.Remove(src)
 	return ..()
 

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

@@ -1,9 +1,8 @@
 /obj/effect/decal/cleanable
 	var/list/random_icon_states = list()
-	var/targeted_by = null			// Used so cleanbots can't claim a mess.
 	var/noscoop = 0   //if it has this, don't let it be scooped up
 	var/noclear = 0    //if it has this, don't delete it when its' scooped up
-	
+
 /obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
 	return FALSE
 

code/game/objects/effects/glowshroom.dm

@@ -36,9 +36,7 @@
 	to_chat(user, "This is a [generation]\th generation [name]!")
 
 /obj/structure/glowshroom/Destroy()
-	if(myseed)
-		qdel(myseed)
-		myseed = null
+	QDEL_NULL(myseed)
 	return ..()
 
 /obj/structure/glowshroom/New(loc, obj/item/seeds/newseed, mutate_stats)

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

@@ -28,15 +28,13 @@
 	name = "probably a wall"
 	result = list(
 	/turf/simulated/wall = 9,
-	/obj/structure/falsewall = 1
-	)
+	/obj/structure/falsewall = 1)
 
 /obj/effect/spawner/random_barrier/floor_probably
 	name = "probably a floor"
 	result = list(
 	/turf/simulated/floor/plasteel = 3,
-	/turf/simulated/wall = 1
-	)
+	/turf/simulated/wall = 1)
 
 /obj/effect/spawner/random_barrier/obstruction
 	name = "obstruction"
@@ -44,12 +42,24 @@
 	/turf/simulated/wall = 1,
 	/obj/structure/falsewall = 1,
 	/obj/structure/barricade/wooden = 1,
-	/obj/machinery/door/airlock/welded = 1
-	)
+	/obj/machinery/door/airlock/welded = 1)
 
-/obj/effect/spawner/random_barrier/possibly_welded_airlock
+/obj/effect/spawner/random_barrier/possibly_welded_airlock // these have no access restrictions, so for internal maintenance only
 	name = "possibly welded airlock"
 	result = list(
 	/obj/machinery/door/airlock = 3,
-	/obj/machinery/door/airlock/welded = 1
-	)
+	/obj/machinery/door/airlock/welded = 1)
+
+/obj/effect/spawner/random_spawners/grille_often
+	name = "grille often"
+	result = list(
+	/obj/structure/grille = 8,
+	/obj/structure/grille/broken = 4,
+	/turf/simulated/floor/plating = 2)
+
+/obj/effect/spawner/random_spawners/grille_maybe
+	name = "grille maybe"
+	result = list(
+	/obj/structure/grille = 2,
+	/obj/structure/grille/broken = 2,
+	/turf/simulated/floor/plating = 5)

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

@@ -0,0 +1,110 @@
+/obj/effect/spawner/random_spawners
+	name = "random spawners"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	color = "#00FF00"
+	var/list/result = list(
+	/turf/simulated/floor/plasteel = 1,
+	/turf/simulated/floor/plating = 1,
+	/obj/effect/decal/cleanable/blood/splatter = 1,
+	/obj/effect/decal/cleanable/blood/oil = 1,
+	/obj/effect/decal/cleanable/fungus = 1)
+
+// This needs to come before the initialization wave because
+// the thing it creates might need to be initialized too
+/obj/effect/spawner/random_spawners/New()
+	. = ..()
+	var/turf/T = get_turf(src)
+	if(!T)
+		log_runtime(EXCEPTION("Spawner placed in nullspace!"), src)
+		return
+	var/thing_to_place = pickweight(result)
+	if(ispath(thing_to_place, /turf))
+		T.ChangeTurf(thing_to_place)
+	else
+		new thing_to_place(T)
+	qdel(src)
+
+/obj/effect/spawner/random_spawners/blood_maybe
+	name = "blood maybe"
+	result = list(
+	/turf/simulated/floor/plating = 20,
+	/obj/effect/decal/cleanable/blood/splatter = 1)
+
+/obj/effect/spawner/random_spawners/blood_often
+	name = "blood often"
+	result = list(
+	/turf/simulated/floor/plating = 5,
+	/obj/effect/decal/cleanable/blood/splatter = 1)
+
+/obj/effect/spawner/random_spawners/oil_maybe
+	name = "oil maybe"
+	result = list(
+	/turf/simulated/floor/plating = 20,
+	/obj/effect/decal/cleanable/blood/oil = 1)
+
+/obj/effect/spawner/random_spawners/oil_maybe
+	name = "oil often"
+	result = list(
+	/turf/simulated/floor/plating = 5,
+	/obj/effect/decal/cleanable/blood/oil = 1)
+
+/obj/effect/spawner/random_spawners/wall_rusted_probably
+	name = "rusted wall probably"
+	result = list(
+	/turf/simulated/wall = 2,
+	/turf/simulated/wall/rust = 7)
+
+/obj/effect/spawner/random_spawners/wall_rusted_maybe
+	name = "rusted wall maybe"
+	result = list(
+	/turf/simulated/wall = 7,
+	/turf/simulated/wall/rust = 1)
+
+/obj/effect/spawner/random_spawners/cobweb_left_frequent
+	name = "cobweb left frequent"
+	result = list(
+	/turf/simulated/floor/plating = 1,
+	/obj/effect/decal/cleanable/cobweb = 1)
+
+/obj/effect/spawner/random_spawners/cobweb_right_frequent
+	name = "cobweb right frequent"
+	result = list(
+	/turf/simulated/floor/plating = 1,
+	/obj/effect/decal/cleanable/cobweb2 = 1)
+
+/obj/effect/spawner/random_spawners/cobweb_left_rare
+	name = "cobweb left rare"
+	result = list(
+	/turf/simulated/floor/plating = 10,
+	/obj/effect/decal/cleanable/cobweb = 1)
+
+/obj/effect/spawner/random_spawners/cobweb_right_rare
+	name = "cobweb right rare"
+	result = list(
+	/turf/simulated/floor/plating = 10,
+	/obj/effect/decal/cleanable/cobweb2 = 1)
+
+/obj/effect/spawner/random_spawners/dirt_frequent
+	name = "dirt frequent"
+	result = list(
+	/turf/simulated/floor/plating = 1,
+	/obj/effect/decal/cleanable/dirt = 1)
+
+/obj/effect/spawner/random_spawners/dirt_rare
+	name = "dirt rare"
+	result = list(
+	/turf/simulated/floor/plating = 10,
+	/obj/effect/decal/cleanable/dirt = 1)
+
+/obj/effect/spawner/random_spawners/fungus_maybe
+	name = "rusted wall maybe"
+	result = list(
+	/turf/simulated/wall = 7,
+	/obj/effect/decal/cleanable/fungus = 1)
+
+/obj/effect/spawner/random_spawners/fungus_probably
+	name = "rusted wall maybe"
+	result = list(
+	/turf/simulated/wall = 1,
+	/obj/effect/decal/cleanable/fungus = 7)

code/game/objects/effects/spiders.dm

@@ -6,6 +6,11 @@
 	anchored = 1
 	density = 0
 	var/health = 15
+	var/master_commander = null
+
+/obj/structure/spider/Destroy()
+	master_commander = null
+	return ..()
 
 //similar to weeds, but only barfed out by nurses manually
 /obj/structure/spider/ex_act(severity)
@@ -78,7 +83,6 @@
 	var/amount_grown = 0
 	var/player_spiders = 0
 	var/faction = list()
-	var/master_commander = null
 
 /obj/structure/spider/eggcluster/New()
 	pixel_x = rand(3,-3)
@@ -110,7 +114,6 @@
 	var/travelling_in_vent = 0
 	var/player_spiders = 0
 	var/faction = list()
-	var/master_commander = null
 	var/selecting_player = 0
 
 /obj/structure/spider/spiderling/New()
@@ -118,6 +121,10 @@
 	pixel_y = rand(6,-6)
 	processing_objects.Add(src)
 
+/obj/structure/spider/spiderling/Destroy()
+	entry_vent = null
+	return ..()
+
 /obj/structure/spider/spiderling/Bump(atom/user)
 	if(istype(user, /obj/structure/table))
 		src.loc = user.loc