Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

code/game/objects/effects/effect_system.dm

@@ -90,6 +90,11 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	var/atom/holder
 	var/setup = 0
 
+	Destroy()
+		holder = null
+		location = null
+		return ..()
+
 	proc/set_up(n = 3, c = 0, turf/loc)
 		if(n > 10)
 			n = 10
@@ -449,6 +454,11 @@ steam.start() -- spawns the effect
 	var/direction
 	var/obj/chemholder
 
+	Destroy()
+		qdel(chemholder)
+		chemholder = null
+		return ..()
+
 	New()
 		..()
 		chemholder = new/obj()
@@ -543,35 +553,6 @@ steam.start() -- spawns the effect
 					if(smoke) smoke.delete()
 					src.total_smoke--
 
-// Goon compat.
-/datum/effect/effect/system/chem_smoke_spread/fart
-
-	set_up(var/mob/M, n = 5, c = 0, loca, direct)
-		if(n > 20)
-			n = 20
-		number = n
-		cardinals = c
-
-		chemholder.reagents.add_reagent("space_drugs", rand(1,10))
-
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
-
-		var/contained = "\[[chemholder.reagents.get_reagent_ids()]\]"
-		var/area/A = get_area(location)
-
-		var/where = "[A.name] | [location.x], [location.y]"
-		var/whereLink=formatJumpTo(location,where)
-
-		var/more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>)"
-		message_admins("[M][more] produced a toxic fart in ([whereLink])[contained].", 0, 1)
-		log_game("[M][more] produced a toxic fart in ([where])[contained].")
-
-
 /////////////////////////////////////////////
 // Sleep smoke
 /////////////////////////////////////////////
@@ -772,6 +753,10 @@ steam.start() -- spawns the effect
 	var/processing = 1
 	var/on = 1
 
+/datum/effect/effect/system/ion_trail_follow/Destroy()
+	oldposition = null
+	return ..()
+
 /datum/effect/effect/system/ion_trail_follow/set_up(atom/atom)
 	attach(atom)
 
@@ -805,6 +790,12 @@ steam.start() -- spawns the effect
 /datum/effect/effect/system/ion_trail_follow/space_trail
 	var/turf/oldloc // secondary ion trail loc
 	var/turf/currloc
+
+/datum/effect/effect/system/ion_trail_follow/space_trail/Destroy()
+	oldloc = null
+	currloc = null
+	return ..()
+
 /datum/effect/effect/system/ion_trail_follow/space_trail/start()
 	if(!src.on)
 		src.on = 1
@@ -865,6 +856,10 @@ steam.start() -- spawns the effect
 	var/processing = 1
 	var/on = 1
 
+	Destroy()
+		oldposition = null
+		return ..()
+
 	set_up(atom/atom)
 		attach(atom)
 		oldposition = get_turf(atom)

code/game/objects/effects/landmarks.dm

@@ -14,7 +14,7 @@
 	switch(name)			//some of these are probably obsolete
 		if("shuttle")
 			shuttle_z = z
-			del(src)
+			qdel(src)
 
 		if("airtunnel_stop")
 			airtunnel_stop = x
@@ -27,35 +27,35 @@
 
 		if("monkey")
 			monkeystart += loc
-			del(src)
+			qdel(src)
 		if("start")
 			newplayer_start += loc
-			del(src)
+			qdel(src)
 
 		if("wizard")
 			wizardstart += loc
-			del(src)
+			qdel(src)
 
 		if("JoinLate")
 			latejoin += loc
-			del(src)
+			qdel(src)
 
 		if("JoinLateGateway")
 			latejoin_gateway += loc
-			del(src)
+			qdel(src)
 
 		if("JoinLateCryo")
 			latejoin_cryo += loc
-			del(src)
+			qdel(src)
 
 		if("JoinLateCyborg")
 			latejoin_cyborg += loc
-			del(src)
+			qdel(src)
 
 		//prisoners
 		if("prisonwarp")
 			prisonwarp += loc
-			del(src)
+			qdel(src)
 	//	if("mazewarp")
 	//		mazewarp += loc
 		if("Holding Facility")
@@ -74,19 +74,19 @@
 		//not prisoners
 		if("prisonsecuritywarp")
 			prisonsecuritywarp += loc
-			del(src)
+			qdel(src)
 
 		if("blobstart")
 			blobstart += loc
-			del(src)
+			qdel(src)
 
 		if("xeno_spawn")
 			xeno_spawn += loc
-			del(src)
+			qdel(src)
 
 		if("ninjastart")
 			ninjastart += loc
-			del(src)
+			qdel(src)
 
 		if("carpspawn")
 			carplist += loc
@@ -99,20 +99,8 @@
 
 /obj/effect/landmark/Destroy()
 	landmarks_list -= src
-	return ..()
-
-/obj/effect/landmark/nations
-	name = "nations"
-	icon = 'icons/mob/screen1.dmi'
-	icon_state = "x"
-	anchored = 1.0
-
-/obj/effect/landmark/nations/New()
 	..()
-	tag = "nations*[name]"
-	invisibility = 101
-
-	return 1
+	return QDEL_HINT_HARDDEL_NOW
 
 /obj/effect/landmark/start
 	name = "start"
@@ -134,51 +122,51 @@
 	var/list/options = typesof(/obj/effect/landmark/costume)
 	var/PICK= options[rand(1,options.len)]
 	new PICK(src.loc)
-	del(src)
+	qdel(src)
 
 //SUBCLASSES.  Spawn a bunch of items and disappear likewise
 /obj/effect/landmark/costume/chicken/New()
 	new /obj/item/clothing/suit/chickensuit(src.loc)
 	new /obj/item/clothing/head/chicken(src.loc)
 	new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/gladiator/New()
 	new /obj/item/clothing/under/gladiator(src.loc)
 	new /obj/item/clothing/head/helmet/gladiator(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/madscientist/New()
 	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
 	new /obj/item/clothing/head/flatcap(src.loc)
 	new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
 	new /obj/item/clothing/glasses/gglasses(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/elpresidente/New()
 	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
 	new /obj/item/clothing/head/flatcap(src.loc)
 	new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
 	new /obj/item/clothing/shoes/jackboots(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/nyangirl/New()
 	new /obj/item/clothing/under/schoolgirl(src.loc)
 	new /obj/item/clothing/head/kitty(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/maid/New()
 	new /obj/item/clothing/under/blackskirt(src.loc)
 	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
 	new CHOICE(src.loc)
 	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/butler/New()
 	new /obj/item/clothing/suit/wcoat(src.loc)
 	new /obj/item/clothing/under/suit_jacket(src.loc)
 	new /obj/item/clothing/head/that(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/scratch/New()
 	new /obj/item/clothing/gloves/color/white(src.loc)
@@ -186,12 +174,12 @@
 	new /obj/item/clothing/under/scratch(src.loc)
 	if (prob(30))
 		new /obj/item/clothing/head/cueball(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/highlander/New()
 	new /obj/item/clothing/under/kilt(src.loc)
 	new /obj/item/clothing/head/beret(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/prig/New()
 	new /obj/item/clothing/suit/wcoat(src.loc)
@@ -202,24 +190,24 @@
 	new /obj/item/weapon/cane(src.loc)
 	new /obj/item/clothing/under/sl_suit(src.loc)
 	new /obj/item/clothing/mask/fakemoustache(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/plaguedoctor/New()
 	new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
 	new /obj/item/clothing/head/plaguedoctorhat(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/nightowl/New()
 	new /obj/item/clothing/under/owl(src.loc)
 	new /obj/item/clothing/mask/gas/owl_mask(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/waiter/New()
 	new /obj/item/clothing/under/waiter(src.loc)
 	var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
 	new CHOICE(src.loc)
 	new /obj/item/clothing/suit/apron(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/pirate/New()
 	new /obj/item/clothing/under/pirate(src.loc)
@@ -227,46 +215,46 @@
 	var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
 	new CHOICE(src.loc)
 	new /obj/item/clothing/glasses/eyepatch(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/commie/New()
 	new /obj/item/clothing/under/soviet(src.loc)
 	new /obj/item/clothing/head/ushanka(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/imperium_monk/New()
 	new /obj/item/clothing/suit/imperium_monk(src.loc)
 	if (prob(25))
 		new /obj/item/clothing/mask/gas/cyborg(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/holiday_priest/New()
 	new /obj/item/clothing/suit/holidaypriest(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/marisawizard/fake/New()
 	new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
 	new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/cutewitch/New()
 	new /obj/item/clothing/under/sundress(src.loc)
 	new /obj/item/clothing/head/witchwig(src.loc)
 	new /obj/item/weapon/twohanded/staff/broom(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/fakewizard/New()
 	new /obj/item/clothing/suit/wizrobe/fake(src.loc)
 	new /obj/item/clothing/head/wizard/fake(src.loc)
 	new /obj/item/weapon/twohanded/staff/(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/sexyclown/New()
 	new /obj/item/clothing/mask/gas/sexyclown(src.loc)
 	new /obj/item/clothing/under/sexyclown(src.loc)
-	del(src)
+	qdel(src)
 
 /obj/effect/landmark/costume/sexymime/New()
 	new /obj/item/clothing/mask/gas/sexymime(src.loc)
 	new /obj/item/clothing/under/sexymime(src.loc)
-	del(src)
+	qdel(src)

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

@@ -102,7 +102,7 @@
 			p4.air_contents.temperature = btemp + T0C
 			p2.secured = 1
 
-	del(src)
+	qdel(src)
 */
 
 /obj/effect/spawner/newbomb
@@ -169,4 +169,4 @@
 
 	V.update_icon()
 
-	del(src)
+	qdel(src)

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

@@ -23,4 +23,4 @@
 			else
 				new /turf/simulated/floor/vault(locate(i,j,z),type)
 
-	del(src)
+	qdel(src)