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/modules/admin/buildmode.dm

@@ -50,6 +50,12 @@
 	icon = 'icons/misc/buildmode.dmi'
 	var/obj/effect/bmode/buildholder/master = null
 
+/obj/effect/bmode/Destroy()
+	if(master && master.cl)
+		master.cl.screen -= src
+	master = null
+	return ..()
+
 /obj/effect/bmode/builddir
 	icon_state = "build"
 	screen_loc = "NORTH,WEST"
@@ -133,6 +139,19 @@
 	var/turf/cornerB = null
 	var/generator_path = null
 
+/obj/effect/bmode/buildholder/Destroy()
+	qdel(builddir)
+	builddir = null
+	qdel(buildhelp)
+	buildhelp = null
+	qdel(buildmode)
+	buildmode = null
+	qdel(buildquit)
+	buildquit = null
+	throw_atom = null
+	cl = null
+	return ..()
+
 /obj/effect/bmode/buildmode
 	icon_state = "buildmode1"
 	screen_loc = "NORTH,WEST+2"

code/modules/admin/holder2.dm

@@ -16,7 +16,7 @@ var/list/admin_datums = list()
 /datum/admins/New(initial_rank = "Temporary Admin", initial_rights = 0, ckey)
 	if(!ckey)
 		error("Admin datum created without a ckey argument. Datum has been deleted")
-		del(src)
+		qdel(src)
 		return
 	admincaster_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
 	rank = initial_rank
@@ -86,7 +86,7 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
 		holder.disassociate()
 		del(holder)
 	return 1
-	
+
 //This proc checks whether subject has at least ONE of the rights specified in rights_required.
 /proc/check_rights_for(client/subject, rights_required)
 	if(subject && subject.holder)

code/modules/admin/player_panel.dm

@@ -477,22 +477,6 @@
 						dat += "<tr><td><i>Head not found!</i></td></tr>"
 			dat += "</table>"
 
-		if(ticker.mode.name == "nations")
-			dat += "</table><br><table><tr><td><B>Flags(s)</B></td></tr>"
-			for(var/obj/item/flag/nation/N in world)
-				dat += "<tr><td>[N.name], "
-				var/atom/flag_loc = N.loc
-				while(!istype(flag_loc, /turf))
-					if(istype(flag_loc, /mob))
-						var/mob/M = flag_loc
-						dat += "carried by <a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> "
-					if(istype(flag_loc, /obj))
-						var/obj/O = flag_loc
-						dat += "in \a [O.name] "
-					flag_loc = flag_loc.loc
-				dat += "in [flag_loc.loc] at ([flag_loc.x], [flag_loc.y], [flag_loc.z])</td></tr>"
-			dat += "</table>"
-
 		if(istype(ticker.mode, /datum/game_mode/blob))
 			var/datum/game_mode/blob/mode = ticker.mode
 			dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"

code/modules/admin/topic.dm

@@ -25,7 +25,7 @@
 
 		message_admins("[key_name_admin(usr)] rejected [key_name_admin(C.mob)]'s admin help")
 		log_admin("[key_name(usr)] rejected [key_name(C.mob)]'s admin help")
-		
+
 	if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
 
@@ -1062,7 +1062,7 @@
 				message_admins("\blue [key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
 
 				del(M.client)
-				//del(M)	// See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
+				//qdel(M)	// See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
 			if("No")
 				var/reason = input(usr,"Please state the reason","Reason") as message|null
 				if(!reason)
@@ -1086,7 +1086,7 @@
 				DB_ban_record(BANTYPE_PERMA, M, -1, reason)
 
 				del(M.client)
-				//del(M)
+				//qdel(M)
 			if("Cancel")
 				return
 
@@ -2173,7 +2173,7 @@
 			log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
 		else
 			usr << "You may only use this when the game is running."
-			
+
 	else if(href_list["memoeditlist"])
 		if(!check_rights(R_SERVER)) return
 		var/sql_key = sanitizeSQL("[href_list["memoeditlist"]]")
@@ -2216,7 +2216,7 @@
 						if (M.client)
 							M.client.perspective = MOB_PERSPECTIVE
 							M.client.eye = M
-					del(O)
+					qdel(O)
 				ok = 1*/
 			if("monkey")
 				feedback_inc("admin_secrets_fun_used",1)

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -17,7 +17,7 @@
 
 /client/proc/SDQL2_query(query_text as message)
 	set category = "Debug"
-	
+
 	if(!check_rights(R_PROCCALL))  //Shouldn't happen... but just to be safe.
 		message_admins("<span class='danger'>ERROR: Non-admin [key_name_admin(usr)] attempted to execute a SDQL query!</span>")
 		log_admin("Non-admin [key_name(usr)] attempted to execute a SDQL query!")
@@ -95,7 +95,7 @@
 
 			if("delete")
 				for(var/datum/d in objs)
-					del d
+					del(d)
 
 			if("select")
 				var/text = ""
@@ -474,4 +474,3 @@
 	if(word != "")
 		query_list += word
 	return query_list
-	

code/modules/admin/verbs/mapping.dm

@@ -40,8 +40,8 @@ var/intercom_range_display_status = 0
 /client/proc/camera_view()
 	set category = "Mapping"
 	set name = "Camera Range Display"
-	
-	if(!check_rights(R_DEBUG)) 
+
+	if(!check_rights(R_DEBUG))
 		return
 
 	if(camera_range_display_status)
@@ -50,7 +50,7 @@ var/intercom_range_display_status = 0
 		camera_range_display_status = 1
 
 	for(var/obj/effect/debugging/camera_range/C in world)
-		del(C)
+		qdel(C)
 
 	if(camera_range_display_status)
 		for(var/obj/machinery/camera/C in cameranet.cameras)
@@ -60,8 +60,8 @@ var/intercom_range_display_status = 0
 /client/proc/sec_camera_report()
 	set category = "Mapping"
 	set name = "Camera Report"
-	
-	if(!check_rights(R_DEBUG)) 
+
+	if(!check_rights(R_DEBUG))
 		return
 
 	var/list/obj/machinery/camera/CL = list()
@@ -99,8 +99,8 @@ var/intercom_range_display_status = 0
 /client/proc/intercom_view()
 	set category = "Mapping"
 	set name = "Intercom Range Display"
-	
-	if(!check_rights(R_DEBUG)) 
+
+	if(!check_rights(R_DEBUG))
 		return
 
 	if(intercom_range_display_status)
@@ -109,17 +109,17 @@ var/intercom_range_display_status = 0
 		intercom_range_display_status = 1
 
 	for(var/obj/effect/debugging/marker/M in world)
-		del(M)
+		qdel(M)
 
 	if(intercom_range_display_status)
 		for(var/obj/item/device/radio/intercom/I in world)
 			for(var/turf/T in orange(7,I))
 				var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
 				if (!(F in view(7,I.loc)))
-					del(F)
+					qdel(F)
 	feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-var/list/admin_verbs_show_debug_verbs = list(	
+var/list/admin_verbs_show_debug_verbs = list(
 	/client/proc/camera_view,
 	/client/proc/sec_camera_report,
 	/client/proc/intercom_view,
@@ -128,7 +128,7 @@ var/list/admin_verbs_show_debug_verbs = list(
 	/client/proc/powerdebug, //check power
 	/client/proc/count_objects_on_z_level,
 	/client/proc/count_objects_all,
-	/client/proc/cmd_assume_direct_control,	
+	/client/proc/cmd_assume_direct_control,
 	/client/proc/startSinglo,
 	/client/proc/ticklag,
 	/client/proc/cmd_admin_grantfullaccess,
@@ -140,12 +140,12 @@ var/list/admin_verbs_show_debug_verbs = list(
 	/client/proc/forceEvent,
 	/client/proc/nanomapgen_DumpImage
 )
-	
+
 /client/proc/enable_debug_verbs()
 	set category = "Debug"
 	set name = "Debug verbs"
 
-	if(!check_rights(R_DEBUG)) 
+	if(!check_rights(R_DEBUG))
 		return
 
 	verbs += admin_verbs_show_debug_verbs
@@ -155,10 +155,10 @@ var/list/admin_verbs_show_debug_verbs = list(
 /client/proc/count_objects_on_z_level()
 	set category = "Mapping"
 	set name = "Count Objects On Level"
-	
-	if(!check_rights(R_DEBUG)) 
-		return	
-	
+
+	if(!check_rights(R_DEBUG))
+		return
+
 	var/level = input("Which z-level?","Level?") as text
 	if(!level) return
 	var/num_level = text2num(level)
@@ -193,8 +193,8 @@ var/list/admin_verbs_show_debug_verbs = list(
 /client/proc/count_objects_all()
 	set category = "Mapping"
 	set name = "Count Objects All"
-	
-	if(!check_rights(R_DEBUG)) 
+
+	if(!check_rights(R_DEBUG))
 		return
 
 	var/type_text = input("Which type path?","") as text

code/modules/admin/verbs/one_click_antag.dm

@@ -279,12 +279,12 @@ client/proc/one_click_antag()
 		for (var/obj/effect/landmark/A in /area/syndicate_station/start)//Because that's the only place it can BE -Sieve
 			if (A.name == "Syndicate-Gear-Closet")
 				new /obj/structure/closet/syndicate/personal(A.loc)
-				del(A)
+				qdel(A)
 				continue
 
 			if (A.name == "Syndicate-Bomb")
 				new /obj/effect/spawner/newbomb/timer/syndicate(A.loc)
-				del(A)
+				qdel(A)
 				continue
 
 		for(var/datum/mind/synd_mind in ticker.mode.syndicates)

code/modules/admin/verbs/onlyoneteam.dm

@@ -2,12 +2,12 @@
 	if(!ticker)
 		alert("The game hasn't started yet!")
 		return
-		
+
 	var/list/incompatible_species = list("Plasmaman")
 	for(var/mob/living/carbon/human/H in player_list)
-		if(H.stat == DEAD || !(H.client)) 
+		if(H.stat == DEAD || !(H.client))
 			continue
-		if(is_special_character(H)) 
+		if(is_special_character(H))
 			continue
 		if(H.species.name in incompatible_species)
 			H.set_species("Human")
@@ -55,7 +55,7 @@
 
 		H.species.equip(H)
 		H.regenerate_icons()
-				
+
 	message_admins("[key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
 	log_admin("[key_name(usr)] used dodgeball.")
 	nologevent = 1
@@ -85,6 +85,6 @@
 			return
 		else
 			playsound(src, 'sound/items/dodgeball.ogg', 50, 1)
-			visible_message("<span class='danger'>[H] HAS BEEN ELIMINATED!</span>", 3)
+			visible_message("<span class='danger'>[H] HAS BEEN ELIMINATED!</span>")
 			H.melt()
 			return

code/modules/admin/verbs/striketeam.dm

@@ -84,7 +84,7 @@ var/global/sent_strike_team = 0
 			var/obj/item/weapon/paper/P = new(L.loc)
 			P.info = "<p><b>Good morning soldier!</b>. This compact guide will familiarize you with standard operating procedure. There are three basic rules to follow:<br>#1 Work as a team.<br>#2 Accomplish your objective at all costs.<br>#3 Leave no witnesses.<br>You are fully equipped and stocked for your mission--before departing on the Spec. Ops. Shuttle due South, make sure that all operatives are ready. Actual mission objective will be relayed to you by Central Command through your headsets.<br>If deemed appropriate, Central Command will also allow members of your team to equip assault power-armor for the mission. You will find the armor storage due West of your position. Once you are ready to leave, utilize the Special Operations shuttle console and toggle the hull doors via the other console.</p><p>In the event that the team does not accomplish their assigned objective in a timely manner, or finds no other way to do so, attached below are instructions on how to operate a Nanotrasen Nuclear Device. Your operations <b>LEADER</b> is provided with a nuclear authentication disk and a pin-pointer for this reason. You may easily recognize them by their rank: Lieutenant, Captain, or Major. The nuclear device itself will be present somewhere on your destination.</p><p>Hello and thank you for choosing Nanotrasen for your nuclear information needs. Today's crash course will deal with the operation of a Fission Class Nanotrasen made Nuclear Device.<br>First and foremost, <b>DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.</b> Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done to unbolt it one must completely log in which at this time may not be possible.<br>To make the device functional:<br>#1 Place bomb in designated detonation zone<br> #2 Extend and anchor bomb (attack with hand).<br>#3 Insert Nuclear Auth. Disk into slot.<br>#4 Type numeric code into keypad ([nuke_code]).<br>Note: If you make a mistake press R to reset the device.<br>#5 Press the E button to log onto the device.<br>You now have activated the device. To deactivate the buttons at anytime, for example when you have already prepped the bomb for detonation, remove the authentication disk OR press the R on the keypad. Now the bomb CAN ONLY be detonated using the timer. A manual detonation is not an option.<br>Note: Toggle off the <b>SAFETY</b>.<br>Use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.<br>Note: <b>THE BOMB IS STILL SET AND WILL DETONATE</b><br>Now before you remove the disk if you need to move the bomb you can: Toggle off the anchor, move it, and re-anchor.</p><p>The nuclear authorization code is: <b>[nuke_code ? nuke_code : "None provided"]</b></p><p><b>Good luck, soldier!</b></p>"
 			P.name = "Spec. Ops Manual"
-			P.icon = "pamphlet-ds"		
+			P.icon = "pamphlet-ds"
 			var/obj/item/weapon/stamp/centcom/stamp = new
 			P.stamp(stamp)
 			qdel(stamp)
@@ -92,7 +92,7 @@ var/global/sent_strike_team = 0
 	for (var/obj/effect/landmark/L in landmarks_list)
 		if (L.name == "Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
-			del(L)
+			qdel(L)
 
 	message_admins("\blue [key_name_admin(usr)] has spawned a CentCom strike squad.", 1)
 	log_admin("[key_name(usr)] used Spawn Death Squad.")

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -93,7 +93,7 @@ var/global/sent_syndicate_strike_team = 0
 	for (var/obj/effect/landmark/L in landmarks_list)
 		if (L.name == "Syndicate-Commando-Bomb")
 			new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
-			del(L)
+			qdel(L)
 
 	message_admins("\blue [key_name_admin(usr)] has spawned a Syndicate strike squad.", 1)
 	log_admin("[key_name(usr)] used Spawn Syndicate Squad.")
@@ -121,7 +121,7 @@ var/global/sent_syndicate_strike_team = 0
 	new_syndicate_commando.mind.special_role = "Syndicate Commando"
 	ticker.mode.traitors |= new_syndicate_commando.mind	//Adds them to current traitor list. Which is really the extra antagonist list.
 	new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
-	del(spawn_location)
+	qdel(spawn_location)
 	return new_syndicate_commando
 
 /mob/living/carbon/human/proc/equip_syndicate_commando(syndicate_leader_selected = 0)

code/modules/assembly/igniter.dm

@@ -3,34 +3,43 @@
 	desc = "A small electronic device able to ignite combustable substances."
 	icon_state = "igniter"
 	materials = list(MAT_METAL=500, MAT_GLASS=50)
-	w_amt = 10
 	origin_tech = "magnets=1"
+	var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
 
-	describe()
-		return "The igniter is [secured?"secured.":"unsecured."]"
+/obj/item/device/assembly/igniter/New()
+	..()
+	sparks.set_up(2, 0, src)
+	sparks.attach(src)
 
+/obj/item/device/assembly/igniter/Destroy()
+	qdel(sparks)
+	sparks = null
+	return ..()
+
+
+/obj/item/device/assembly/igniter/describe()
+	return "The igniter is [secured?"secured.":"unsecured."]"
+
+
+/obj/item/device/assembly/igniter/activate()
+	if(!..())	return 0//Cooldown check
+	var/turf/location = get_turf(loc)
+	if(location)	location.hotspot_expose(1000,1000)
+	if (istype(src.loc,/obj/item/device/assembly_holder))
+		if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
+			var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
+			if (tank)
+				tank.explode()
+		if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
+			var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
+			if(beakerbomb)
+				beakerbomb.heat_beaker()
+
+	sparks.start()
+	return 1
+
+
+/obj/item/device/assembly/igniter/attack_self(mob/user as mob)
 	activate()
-		if(!..())	return 0//Cooldown check
-		var/turf/location = get_turf(loc)
-		if(location)	location.hotspot_expose(1000,1000)
-		if (istype(src.loc,/obj/item/device/assembly_holder))
-			if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
-				var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
-				if (tank)
-					tank.explode()
-			if (istype(src.loc.loc, /obj/item/weapon/reagent_containers/glass/beaker/))
-				var/obj/item/weapon/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
-				if(beakerbomb)
-					beakerbomb.heat_beaker()
-
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-		s.set_up(3, 1, src)
-		s.start()
-
-		return 1
-
-
-	attack_self(mob/user as mob)
-		activate()
-		add_fingerprint(user)
-		return
+	add_fingerprint(user)
+	return

code/modules/assembly/shock_kit.dm

@@ -11,7 +11,9 @@
 
 /obj/item/assembly/shock_kit/Destroy()
 	qdel(part1)
+	part1 = null
 	qdel(part2)
+	part2 = null
 	return ..()
 
 /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/modules/assembly/signaler.dm

@@ -27,6 +27,12 @@
 			spawn(1) // For things that set the frequency directly
 				set_frequency(frequency)
 		return
+
+	Destroy()
+		if(radio_controller)
+			radio_controller.remove_object(src,frequency)
+		return ..()
+
 	describe()
 		return "\The [src]'s power light is [receiving?"on":"off"]"
 

code/modules/awaymissions/corpse.dm

@@ -84,7 +84,7 @@
 	if(src.coffin == 1)
 		var/obj/structure/closet/coffin/sarcophagus/sarc = locate(/obj/structure/closet/coffin/sarcophagus) in loc
 		if(sarc) M.loc = sarc
-	del(src)
+	qdel(src)
 
 
 

code/modules/awaymissions/loot.dm

@@ -21,4 +21,4 @@
 				continue
 
 			new loot_path(get_turf(src))
-	del(src)
+	qdel(src)

code/modules/awaymissions/maploader/reader.dm

@@ -321,7 +321,7 @@ var/global/dmm_suite/preloader/_preloader = null
 /dmm_suite/preloader/New(var/list/the_attributes, var/path)
 	.=..()
 	if(!the_attributes.len)
-		Del()
+		del(src)
 		return
 	attributes = the_attributes
 	target_path = path
@@ -329,4 +329,4 @@ var/global/dmm_suite/preloader/_preloader = null
 /dmm_suite/preloader/proc/load(atom/what)
 	for(var/attribute in attributes)
 		what.vars[attribute] = attributes[attribute]
-	Del()
+	del(src)

code/modules/clothing/clothing.dm

@@ -2,6 +2,7 @@
 	name = "clothing"
 	var/list/species_restricted = null //Only these species can wear this kit.
 	var/rig_restrict_helmet = 0 // Stops the user from equipping a rig helmet without attaching it to the suit first.
+	var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
 
 	/*
 		Sprites used when the clothing item is refit. This is done by setting icon_override.
@@ -245,7 +246,6 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/hats.dmi'
 	body_parts_covered = HEAD
 	slot_flags = SLOT_HEAD
-	var/loose = 10 // probability (0..100) of coming off your head when you fall over or lay down
 	var/blockTracking // Do we block AI tracking?
 	var/flash_protect = 0
 	var/tint = 0
@@ -346,7 +346,6 @@ BLIND     // can't see anything
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
 	siemens_coefficient = 0.9
 	species_restricted = list("exclude","Diona","Vox","Wryn")
-	loose = 0 // What kind of idiot designs a pressurized suit where the helmet can fall off?
 	flash_protect = 2
 
 /obj/item/clothing/suit/space

code/modules/clothing/glasses/glasses.dm

@@ -78,10 +78,29 @@
 	prescription_upgradable = 0
 
 /obj/item/clothing/glasses/science
-	name = "Science Goggles"
-	desc = "nothing"
+	name = "science goggles"
+	desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
 	icon_state = "purple"
 	item_state = "glasses"
+	prescription_upgradable = 0
+	scan_reagents = 1 //You can see reagents while wearing science goggles
+
+/obj/item/clothing/glasses/science/equipped(mob/user, slot)
+	if(slot == slot_glasses)
+		user.scanner.Grant(user)
+	..(user, slot)
+
+/obj/item/clothing/glasses/science/dropped(mob/user)
+	user.scanner.devices -= 1
+	..(user)
+
+/obj/item/clothing/glasses/science/night
+	name = "Night Vision Science Goggle"
+	desc = "Now you can science in darkness."
+	icon_state = "nvpurple"
+	item_state = "glasses"
+	darkness_view = 8
+	see_darkness = 0
 
 /obj/item/clothing/glasses/janitor
 	name = "Janitorial Goggles"
@@ -176,6 +195,11 @@
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
 		)
 
+/obj/item/clothing/glasses/sunglasses/reagent
+	name = "sunscanners"
+	desc = "Strangely ancient technology used to help provide rudimentary eye color. Outfitted with apparatus to scan individual reagents."
+	scan_reagents = 1
+
 /obj/item/clothing/glasses/virussunglasses
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
 	name = "sunglasses"

code/modules/clothing/head/collectable.dm

@@ -9,46 +9,39 @@
 	name = "ultra rare Pete's hat!"
 	desc = "It smells faintly of plasma"
 	icon_state = "petehat"
-	loose = 0
 
 /obj/item/clothing/head/collectable/slime
 	name = "collectable slime cap!"
 	desc = "It just latches right in place!"
 	icon_state = "slime"
-	loose = 0
 
 /obj/item/clothing/head/collectable/xenom
 	name = "collectable xenomorph helmet!"
 	desc = "Hiss hiss hiss!"
 	icon_state = "xenom"
-	loose = 35 // Zoinks!  It was old man McGrief all along!
 
 /obj/item/clothing/head/collectable/chef
 	name = "collectable chef's hat"
 	desc = "A rare Chef's Hat meant for hat collectors!"
 	icon_state = "chef"
 	item_state = "chef"
-	loose = 45 // Mama mia!
 
 /obj/item/clothing/head/collectable/paper
 	name = "collectable paper hat"
 	desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
 	icon_state = "paper"
-	loose = 99 // fucking paper
 
 /obj/item/clothing/head/collectable/tophat
 	name = "collectable top hat"
 	desc = "A top hat worn by only the most prestigious hat collectors."
 	icon_state = "tophat"
 	item_state = "that"
-	loose = 70 // I say!
 
 /obj/item/clothing/head/collectable/captain
 	name = "collectable captain's hat"
 	desc = "A Collectable Hat that'll make you look just like a real comdom!"
 	icon_state = "captain"
 	item_state = "caphat"
-	loose = 55
 
 /obj/item/clothing/head/collectable/police
 	name = "collectable police officer's hat"
@@ -65,7 +58,6 @@
 	desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
 	icon_state = "welding"
 	item_state = "welding"
-	loose = 0
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
@@ -76,68 +68,58 @@
 	desc = "Just like a real Brain Slug!"
 	icon_state = "headslime"
 	item_state = "headslime"
-	loose = 5
 
 /obj/item/clothing/head/collectable/flatcap
 	name = "collectable flat cap"
 	desc = "A Collectible farmer's Flat Cap!"
 	icon_state = "flat_cap"
 	item_state = "detective"
-	loose = 5
 
 /obj/item/clothing/head/collectable/pirate
 	name = "collectable pirate hat"
 	desc = "You'd make a great Dread Syndie Roberts!"
 	icon_state = "pirate"
 	item_state = "pirate"
-	loose = 55 // yar
 
 /obj/item/clothing/head/collectable/kitty
 	name = "collectable kitty ears"
 	desc = "The fur feels.....a bit too realistic."
 	icon_state = "kitty"
 	item_state = "kitty"
-	loose = 2 // meow
 
 /obj/item/clothing/head/collectable/rabbitears
 	name = "collectable rabbit ears"
 	desc = "Not as lucky as the feet!"
 	icon_state = "bunny"
 	item_state = "bunny"
-	loose = 4 // little bunny foo foo
 
 /obj/item/clothing/head/collectable/wizard
 	name = "collectable wizard's hat"
 	desc = "NOTE:Any magical powers gained from wearing this hat are purely coincidental."
 	icon_state = "wizard"
-	loose = 4
 
 /obj/item/clothing/head/collectable/hardhat
 	name = "collectable hard hat"
 	desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
 	icon_state = "hardhat0_yellow"
 	item_state = "hardhat0_yellow"
-	loose = 9
 
 /obj/item/clothing/head/collectable/HoS
 	name = "collectable HoS hat"
 	desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
 	icon_state = "hoscap"
-	loose = 29
 
 /obj/item/clothing/head/collectable/thunderdome
 	name = "collectable Thunderdome helmet"
 	desc = "Go Red! I mean Green! I mean Red! No Green!"
 	icon_state = "thunderdome"
 	item_state = "thunderdome"
-	loose = 6
 
 /obj/item/clothing/head/collectable/swat
 	name = "collectable SWAT helmet"
 	desc = "Now you can be in the Deathsquad too!"
 	icon_state = "swat"
 	item_state = "swat"
-	loose = 3
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi'

code/modules/clothing/head/hardhat.dm

@@ -11,7 +11,6 @@
 	flags_inv = 0
 	action_button_name = "Toggle Helmet Light"
 	siemens_coefficient = 0.9
-	loose = 4
 
 	attack_self(mob/user)
 		if(!isturf(user.loc))

code/modules/clothing/head/helmet.dm

@@ -11,7 +11,6 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
 	siemens_coefficient = 0.7
-	loose = 4 // generally well seated
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi'
@@ -126,7 +125,6 @@
 	item_state = "gladiator"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 1
-	loose = 0 // full head, won't fall off
 
 obj/item/clothing/head/helmet/redtaghelm
 	name = "red laser tag helmet"

code/modules/clothing/head/jobs.dm

@@ -7,7 +7,6 @@
 	item_state = "chef"
 	desc = "The commander in chef's head wear."
 	siemens_coefficient = 0.9
-	loose = 35 // why-a do people always push-a me over
 
 //Captain
 /obj/item/clothing/head/caphat
@@ -17,7 +16,6 @@
 	item_state = "caphat"
 	siemens_coefficient = 0.9
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-	loose = 43 // not the answer
 
 //Captain: no longer space-worthy
 /obj/item/clothing/head/caphat/parade
@@ -32,7 +30,6 @@
 	desc = "The symbol of true bureaucratic micromanagement."
 	siemens_coefficient = 0.9
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-	loose = 43 // not the answer
 
 //Nanotrasen Representative
 /obj/item/clothing/head/ntrep
@@ -48,7 +45,6 @@
 	icon_state = "chaplain_hood"
 	flags = HEADCOVERSEYES | BLOCKHAIR
 	siemens_coefficient = 0.9
-	loose = 2
 
 //Chaplain
 /obj/item/clothing/head/nun_hood
@@ -57,7 +53,6 @@
 	icon_state = "nun_hood"
 	flags = HEADCOVERSEYES | BLOCKHAIR
 	siemens_coefficient = 0.9
-	loose = 2
 
 /obj/item/clothing/head/det_hat
 	name = "hat"
@@ -73,7 +68,6 @@
 	desc = "A beret, an artists favorite headwear."
 	icon_state = "beret"
 	siemens_coefficient = 0.9
-	loose = 16
 
 //Security
 /obj/item/clothing/head/HoS
@@ -128,7 +122,6 @@
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
 	icon_state = "surgcap_blue"
 	flags = BLOCKHEADHAIR
-	loose = 13
 
 /obj/item/clothing/head/surgery/purple
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."

code/modules/clothing/head/misc.dm

@@ -18,14 +18,12 @@
 	icon_state = "hairflowerp"
 	item_state = "hairflowerp"
 	item_state = "that"
-	loose = 0 // centcom
 
 /obj/item/clothing/head/powdered_wig
 	name = "powdered wig"
 	desc = "A powdered wig."
 	icon_state = "pwig"
 	item_state = "pwig"
-	loose = 90 // fucking whigs
 
 /obj/item/clothing/head/that
 	name = "top-hat"
@@ -33,19 +31,16 @@
 	icon_state = "tophat"
 	item_state = "that"
 	siemens_coefficient = 0.9
-	loose = 70
 
 /obj/item/clothing/head/redcoat
 	name = "redcoat's hat"
 	icon_state = "redcoat"
 	desc = "<i>'I guess it's a redhead.'</i>"
-	loose = 45
 
 /obj/item/clothing/head/mailman
 	name = "mailman's hat"
 	icon_state = "mailman"
 	desc = "<i>'Right-on-time'</i> mail service head wear."
-	loose = 65
 
 /obj/item/clothing/head/plaguedoctorhat
 	name = "plague doctor's hat"
@@ -53,21 +48,18 @@
 	icon_state = "plaguedoctor"
 	permeability_coefficient = 0.01
 	siemens_coefficient = 0.9
-	loose = 30
 
 /obj/item/clothing/head/hasturhood
 	name = "hastur's hood"
 	desc = "It's unspeakably stylish"
 	icon_state = "hasturhood"
 	flags = HEADCOVERSEYES | BLOCKHAIR
-	loose = 1
 
 /obj/item/clothing/head/nursehat
 	name = "nurse's hat"
 	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
 	siemens_coefficient = 0.9
-	loose = 80 // allowing for awkward come-ons when he/she drops his/her hat and you get it for him/her.
 
 /obj/item/clothing/head/syndicatefake
 	name = "black and red space-helmet replica"
@@ -77,7 +69,6 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	siemens_coefficient = 2.0
-	loose = 15 // not a very good replica
 
 /obj/item/clothing/head/cueball
 	name = "cueball helmet"
@@ -86,7 +77,6 @@
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
 	item_state="cueball"
 	flags_inv = 0
-	loose = 0
 
 /obj/item/clothing/head/that
 	name = "sturdy top-hat"
@@ -94,7 +84,6 @@
 	icon_state = "tophat"
 	item_state = "that"
 	flags_inv = 0
-	loose = 70
 
 
 /obj/item/clothing/head/greenbandana
@@ -103,7 +92,6 @@
 	icon_state = "greenbandana"
 	item_state = "greenbandana"
 	flags_inv = 0
-	loose = 1
 
 /obj/item/clothing/head/cardborg
 	name = "cardborg helmet"
@@ -112,7 +100,6 @@
 	item_state = "cardborg_h"
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
-	loose = 20
 
 /obj/item/clothing/head/justice
 	name = "justice hat"
@@ -120,7 +107,6 @@
 	icon_state = "justicered"
 	item_state = "justicered"
 	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
-	loose = 0
 
 /obj/item/clothing/head/justice/blue
 	icon_state = "justiceblue"
@@ -142,7 +128,6 @@
 	name = "rabbit ears"
 	desc = "Wearing these makes you looks useless, and only good for your sex appeal."
 	icon_state = "bunny"
-	loose = 4
 
 /obj/item/clothing/head/flatcap
 	name = "flat cap"
@@ -150,28 +135,24 @@
 	icon_state = "flat_cap"
 	item_state = "detective"
 	siemens_coefficient = 0.9
-	loose = 1
 
 /obj/item/clothing/head/pirate
 	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
-	loose = 18
 
 /obj/item/clothing/head/hgpiratecap
 	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "hgpiratecap"
 	item_state = "hgpiratecap"
-	loose = 36
 
 /obj/item/clothing/head/bandana
 	name = "pirate bandana"
 	desc = "Yarr."
 	icon_state = "bandana"
 	item_state = "bandana"
-	loose = 0
 
 //stylish bs12 hats
 
@@ -222,7 +203,6 @@
 	item_state = "witch"
 	flags = BLOCKHAIR
 	siemens_coefficient = 2.0
-	loose = 1
 
 /obj/item/clothing/head/chicken
 	name = "chicken suit head"
@@ -251,7 +231,6 @@
 	item_state = "bearpelt"
 	flags = BLOCKHAIR
 	siemens_coefficient = 2.0
-	loose = 0 // grrrr
 
 /obj/item/clothing/head/xenos
 	name = "xenos helmet"
@@ -281,7 +260,6 @@
 /obj/item/clothing/head/fedora/brownfedora
 	name = "brown fedora"
 	icon_state = "bfedora"
-	loose = 35
 
 /obj/item/clothing/head/stalhelm
 	name = "Clown Stalhelm"

code/modules/clothing/head/misc_special.dm

@@ -25,7 +25,6 @@
 	flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
 	action_button_name = "flip welding helmet"
 	siemens_coefficient = 0.9
-	loose = 4
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi'
@@ -84,7 +83,6 @@
 	var/status = 0
 	var/fire_resist = T0C+1300	//this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
 	var/processing = 0 //I dont think this is used anywhere.
-	loose = 60
 
 /obj/item/clothing/head/cakehat/process()
 	if(!onfire)
@@ -126,7 +124,6 @@
 	flags_inv = HIDEEARS
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
-	loose = 1 // too warm, your head doesn't want to leave
 
 /obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
 	if(src.icon_state == "ushankadown")
@@ -153,7 +150,6 @@
 	action_button_name = "Toggle Pumpkin Light"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	brightness_on = 2 //luminosity when on
-	loose = 80
 
 
 /obj/item/clothing/head/hardhat/reindeer
@@ -177,7 +173,6 @@
 	icon_state = "kitty"
 	var/icon/mob
 	siemens_coefficient = 1.5
-	loose = 33
 
 /obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user)
 	if(!istype(user)) return

code/modules/clothing/shoes/miscellaneous.dm

@@ -1,3 +1,5 @@
+/obj/item/clothing/shoes/proc/step_action(var/mob/living/carbon/human/H) //squeek squeek
+
 /obj/item/clothing/shoes/syndigaloshes
 	desc = "A pair of brown shoes. They seem to have extra grip."
 	name = "brown shoes"
@@ -61,6 +63,18 @@
 	var/footstep = 1	//used for squeeks whilst walking
 	species_restricted = null
 
+/obj/item/clothing/shoes/clown_shoes/step_action(var/mob/living/carbon/human/H)
+	if(!istype(H))	return 0
+
+	if(H.m_intent == "run")
+		if(footstep >= 2)
+			playsound(src, "clownstep", 50, 1)
+			footstep = 0
+		else
+			footstep++
+	else
+		playsound(src, "clownstep", 20, 1)
+
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
 	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
@@ -68,7 +82,19 @@
 	item_state = "jackboots"
 	item_color = "hosred"
 	siemens_coefficient = 0.7
-	var/footstep=1
+	var/footstep = 1
+
+/obj/item/clothing/shoes/jackboots/step_action(var/mob/living/carbon/human/H)
+	if(!istype(H))	return 0
+
+	if(H.m_intent == "run")
+		if(footstep >= 2)
+			playsound(src, "jackboot", 50, 1)
+			footstep = 0
+		else
+			footstep++
+	else
+		playsound(src, "jackboot", 20, 1)
 
 /obj/item/clothing/shoes/jackboots/jacksandals
 	name = "jacksandals"
@@ -132,11 +158,10 @@
 	icon_state = "griffinboots"
 	item_state = "griffinboots"
 	flags = NODROP
-	
+
 /obj/item/clothing/shoes/fluff/noble_boot
 	name = "noble boots"
 	desc = "The boots are economically designed to balance function and comfort, so that you can step on peasants without having to worry about blisters. The leather also resists unwanted blood stains."
 	icon_state = "noble_boot"
 	item_color = "noble_boot"
 	item_state = "noble_boot"
-	

code/modules/clothing/spacesuits/rig.dm

@@ -37,14 +37,14 @@
 	on = !on
 	icon_state = "rig[on]-[item_color]"
 
-	if(on)	
+	if(on)
 		set_light(brightness_on)
-	else	
+	else
 		set_light(0)
 
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		H.update_inv_head()	
+		H.update_inv_head()
 
 /obj/item/clothing/suit/space/rig
 	name = "hardsuit"
@@ -135,13 +135,13 @@
 				boots.flags &= ~NODROP
 				H.unEquip(boots)
 				boots.forceMove(src)
-				
+
 /obj/item/clothing/suit/space/rig/verb/toggle_helmet()
 	set name = "Toggle Helmet"
 	set category = "Object"
 	set src in usr
 
-	if(!isliving(usr)) 
+	if(!isliving(usr))
 		return
 
 	if(!helmet)
@@ -300,7 +300,7 @@
 	if(!isturf(user.loc))
 		user << "You cannot toggle your helmet while in this [user.loc]." //To prevent some lighting anomalities.
 		return
-		
+
 	on = !on
 	if(on)
 		user << "<span class='notice'>You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.</span>"
@@ -404,6 +404,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
 	flash_protect = 0
+	scan_reagents = 1 //Generally worn by the CMO, so they'd get utility off of seeing reagents
 
 /obj/item/clothing/suit/space/rig/medical
 	icon_state = "rig-medical"

code/modules/clothing/suits/bio.dm

@@ -8,7 +8,6 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 0.9
-	loose = 7
 
 /obj/item/clothing/suit/bio_suit
 	name = "bio suit"

code/modules/clothing/suits/miscellaneous.dm

@@ -445,7 +445,6 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 0.9
-	loose = 7
 
 /obj/item/clothing/suit/jacket
 	name = "bomber jacket"
@@ -505,11 +504,10 @@
 	icon_state = "lordadmiral"
 	item_state = "lordadmiral"
 	allowed = list (/obj/item/weapon/gun)
-	
+
 /obj/item/clothing/suit/fluff/noble_coat
 	name = "noble coat"
 	desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion."
 	icon_state = "noble_coat"
 	item_state = "noble_coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	

code/modules/clothing/suits/storage.dm

@@ -8,6 +8,11 @@
 	pockets.max_w_class = 2		//fit only pocket sized items
 	pockets.max_combined_w_class = 4
 
+/obj/item/clothing/suit/storage/Destroy()
+	qdel(pockets)
+	pockets = null
+	return ..()
+
 /obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
 	if (pockets.handle_attack_hand(user))
 		..(user)

code/modules/clothing/suits/utility.dm

@@ -63,7 +63,6 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
 	siemens_coefficient = 0
-	loose = 5
 
 
 /obj/item/clothing/suit/bomb_suit
@@ -105,7 +104,6 @@
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
 	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
-	loose = 8
 
 /obj/item/clothing/suit/radiation
 	name = "Radiation suit"

code/modules/clothing/suits/wiz_robe.dm

@@ -6,7 +6,6 @@
 	permeability_coefficient = 0.01
 	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 20, rad = 20)
 	unacidable = 1
-	loose = 0 // magic
 	//Not given any special protective value since the magic robes are full-body protection --NEO
 	siemens_coefficient = 0.8
 

code/modules/computer3/laptop.dm

@@ -52,7 +52,7 @@
 					O.forceMove(loc)
 			usr << "\The [src] crumbles to pieces."
 			spawn(5)
-				qdel(src) 
+				qdel(src)
 			return
 
 		if(!stored_computer.manipulating)
@@ -65,7 +65,7 @@
 
 			spawn(5)
 				stored_computer.manipulating = 0
-				qdel(src) 
+				qdel(src)
 		else
 			usr << "\red You are already opening the computer!"
 
@@ -73,8 +73,9 @@
 	AltClick()
 		if(Adjacent(usr))
 			open_computer()
-		
+
 	Destroy()
+		..()
 		return QDEL_HINT_HARDDEL_NOW // Warning: GC'ing will cause the laptop to vanish when it next closes
 
 //Quickfix until Snapshot works out how he wants to redo power. ~Z

code/modules/examine/descriptions/engineering.dm

@@ -1,4 +1,4 @@
-/obj/machinery/power/supermatter
+/obj/machinery/power/supermatter_shard
 	description_info = "When energized by a laser (or something hitting it), it emits radiation and heat.  If the heat reaches above 7000 kelvin, it will send an alert and start taking damage. \
 	After integrity falls to zero percent, it will delaminate, causing a massive explosion, station-wide radiation spikes, and hallucinations. \
 	Supermatter reacts badly to oxygen in the atmosphere.  It'll also heat up really quick if it is in vacuum.<br>\

code/modules/fish/fishtank.dm

@@ -366,7 +366,7 @@
 	else															//We are deconstructing, make glass sheets instead of shards
 		var/sheets = shard_count + 1								//Deconstructing it salvages all the glass used to build the tank
 		new /obj/item/stack/sheet/glass(get_turf(src), sheets)		//Produce the appropriate number of glass sheets, in a single stack
-	qdel(src)														//QDel the tank and it's contents
+	qdel(src)														//qdel the tank and it's contents
 	T.air_update_turf(1)											//Update the air for the turf, to avoid permanent atmos sealing with wall tanks
 
 /obj/machinery/fishtank/proc/spill_water()

code/modules/flufftext/Hallucination.dm

@@ -442,18 +442,18 @@ Gunshots/explosions/opening doors/less rare audio (done)
 
 
 /obj/effect/fake_attacker/proc/updateimage()
-//	del src.currentimage
+//	qdel(src.currentimage)
 	if(src.dir == NORTH)
-		del(src.currentimage)
+		qdel(src.currentimage)
 		src.currentimage = new /image(up,src)
 	else if(src.dir == SOUTH)
-		del(src.currentimage)
+		qdel(src.currentimage)
 		src.currentimage = new /image(down,src)
 	else if(src.dir == EAST)
-		del(src.currentimage)
+		qdel(src.currentimage)
 		src.currentimage = new /image(right,src)
 	else if(src.dir == WEST)
-		del(src.currentimage)
+		qdel(src.currentimage)
 		src.currentimage = new /image(left,src)
 	my_target << currentimage
 

code/modules/food/cooker.dm

@@ -125,7 +125,7 @@
 			setCooked(I, newfood)
 		newfood.cooktype[thiscooktype] = 1
 		turnoff(I)
-		//del(I)
+		//qdel(I)
 
 // MAKE SURE TO OVERRIDE THESE ON THE MACHINE IF IT HAS SPECIAL FOOD INTERACTIONS!
 // FAILURE TO OVERRIDE WILL RESULT IN FAILURE TO PROPERLY HANDLE SPECIAL INTERACTIONS!		--FalseIncarnate

code/modules/garbage_collection/garbage_collector.dm

@@ -160,7 +160,7 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
  */
 /datum/proc/Destroy()
 	tag = null
-	return QDEL_HINT_HARDDEL_NOW // By default, assume that queueing any given datum is unsafe
+	return QDEL_HINT_QUEUE // Garbage Collect everything.
 
 // If something gets deleted directly, make sure its Destroy proc is still called
 /datum/Del()
@@ -181,4 +181,3 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
 
 /proc/gcwarning(msg)
 	log_to_dd("## GC WARNING: [msg]")
-	

code/modules/hydroponics/grown.dm

@@ -395,13 +395,13 @@
 				var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
 				poultice.heal_brute = potency
 				user << "<span class='notice'>You mash the leaves into a poultice.</span>"
-				del(src)
+				qdel(src)
 				return
 			if("mtear")
 				var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
 				poultice.heal_burn = potency
 				user << "<span class='notice'>You mash the petals into a poultice.</span>"
-				del(src)
+				qdel(src)
 				return
 	*/
 

code/modules/jungle/jungle.dm

@@ -93,7 +93,7 @@
 			//world << "falsewall_spawner found in wall"
 			var/obj/structure/temple_falsewall/fwall = new(F.loc)
 			fwall.mineral = mineral
-			del(F)
+			qdel(F)
 
 		for(var/obj/effect/landmark/door_spawner/D in T.contents)
 			//world << "door_spawner found in wall"
@@ -101,7 +101,7 @@
 			T.icon_state = "dark"
 			var/spawn_type = text2path("/obj/machinery/door/airlock/[door_mineral]")
 			new spawn_type(T)
-			del(D)*/
+			qdel(D)*/
 
 //a shuttle has crashed somewhere on the map, it should have a power cell to let the adventurers get home
 /area/jungle/crash_ship_source

code/modules/jungle/jungle_temple.dm

@@ -49,7 +49,7 @@
 	New()
 		if(prob(10))
 			new /obj/effect/glowshroom(src.loc)
-		del(src)
+		qdel(src)
 
 /obj/effect/landmark/loot_spawn
 	name = "loot spawner"
@@ -267,7 +267,7 @@
 				for(var/i=0,i<num,i++)
 					new /mob/living/simple_animal/hostile/viscerator(C)
 
-		del(src)
+		qdel(src)
 
 /obj/effect/landmark/loot_spawn/low
 	name = "low prob loot spawner"

code/modules/mining/drilling/distribution.dm

@@ -1,234 +0,0 @@
-//If anyone can think of a less shitty way to work out x,y points on a linear string of integers please tell me.
-#define MAP_CELL ((y-1)*real_size)+x
-#define MAP_CENTRE (((y-1)+size/2)*real_size)+(x+size/2)
-#define MAP_TOP_LEFT ((y-1)*real_size)+x
-#define MAP_TOP_RIGHT ((y-1)*real_size)+(x+size)
-#define MAP_BOTTOM_LEFT (((y+size)-1)*real_size)+x
-#define MAP_BOTTOM_RIGHT ((((y+size)-1)*real_size)+(x+size))
-#define MAP_MID_TOP MAP_TOP_LEFT + (size/2)
-#define MAP_MID_BOTTOM MAP_BOTTOM_LEFT + (size/2)
-#define MAP_MID_LEFT (((y-1)+size/2)*real_size)+x
-#define MAP_MID_RIGHT (((y-1)+size/2)*real_size)+(x+size)
-
-#define MIN_SURFACE_COUNT 1000
-#define MAX_SURFACE_COUNT 5000
-#define MIN_RARE_COUNT 1000
-#define MAX_RARE_COUNT 5000
-#define MIN_DEEP_COUNT 100
-#define MAX_DEEP_COUNT 300
-#define ITERATE_BEFORE_FAIL 200
-
-#define RESOURCE_HIGH_MAX 4
-#define RESOURCE_HIGH_MIN 2
-#define RESOURCE_MID_MAX 3
-#define RESOURCE_MID_MIN 1
-#define RESOURCE_LOW_MAX 1
-#define RESOURCE_LOW_MIN 0
-
-/*
-Surface minerals:
-	silicates
-	iron
-	gold
-	silver
-
-Rare minerals:
-	uranium
-	diamond
-
-Deep minerals:
-	plasma
-	xerxium (adamantine)
-	fulgurium (mythril)
-*/
-
-/datum/ore_distribution
-
-	var/real_size = 65     //Overall map size ((must be power of 2)+1)
-	var/chunk_size = 4     //Size each cell represents on map (like hell we're generating up to 100 256^2 grids at roundstart)
-	var/list/map[4225]     //The actual map. real_size squared.
-	var/range = 255        //Max random range of cells in map.
-
-	var/random_variance_chance = 25
-	var/random_element = 0.5
-
-/datum/ore_distribution/proc/map_is_sane()
-	if(!map) return 0
-
-	var/rare_count = 0
-	var/surface_count = 0
-	var/deep_count = 0
-
-	for(var/cell in map)
-		if(cell>(range*0.60))
-			deep_count++
-		else if(cell>(range*0.40))
-			rare_count++
-		else
-			surface_count++
-
-	if(surface_count < MIN_SURFACE_COUNT || surface_count > MAX_SURFACE_COUNT) return 0
-	if(rare_count < MIN_RARE_COUNT || rare_count > MAX_RARE_COUNT) return 0
-	if(deep_count < MIN_DEEP_COUNT || deep_count > MAX_DEEP_COUNT) return 0
-	return 1
-
-//Halfassed diamond-square algorithm with some fuckery since it's a single dimension array.
-/datum/ore_distribution/proc/populate_distribution_map()
-
-	//Announce it!
-	world << "<b><font color='red'>Generating resource distribution map.</b></font>"
-
-	//Seed beginning values.
-	var/x = 1
-	var/y = 1
-	var/size = real_size-1
-	map[MAP_TOP_LEFT] =     (range/3)+rand(range/5)
-	map[MAP_TOP_RIGHT] =    (range/3)+rand(range/5)
-	map[MAP_BOTTOM_LEFT] =  (range/3)+rand(range/5)
-	map[MAP_BOTTOM_RIGHT] = (range/3)+rand(range/5)
-
-	//Fill in and smooth it out.
-	var/attempts = 0
-	do
-		attempts++
-		generate_distribution_map(1,1,size)
-	while(attempts < ITERATE_BEFORE_FAIL && !map_is_sane())
-
-	if(attempts >= ITERATE_BEFORE_FAIL)
-		world << "<b><font color='red'>Could not generate a sane distribution map. Aborting.</font></b>"
-		map = null
-		return
-	else
-		apply_to_asteroid()
-
-/datum/ore_distribution/proc/clear_distribution_map()
-	for(var/x = 1, x <= real_size, x++)
-		for(var/y = 1, y <= real_size, y++)
-			map[MAP_CELL] = 0
-
-/datum/ore_distribution/proc/print_distribution_map()
-	var/line = ""
-	for(var/x = 1, x <= real_size, x++)
-		for(var/y = 1, y <= real_size, y++)
-			line += num2text(round(map[MAP_CELL]/25.5))
-		world << line
-		line = ""
-
-/datum/ore_distribution/proc/generate_distribution_map(var/x,var/y,var/input_size)
-
-	var/size = input_size
-
-	map[MAP_MID_TOP] =    (map[MAP_TOP_LEFT] + map[MAP_TOP_RIGHT])/2
-	map[MAP_MID_RIGHT] =  (map[MAP_BOTTOM_RIGHT] + map[MAP_TOP_RIGHT])/2
-	map[MAP_MID_BOTTOM] = (map[MAP_BOTTOM_LEFT] + map[MAP_BOTTOM_RIGHT])/2
-	map[MAP_MID_LEFT] =   (map[MAP_TOP_LEFT] + map[MAP_BOTTOM_RIGHT])/2
-	map[MAP_CENTRE] =     (map[MAP_MID_LEFT]+map[MAP_MID_RIGHT]+map[MAP_MID_BOTTOM]+map[MAP_MID_TOP])/4
-
-	if(prob(random_variance_chance))
-		map[MAP_CENTRE] *= (rand(1) ? (1.0-random_element) : (1.0+random_element))
-		map[MAP_CENTRE] = max(0,min(range,map[MAP_CENTRE]))
-
-	if(size>3)
-		generate_distribution_map(x,y,input_size/2)
-		generate_distribution_map(x+(input_size/2),y,input_size/2)
-		generate_distribution_map(x,y+(input_size/2),input_size/2)
-		generate_distribution_map(x+(input_size/2),y+(input_size/2),input_size/2)
-
-/datum/ore_distribution/proc/apply_to_asteroid()
-
-	// THESE VALUES DETERMINE THE AREA THAT THE DISTRIBUTION MAP IS APPLIED TO.
-	// IF YOU DO NOT RUN OFFICIAL BAYCODE ASTEROID MAP YOU NEED TO CHANGE THEM.
-	// ORIGIN IS THE BOTTOM LEFT CORNER OF THE SQUARE CONTAINING ALL ASTEROID
-	// TILES YOU WISH TO APPLY THE DISTRIBUTION MAP TO.
-
-	var/origin_x = 13  //We start here...
-	var/origin_y = 32  //...and here...
-	var/limit_x = 217  //...and iterate until here...
-	var/limit_y = 223  //...and here...
-	var/asteroid_z = 5 //...on this Z-level.
-
-	var/tx = origin_x
-	var/ty = origin_y
-
-	for(var/y = 1, y <= real_size, y++)
-
-		for(var/x = 1, x <= real_size, x++)
-
-			var/turf/target_turf
-
-			for(var/i=0,i<chunk_size,i++)
-
-				for(var/j=0,j<chunk_size,j++)
-
-					if(tx+j > limit_x || ty+i > limit_y)
-						continue
-
-					target_turf = locate(tx+j, ty+i, asteroid_z)
-
-					if(target_turf && target_turf.has_resources)
-
-						target_turf.resources = list()
-						target_turf.resources["silicates"] = rand(3,5)
-						target_turf.resources["carbonaceous rock"] = rand(3,5)
-
-						switch(map[MAP_CELL])
-							if(0 to 100)
-								target_turf.resources["iron"] =       rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["gold"] =       rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["silver"] =     rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["diamond"] =    0
-								target_turf.resources["plasma"] =     0
-								target_turf.resources["osmium"] =     0
-								target_turf.resources["hydrogen"] =   0
-							if(100 to 124)
-								target_turf.resources["iron"] =       0
-								target_turf.resources["gold"] =       rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["silver"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["uranium"] =    rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["diamond"] =    0
-								target_turf.resources["plasma"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["osmium"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["hydrogen"] =   0
-							if(125 to 255)
-								target_turf.resources["iron"] =       0
-								target_turf.resources["gold"] =       0
-								target_turf.resources["silver"] =     0
-								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["diamond"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["plasma"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["osmium"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["hydrogen"] =   rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-
-			tx += chunk_size
-		tx = origin_x
-		ty += chunk_size
-
-	world << "<b><font color='red'>Resource map generation complete.</font></b>"
-	return
-
-#undef MAP_CELL
-#undef MAP_CENTRE
-#undef MAP_TOP_LEFT
-#undef MAP_TOP_RIGHT
-#undef MAP_BOTTOM_LEFT
-#undef MAP_BOTTOM_RIGHT
-#undef MAP_MID_TOP
-#undef MAP_MID_BOTTOM
-#undef MAP_MID_LEFT
-#undef MAP_MID_RIGHT
-
-#undef MIN_SURFACE_COUNT
-#undef MAX_SURFACE_COUNT
-#undef MIN_RARE_COUNT
-#undef MAX_RARE_COUNT
-#undef MIN_DEEP_COUNT
-#undef MAX_DEEP_COUNT
-#undef ITERATE_BEFORE_FAIL
-
-#undef RESOURCE_HIGH_MAX
-#undef RESOURCE_HIGH_MIN
-#undef RESOURCE_MID_MAX
-#undef RESOURCE_MID_MIN
-#undef RESOURCE_LOW_MAX
-#undef RESOURCE_LOW_MIN

code/modules/mining/drilling/drill.dm

@@ -1,392 +0,0 @@
-/obj/machinery/mining
-	icon = 'icons/obj/mining_drill.dmi'
-	anchored = 0
-	use_power = 0 //The drill takes power directly from a cell.
-	density = 1
-	layer = MOB_LAYER+0.1 //So it draws over mobs in the tile north of it.
-
-/obj/machinery/mining/drill
-	name = "mining drill head"
-	desc = "An enormous drill."
-	icon_state = "mining_drill"
-	var/braces_needed = 2
-	var/list/supports = list()
-	var/supported = 0
-	var/active = 0
-	var/list/resource_field = list()
-	var/open = 0
-
-	var/ore_types = list(
-		"iron" = /obj/item/weapon/ore/iron,
-		"uranium" = /obj/item/weapon/ore/uranium,
-		"gold" = /obj/item/weapon/ore/gold,
-		"silver" = /obj/item/weapon/ore/silver,
-		"diamond" = /obj/item/weapon/ore/diamond,
-		"plasma" = /obj/item/weapon/ore/plasma,
-		"osmium" = /obj/item/weapon/ore/osmium,
-		"hydrogen" = /obj/item/weapon/ore/hydrogen,
-		"silicates" = /obj/item/weapon/ore/glass,
-		"carbonaceous rock" = /obj/item/weapon/ore/coal
-		)
-
-	//Upgrades
-	var/obj/item/weapon/stock_parts/matter_bin/storage
-	var/obj/item/weapon/stock_parts/micro_laser/cutter
-	var/obj/item/weapon/stock_parts/capacitor/cellmount
-	var/obj/item/weapon/stock_parts/cell/cell
-
-	//Flags
-	var/need_update_field = 0
-	var/need_player_check = 0
-
-/obj/machinery/mining/drill/New()
-
-	..()
-
-	storage = new(src)
-	cutter = new(src)
-	cellmount = new(src)
-
-	cell = new(src)
-	cell.maxcharge = 10000
-	cell.charge = cell.maxcharge
-
-/obj/machinery/mining/drill/process()
-
-	if(need_player_check)
-		return
-
-	check_supports()
-
-	if(!active) return
-
-	if(!anchored || !use_cell_power())
-		system_error("system configuration or charge error")
-		return
-
-	if(need_update_field)
-		get_resource_field()
-
-	if(world.time % 10 == 0)
-		update_icon()
-
-	if(!active)
-		return
-
-	//Drill through the flooring, if any.
-	if(istype(get_turf(src),/turf/simulated/floor/plating/airless/asteroid))
-		var/turf/simulated/floor/plating/airless/asteroid/T = get_turf(src)
-		if(!T.dug)
-			T.gets_dug()
-	else if(istype(get_turf(src),/turf/simulated/floor))
-		var/turf/simulated/floor/T = get_turf(src)
-		T.ex_act(2.0)
-
-	//Dig out the tasty ores.
-	if(resource_field.len)
-		var/turf/harvesting = pick(resource_field)
-
-		while(resource_field.len && !harvesting.resources)
-			harvesting.has_resources = 0
-			harvesting.resources = null
-			resource_field -= harvesting
-			harvesting = pick(resource_field)
-
-		if(!harvesting) return
-
-		var/total_harvest = get_harvest_capacity() //Ore harvest-per-tick.
-		var/found_resource = 0 //If this doesn't get set, the area is depleted and the drill errors out.
-
-		for(var/metal in ore_types)
-
-			if(contents.len >= get_storage_capacity())
-				system_error("insufficient storage space")
-				active = 0
-				need_player_check = 1
-				update_icon()
-				return
-
-			if(contents.len + total_harvest >= get_storage_capacity())
-				total_harvest = get_storage_capacity() - contents.len
-
-			if(total_harvest <= 0) break
-			if(harvesting.resources[metal])
-
-				found_resource  = 1
-
-				var/create_ore = 0
-				if(harvesting.resources[metal] >= total_harvest)
-					harvesting.resources[metal] -= total_harvest
-					create_ore = total_harvest
-					total_harvest = 0
-				else
-					total_harvest -= harvesting.resources[metal]
-					create_ore = harvesting.resources[metal]
-					harvesting.resources[metal] = 0
-
-				for(var/i=1,i<=create_ore,i++)
-					var/oretype = ore_types[metal]
-					new oretype(src)
-
-		if(!found_resource)
-			harvesting.has_resources = 0
-			harvesting.resources = null
-			resource_field -= harvesting
-	else
-		active = 0
-		need_player_check = 1
-		update_icon()
-
-/obj/machinery/mining/drill/attack_ai(var/mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/mining/drill/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/weapon/screwdriver))
-		if(active) return
-		open = !open
-		user << "\blue You [open ? "open" : "close"] the maintenance panel." //TODO: Sprite.
-		return
-	else
-		if(!open || active) return ..()
-		if(istype(W,/obj/item/weapon/crowbar))
-			if(cell)
-				user << "You pry out \the [cell]."
-				cell.loc = get_turf(src)
-				cell = null
-			else if(storage)
-				user << "You slip the bolt and pry out \the [storage]."
-				storage.loc = get_turf(src)
-				storage = null
-			else if(cutter)
-				user << "You carefully detatch and pry out \the [cutter]."
-				cutter.loc = get_turf(src)
-				cutter = null
-			else if(cellmount)
-				user << "You yank out a few wires and pry out \the [cellmount]."
-				cellmount.loc = get_turf(src)
-				cellmount = null
-			else
-				user << "There's nothing inside the drilling rig to remove."
-			return
-		else if(istype(W,/obj/item/weapon/stock_parts/matter_bin))
-			if(storage)
-				user << "The drill already has a matter bin installed."
-			else
-				user.drop_item()
-				W.loc = src
-				storage = W
-				user << "You install \the [W]."
-			return
-		else if(istype(W,/obj/item/weapon/stock_parts/micro_laser))
-			if(cutter)
-				user << "The drill already has a cutting head installed."
-			else
-				user.drop_item()
-				W.loc = src
-				cutter = W
-				user << "You install \the [W]."
-			return
-		else if(istype(W,/obj/item/weapon/stock_parts/capacitor))
-			if(cellmount)
-				user << "The drill already has a cell capacitor installed."
-			else
-				user.drop_item()
-				W.loc = src
-				cellmount = W
-				user << "You install \the [W]."
-			return
-		else if(istype(W,/obj/item/weapon/stock_parts/cell))
-			if(cell)
-				user << "The drill already has a cell installed."
-			else
-				user.drop_item()
-				W.loc = src
-				cell = W
-				user << "You install \the [W]."
-			return
-	..()
-/obj/machinery/mining/drill/attack_hand(mob/user as mob)
-	check_supports()
-
-	if(need_player_check)
-		user << "You hit the manual override and reset the drill's error checking."
-		need_player_check = 0
-		if(anchored) get_resource_field()
-		update_icon()
-		return
-
-	else if(supported)
-		if(use_cell_power())
-			active = !active
-			if(active)
-				user << "\blue You engage \the [src] and it lurches downwards, grinding noisily."
-				need_update_field = 1
-			else
-				user << "\blue You disengage \the [src] and it shudders to a grinding halt."
-		else
-			user << "\blue The drill is unpowered."
-	else
-		user << "\blue Turning on a piece of industrial machinery without sufficient bracing is a bad idea."
-
-	update_icon()
-
-/obj/machinery/mining/drill/update_icon()
-	if(need_player_check)
-		icon_state = "mining_drill_error"
-	else if(active)
-		icon_state = "mining_drill_active"
-	else if(supported)
-		icon_state = "mining_drill_braced"
-	else
-		icon_state = "mining_drill"
-	return
-
-/obj/machinery/mining/drill/proc/check_supports()
-
-	supported = 0
-
-	if((!supports || !supports.len) && initial(anchored) == 0)
-		icon_state = "mining_drill"
-		anchored = 0
-		active = 0
-	else
-		anchored = 1
-
-	if(supports && supports.len >= braces_needed)
-		supported = 1
-
-	update_icon()
-
-/obj/machinery/mining/drill/proc/system_error(var/error)
-
-	if(error) src.visible_message("\red \The [src] flashes a '[error]' warning.")
-	need_player_check = 1
-	active = 0
-	update_icon()
-
-/obj/machinery/mining/drill/proc/get_harvest_capacity()
-	return (cutter ? cutter.rating : 0)
-
-/obj/machinery/mining/drill/proc/get_storage_capacity()
-	return 200 * (storage ? storage.rating : 0)
-
-/obj/machinery/mining/drill/proc/get_charge_use()
-	return 50 - (10 * (cellmount ? cellmount.rating : 0))
-
-/obj/machinery/mining/drill/proc/get_resource_field()
-
-	resource_field = list()
-	need_update_field = 0
-
-	var/turf/T = get_turf(src)
-	if(!istype(T)) return
-
-	var/tx = T.x-2
-	var/ty = T.y-2
-	var/turf/mine_turf
-	for(var/iy=0,iy<5,iy++)
-		for(var/ix=0,ix<5,ix++)
-			mine_turf = locate(tx+ix,ty+iy,T.z)
-			if(mine_turf && istype(mine_turf) && mine_turf.has_resources)
-				resource_field += mine_turf
-
-	if(!resource_field.len)
-		system_error("resources depleted")
-
-/obj/machinery/mining/drill/proc/use_cell_power()
-	if(!cell) return 0
-	var/req = get_charge_use()
-	if(cell.charge >= req)
-		cell.use(req)
-		return 1
-	return 0
-
-/obj/machinery/mining/drill/verb/unload()
-	set name = "Unload Drill"
-	set category = "Object"
-	set src in oview(1)
-
-	if(usr.stat) return
-
-	var/obj/structure/ore_box/B = locate() in orange(1)
-	if(B)
-		for(var/obj/item/weapon/ore/O in contents)
-			O.loc = B
-		usr << "\red You unload the drill's storage cache into the ore box."
-	else
-		usr << "\red You must move an ore box up to the drill before you can unload it."
-
-
-/obj/machinery/mining/brace
-	name = "mining drill brace"
-	desc = "A machinery brace for an industrial drill. It looks easily two feet thick."
-	icon_state = "mining_brace"
-	var/obj/machinery/mining/drill/connected
-
-/obj/machinery/mining/brace/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/weapon/wrench))
-
-		if(istype(get_turf(src),/turf/space))
-			user << "\blue You can't anchor something to empty space. Idiot."
-			return
-
-		if(connected && connected.active)
-			user << "\blue You can't unanchor the brace of a running drill!"
-			return
-
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
-		user << "\blue You [anchored ? "un" : ""]anchor the brace."
-
-		anchored = !anchored
-		if(anchored)
-			connect()
-		else
-			disconnect()
-
-/obj/machinery/mining/brace/proc/connect()
-
-	var/turf/T = get_step(get_turf(src), src.dir)
-
-	if(!T.has_resources)
-		src.visible_message("\red The terrain near the brace is unsuitable!")
-		return
-
-	for(var/thing in T.contents)
-		if(istype(thing,/obj/machinery/mining/drill))
-			connected = thing
-			break
-
-	if(!connected) return
-
-	if(!connected.supports) connected.supports = list()
-
-	icon_state = "mining_brace_active"
-
-	connected.supports += src
-	connected.check_supports()
-
-/obj/machinery/mining/brace/proc/disconnect()
-
-	if(!connected) return
-
-	if(!connected.supports) connected.supports = list()
-
-	icon_state = "mining_brace"
-
-	connected.supports -= src
-	connected.check_supports()
-	connected = null
-
-/obj/machinery/mining/brace/verb/rotate()
-	set name = "Rotate"
-	set category = "Object"
-	set src in oview(1)
-
-	if(usr.stat) return
-
-	if (src.anchored)
-		usr << "It is anchored in place!"
-		return 0
-
-	src.dir = turn(src.dir, 90)
-	return 1

code/modules/mining/drilling/scanner.dm

@@ -1,54 +0,0 @@
-/obj/item/weapon/mining_scanner
-	name = "ore detector"
-	desc = "A complex device used to locate ore deep underground."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "forensic0-old" //GET A BETTER SPRITE.
-	item_state = "electronic"
-//	matter = list("metal" = 150)
-
-	origin_tech = "magnets=1;engineering=1"
-
-/obj/item/weapon/mining_scanner/attack_self(mob/user as mob)
-
-	user << "You begin sweeping \the [src] about, scanning for metal deposits."
-
-	if(!do_after(user,50, target = src)) return
-
-	if(!user || !src) return
-
-	var/list/metals = list(
-		"surface minerals" = 0,
-		"precious metals" = 0,
-		"nuclear fuel" = 0,
-		"exotic matter" = 0
-		)
-
-	for(var/turf/T in oview(3,get_turf(user)))
-
-		if(!T.has_resources)
-			continue
-
-		for(var/metal in T.resources)
-
-			var/ore_type
-
-			switch(metal)
-				if("silicates" || "carbonaceous rock" || "iron") ore_type = "surface minerals"
-				if("gold" || "silver" || "diamond")              ore_type = "precious metals"
-				if("uranium")                                    ore_type = "nuclear fuel"
-				if("plasma" || "osmium" || "hydrogen")           ore_type = "exotic matter"
-
-			if(ore_type) metals[ore_type] += T.resources[metal]
-
-	user << "\icon[src] \blue The scanner beeps and displays a readout."
-
-	for(var/ore_type in metals)
-
-		var/result = "no sign"
-
-		switch(metals[ore_type])
-			if(1 to 50) result = "trace amounts"
-			if(51 to 150) result = "significant amounts"
-			if(151 to INFINITY) result = "huge quantities"
-
-		user << "- [result] of [ore_type]."

code/modules/mining/laborcamp/laborshuttle.dm

@@ -40,7 +40,7 @@ proc/move_labor_shuttle() //TODO: Security Access only; add moving the shuttle t
 				*/
 
 			if(istype(T, /turf/simulated))
-				del(T)
+				qdel(T)
 
 		for(var/mob/living/carbon/bug in toArea) // If someone somehow is still in the shuttle's docking area...
 			bug.gib()

code/modules/mob/dead/observer/observer.dm

@@ -87,6 +87,10 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	..()
 
 /mob/dead/observer/Destroy()
+	if(ismob(following))
+		var/mob/M = following
+		M.following_mobs -= src
+	following = null
 	if (ghostimage)
 		ghost_darkness_images -= ghostimage
 		qdel(ghostimage)
@@ -115,7 +119,7 @@ Works together with spawning an observer, noted above.
 	if(antagHUD)
 		var/list/target_list = list()
 		for(var/mob/living/target in oview(src, 14))
-			if(target.mind && (target.mind.special_role || issilicon(target) || target.mind.nation))
+			if(target.mind && (target.mind.special_role || issilicon(target)))
 				target_list += target
 		if(target_list.len)
 			assess_targets(target_list, src)
@@ -142,7 +146,6 @@ Works together with spawning an observer, noted above.
 	var/client/C = U.client
 	for(var/mob/living/carbon/human/target in target_list)
 		C.images += target.hud_list[SPECIALROLE_HUD]
-		C.images += target.hud_list[NATIONS_HUD] // ??? THE SNOWFLAKE IS KILLING ME
 	for(var/mob/living/silicon/target in target_list)
 		C.images += target.hud_list[SPECIALROLE_HUD]
 
@@ -168,10 +171,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
-	if(ticker && ticker.mode.name == "nations")
-		usr << "\blue Ghosting is disabled."
-		return
-
 	var/mob/M = src
 
 	if(stat == DEAD)
@@ -382,19 +381,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob
 	var/list/following_mobs = list()
 
-/mob/Destroy()
-	for(var/mob/dead/observer/M in following_mobs)
-		M.following = null
-	following_mobs = null
-	return ..()
-
-/mob/dead/observer/Destroy()
-	if(ismob(following))
-		var/mob/M = following
-		M.following_mobs -= src
-	following = null
-	return ..()
-
 /mob/Move()
 	. = ..()
 	if(.)

code/modules/mob/language.dm

@@ -125,7 +125,7 @@
 	name = "Noise"
 	desc = "Noises"
 	key = ""
-	flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG
+	flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG|NO_STUTTER
 
 /datum/language/noise/format_message(message, verb)
 	return "<span class='message'><span class='[colour]'>[message]</span></span>"

code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm

@@ -86,6 +86,6 @@
 		else
 			new_xeno.key = key
 		new_xeno.mind.name = new_xeno.name
-		del(src)
+		qdel(src)
 	return
 */

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

@@ -171,7 +171,7 @@
 
 /mob/living/carbon/alien/humanoid/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -230,13 +230,6 @@
 		else
 			healths.icon_state = "health6"
 
-	if(pullin)
-		if(pulling)
-			pullin.icon_state = "pull"
-		else
-			pullin.icon_state = "pull0"
-
-
 	if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
 	if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
 	if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -117,7 +117,7 @@
 			else
 				new_xeno.key = key
 			new_xeno.mind.name = new_xeno.name
-			del(src)
+			qdel(src)
 		else
 			src << "<span class='notice'>We already have an alive empress.</span>"
 	return

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

@@ -107,7 +107,7 @@
 
 /mob/living/carbon/alien/larva/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)
@@ -255,4 +255,4 @@
 	else
 		var/mob/living/carbon/alien/humanoid/A = new(loc)
 		A.key = key
-		del(src) */
+		qdel(src) */

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

@@ -18,6 +18,12 @@
 /obj/item/organ/brain/attack_self(mob/user as mob)
 	return  //let's not have players taken out of the round as easily as a click, once you have their brain.
 
+/obj/item/organ/brain/surgeryize()
+	if(!owner)
+		return
+	owner.ear_damage = 0 //Yeah, didn't you...hear? The ears are totally inside the brain.
+	owner.ear_deaf = 0
+
 /obj/item/organ/brain/xeno
 	name = "thinkpan"
 	desc = "It looks kind of like an enormous wad of purple bubblegum."

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

@@ -37,7 +37,6 @@
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[STATUS_HUD_OOC]  = image('icons/mob/hud.dmi', src, "hudhealthy")
-	hud_list[NATIONS_HUD]	  = image('icons/mob/hud.dmi', src, "hudblank")
 
 	..()
 
@@ -404,7 +403,7 @@
 
 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)
@@ -1840,4 +1839,9 @@
 /mob/living/carbon/human/proc/get_full_print()
 	if(!dna || !dna.uni_identity)
 		return
-	return md5(dna.uni_identity)
+	return md5(dna.uni_identity)
+
+/mob/living/carbon/human/can_see_reagents()
+	for(var/obj/item/clothing/C in src) //If they have some clothing equipped that lets them see reagents, they can see reagents
+		if(C.scan_reagents)
+			return 1

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

@@ -192,16 +192,6 @@
 					log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])")
 					return
 
-	/*			if(randn <= 45 && !lying)
-					if(head)
-						var/obj/item/clothing/head/H = head
-						if(!istype(H) || prob(H.loose))
-							if(unEquip(H))
-								if(prob(60))
-									step_away(H,M)
-								visible_message("<span class='warning'>[M] has knocked [src]'s [H] off!</span>",
-												"<span class='warning'>[M] knocked \the [H] clean off your head!</span>") */
-
 				var/talked = 0	// BubbleWrap
 
 				if(randn <= 60)

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

@@ -54,38 +54,6 @@ emp_act
 
 	return (..(P , def_zone))
 
-/mob/living/carbon/human/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon = null)
-	var/obj/item/organ/external/affected = get_organ(check_zone(def_zone))
-	var/siemens_coeff = get_siemens_coefficient_organ(affected)
-	stun_amount *= siemens_coeff
-	agony_amount *= siemens_coeff
-
-	switch (def_zone)
-		if("head")
-			agony_amount *= 1.50
-		if("l_hand", "r_hand")
-			var/c_hand
-			if (def_zone == "l_hand")
-				c_hand = l_hand
-			else
-				c_hand = r_hand
-
-			if(c_hand && (stun_amount || agony_amount > 10))
-				msg_admin_attack("[src.name] ([src.ckey]) was disarmed by a stun effect")
-
-				unEquip(c_hand)
-				if (affected.status & ORGAN_ROBOT)
-					emote("me", 1, "drops what they were holding, their [affected.name] malfunctioning!")
-				else
-					var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and")
-					emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [affected.name]!")
-
-	if(used_weapon)
-		var/obj/item/W = used_weapon
-		affected.add_autopsy_data(W.name, agony_amount) // Add the weapon's name to the autopsy data
-
-	..(stun_amount, agony_amount, def_zone, used_weapon)
-
 /mob/living/carbon/human/getarmor(var/def_zone, var/type)
 	var/armorval = 0
 	var/organnum = 0

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

@@ -81,3 +81,12 @@
 
 /mob/living/carbon/human/mob_negates_gravity()
 	return shoes && shoes.negates_gravity()
+
+/mob/living/carbon/human/Move(NewLoc, direct)
+	. = ..()
+	if(shoes)
+		if(!lying && !buckled)
+			if(!has_gravity(loc))
+				return
+			var/obj/item/clothing/shoes/S = shoes
+			S.step_action(src)

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

@@ -117,7 +117,7 @@
 				unEquip(r_hand)
 
 			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
-			emote("me", 1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
+			custom_emote(1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
 
 		else if(E.is_malfunctioning())
 
@@ -130,7 +130,7 @@
 					continue
 				unEquip(r_hand)
 
-			emote("me", 1, "drops what they were holding, their [E.name] malfunctioning!")
+			custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")
 
 			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 			spark_system.set_up(5, 0, src)

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

@@ -1279,9 +1279,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(see_override)	//Override all
 			see_invisible = see_override
 
-		if(ticker && ticker.mode.name == "nations")
-			process_nations()
-
 		if(healths)
 			if (analgesic)
 				healths.icon_state = "health_health_numb"
@@ -1334,12 +1331,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(pressure)
 			pressure.icon_state = "pressure[pressure_alert]"
 
-		if(pullin)
-			if(pulling)								pullin.icon_state = "pull1"
-			else									pullin.icon_state = "pull0"
-//			if(rest)	//Not used with new UI
-//				if(resting || lying || sleeping)		rest.icon_state = "rest1"
-//				else									rest.icon_state = "rest0"
 		if(toxin)
 			if(hal_screwyhud == 4 || toxins_alert)	toxin.icon_state = "tox1"
 			else									toxin.icon_state = "tox0"
@@ -1558,7 +1549,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		src << "<font color='red'><b>"+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!")
 
 	if(shock_stage >= 30)
-		if(shock_stage == 30) emote("me",1,"is having trouble keeping their eyes open.")
+		if(shock_stage == 30) custom_emote(1,"is having trouble keeping their eyes open.")
 		eye_blurry = max(2, eye_blurry)
 		stuttering = max(stuttering, 5)
 
@@ -1566,7 +1557,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
 
 	if(shock_stage >=60)
-		if(shock_stage == 60) emote("me",1,"'s body becomes limp.")
+		if(shock_stage == 60) custom_emote(1,"falls limp.")
 		if (prob(2))
 			src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
 			Weaken(20)
@@ -1582,7 +1573,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			Paralyse(5)
 
 	if(shock_stage == 150)
-		emote("me",1,"can no longer stand, collapsing!")
+		custom_emote(1,"can no longer stand, collapsing!")
 		Weaken(20)
 
 	if(shock_stage >= 150)
@@ -1871,34 +1862,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					holder.icon_state = "hudshadowlingthrall"
 
 			hud_list[SPECIALROLE_HUD] = holder
-
-	if(hud_updateflag & 1 << NATIONS_HUD)
-		var/image/holder = hud_list[NATIONS_HUD]
-		holder.icon_state = "hudblank"
-
-		if(mind && mind.nation)
-			switch(mind.nation.name)
-				if("Atmosia")
-					holder.icon_state = "hudatmosia"
-				if("Brigston")
-					holder.icon_state = "hudbrigston"
-				if("Cargonia")
-					holder.icon_state = "hudcargonia"
-				if("People's Republic of Commandzakstan")
-					holder.icon_state = "hudcommand"
-				if("Medistan")
-					holder.icon_state = "hudmedistan"
-				if("Scientopia")
-					holder.icon_state = "hudscientopia"
-
-			hud_list[NATIONS_HUD] = holder
 	hud_updateflag = 0
 
-/mob/living/carbon/human/proc/process_nations()
-	var/client/C = client
-	for(var/mob/living/carbon/human/H in view(src, 14))
-		C.images += H.hud_list[NATIONS_HUD]
-
 /mob/living/carbon/human/handle_silent()
 	if(..())
 		speech_problem_flag = 1
@@ -1933,4 +1898,4 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 // Need this in species.
 //#undef HUMAN_MAX_OXYLOSS
-//#undef HUMAN_CRIT_MAX_OXYLOSS
+//#undef HUMAN_CRIT_MAX_OXYLOSS

code/modules/mob/living/carbon/human/species/station.dm

@@ -462,7 +462,7 @@
 		if(D.client)
 			D.loc = H.loc
 		else
-			del(D)
+			qdel(D)
 
 	H.visible_message("<span class='danger">[H] splits apart with a wet slithering noise!"</span>) */
 

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

@@ -252,7 +252,7 @@
 
 /mob/living/carbon/slime/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/living/living.dm

@@ -26,6 +26,16 @@
 					current << "\red <FONT size = 3><B>The fog clouding your mind clears. You remember nothing from the moment you were implanted until now..(You don't remember who enslaved you)</B></FONT>"
 				*/
 
+//mob verbs are a lot faster than object verbs
+//for more info on why this is not atom/pull, see examinate() in mob.dm
+/mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1))
+	set name = "Pull"
+	set category = "Object"
+
+	if(AM.Adjacent(src))
+		src.start_pulling(AM)
+	return
+
 //same as above
 /mob/living/pointed(atom/A as mob|obj|turf in view())
 	if(src.stat || !src.canmove || src.restrained())

code/modules/mob/living/living_defense.dm

@@ -65,21 +65,6 @@
 		apply_damage(P.damage, P.damage_type, def_zone, armor)
 	return P.on_hit(src, armor, def_zone)
 
-//Handles the effects of "stun" weapons
-/mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
-	flash_pain()
-
-	if (stun_amount)
-		Stun(stun_amount)
-		Weaken(stun_amount)
-		apply_effect(STUTTER, stun_amount)
-		apply_effect(EYE_BLUR, stun_amount)
-
-	if (agony_amount)
-		apply_damage(agony_amount, HALLOSS, def_zone, 0, used_weapon)
-		apply_effect(STUTTER, agony_amount/10)
-		apply_effect(EYE_BLUR, agony_amount/10)
-
 /mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null)
 	  return 0 //only carbon liveforms have this proc
 

code/modules/mob/living/say.dm

@@ -158,9 +158,10 @@ proc/get_radio_key_from_channel(var/channel)
 
 	message = handle_autohiss(message, speaking)
 
-	var/list/handle_s = handle_speech_problems(message, verb)
-	message = handle_s[1]
-	verb = handle_s[2]
+	if(speaking && !(speaking.flags & NO_STUTTER))
+		var/list/handle_s = handle_speech_problems(message, verb)
+		message = handle_s[1]
+		verb = handle_s[2]
 
 	if(!message || message == "")
 		return 0
@@ -242,13 +243,15 @@ proc/get_radio_key_from_channel(var/channel)
 			if(M.loc && M.locs[1] in hearturfs)
 				listening |= M
 
+	var/list/speech_bubble_recipients = list()
 	var/speech_bubble_test = say_test(message)
-	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
-	spawn(30) qdel(speech_bubble)
 
 	for(var/mob/M in listening)
-		M << speech_bubble
 		M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol)
+		if(M.client)
+			speech_bubble_recipients.Add(M.client)
+	spawn(0)
+		flick_overlay(image('icons/mob/talk.dmi', src, "h[speech_bubble_test]",MOB_LAYER+1), speech_bubble_recipients, 30)
 
 	for(var/obj/O in listening_obj)
 		spawn(0)
@@ -398,19 +401,23 @@ proc/get_radio_key_from_channel(var/channel)
 	watching  -= eavesdropping
 
 	//now mobs
+	var/list/speech_bubble_recipients = list()
 	var/speech_bubble_test = say_test(message)
-	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
-	spawn(30) qdel(speech_bubble)
 
 	for(var/mob/M in listening)
-		M << speech_bubble
 		M.hear_say(message, verb, speaking, alt_name, italics, src)
+		if(M.client)
+			speech_bubble_recipients.Add(M.client)
 
 	if(eavesdropping.len)
 		var/new_message = stars(message)	//hopefully passing the message twice through stars() won't hurt... I guess if you already don't understand the language, when they speak it too quietly to hear normally you would be able to catch even less.
 		for(var/mob/M in eavesdropping)
-			M << speech_bubble
 			M.hear_say(new_message, verb, speaking, alt_name, italics, src)
+			if(M.client)
+				speech_bubble_recipients.Add(M.client)
+
+	spawn(0)
+		flick_overlay(image('icons/mob/talk.dmi', src, "h[speech_bubble_test]",MOB_LAYER+1), speech_bubble_recipients, 30)
 
 	if(watching.len)
 		var/rendered = "<span class='game say'><span class='name'>[src.name]</span> [not_heard].</span>"

code/modules/mob/living/silicon/ai/ai.dm

@@ -183,7 +183,6 @@ var/list/ai_verbs_default = list(
 	hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	hud_list[NATIONS_HUD]	  = image('icons/mob/hud.dmi', src, "hudblank")
 
 	ai_list += src
 	..()
@@ -229,6 +228,7 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/Destroy()
 	ai_list -= src
+	qdel(eyeobj) // No AI, no Eye
 	return ..()
 
 
@@ -595,7 +595,7 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/living/silicon/ai/freelook/cameranet.dm

@@ -5,7 +5,7 @@
 var/datum/cameranet/cameranet = new()
 
 /datum/cameranet
-	// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
+	// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Destroy().
 	var/list/cameras = list()
 	var/cameras_unsorted = 1
 	// The chunks of the map, mapping the areas that the cameras can see.

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -29,6 +29,7 @@
 		qdel(ghostimage)
 		ghostimage = null;
 		updateallghostimages()
+	ai = null
 	return ..()
 
 // Movement code. Returns 0 to stop air movement from moving it.
@@ -41,10 +42,6 @@
 	set src = usr.contents
 	return 0
 
-/mob/aiEye/pull()
-	set popup_menu = 0
-	set src = usr.contents
-	return 0
 
 // Use this when setting the aiEye's location.
 // It will also stream the chunk that the new loc is in.
@@ -95,11 +92,6 @@
 	spawn(5)
 		eyeobj.loc = src.loc
 
-/mob/living/silicon/ai/Destroy()
-	eyeobj.ai = null
-	qdel(eyeobj) // No AI, no Eye
-	return ..()
-
 /atom/proc/move_camera_by_click()
 	if(istype(usr, /mob/living/silicon/ai))
 		var/mob/living/silicon/ai/AI = usr

code/modules/mob/living/silicon/ai/freelook/read_me.dm

@@ -20,7 +20,7 @@
  HOW IT WORKS
 
  It works by first creating a camera network datum. Inside of this camera network are "chunks" (which will be
- explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Del().
+ explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Destroy().
 
  Next the camera network has chunks. These chunks are a 16x16 tile block of turfs and cameras contained inside the chunk.
  These turfs are then sorted out based on what the cameras can and cannot see. If none of the cameras can see the turf, inside

code/modules/mob/living/silicon/pai/pai.dm

@@ -206,7 +206,7 @@
 
 /mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -68,6 +68,7 @@
 
 	//Some tidying-up.
 	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
+	scanner.Grant(src)
 	update_icons()
 
 /mob/living/silicon/robot/drone/init()

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -12,7 +12,8 @@
 		/obj/item/weapon/firealarm_electronics,
 		/obj/item/weapon/airalarm_electronics,
 		/obj/item/weapon/airlock_electronics,
-		/obj/item/weapon/module/power_control,
+		/obj/item/weapon/intercom_electronics,
+		/obj/item/weapon/apc_electronics,
 		/obj/item/weapon/stock_parts,
 		/obj/item/mounted/frame/light_fixture,
 		/obj/item/mounted/frame/apc_frame,
@@ -366,4 +367,4 @@
 					stack = stack_plastic
 
 			stack.amount++
-			decompiler.stored_comms[type]--;
+			decompiler.stored_comms[type]--;

code/modules/mob/living/silicon/robot/life.dm

@@ -65,7 +65,7 @@
 			for(var/V in components)
 				var/datum/robot_component/C = components[V]
 				C.consume_power()
-				
+
 			var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
 			cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
 
@@ -287,7 +287,6 @@
 				src.bodytemp.icon_state = "temp-2"
 
 
-	if(src.pullin)	src.pullin.icon_state = "pull[src.pulling ? 1 : 0]"
 //Oxygen and fire does nothing yet!!
 //	if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]"
 //	if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]"

code/modules/mob/living/silicon/robot/robot.dm

@@ -149,7 +149,7 @@ var/list/robot_verbs_default = list(
 	hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
+	scanner.Grant(src)
 
 /mob/living/silicon/robot/proc/init(var/alien=0)
 	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
@@ -206,6 +206,10 @@ var/list/robot_verbs_default = list(
 		connected_ai.connected_robots -= src
 	qdel(wires)
 	wires = null
+	qdel(module)
+	module = null
+	camera = null
+	cell = null
 	return ..()
 
 /mob/living/silicon/robot/proc/pick_module()
@@ -905,7 +909,7 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -10,7 +10,7 @@
 	var/obj/item/emag = null
 	var/obj/item/borg/upgrade/jetpack = null
 	var/list/subsystems = list()
-	
+
 	var/list/stacktypes
 	var/channels = list()
 
@@ -30,7 +30,16 @@
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.emag = new /obj/item/toy/sword(src)
 	src.emag.name = "Placeholder Emag Item"
-	
+
+/obj/item/weapon/robot_module/Destroy()
+	for(var/module in modules)
+		qdel(module)
+	modules.Cut()
+	qdel(emag)
+	emag = null
+	qdel(jetpack)
+	jetpack = null
+	return ..()
 
 /obj/item/weapon/robot_module/proc/fix_modules()
 	for(var/obj/item/I in modules)
@@ -83,7 +92,7 @@
 	R.add_language("Chittin", 0)
 	R.add_language("Bubblish", 0)
 	R.add_language("Clownish",0)
-	
+
 /obj/item/weapon/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R)
 	R.verbs |= subsystems
 
@@ -102,7 +111,7 @@
 	src.modules += new /obj/item/weapon/crowbar(src)
 	src.modules += new /obj/item/device/healthanalyzer(src)
 	src.emag = new /obj/item/weapon/melee/energy/sword/cyborg(src)
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/medical
@@ -114,7 +123,7 @@
 		/obj/item/stack/medical/splint = 5,
 		/obj/item/stack/nanopaste = 5
 		)
-	
+
 /obj/item/weapon/robot_module/medical/New()
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.modules += new /obj/item/device/healthanalyzer/advanced(src)
@@ -144,7 +153,7 @@
 
 	src.emag.reagents.add_reagent("facid", 250)
 	src.emag.name = "Polyacid spray"
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R)
@@ -223,7 +232,7 @@
 	src.modules += new /obj/item/taperoll/police(src)
 	src.modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
 	src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/janitor
@@ -240,7 +249,7 @@
 
 	src.emag.reagents.add_reagent("lube", 250)
 	src.emag.name = "Lube spray"
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/butler
@@ -270,7 +279,7 @@
 	R.my_atom = src.emag
 	R.add_reagent("beer2", 50)
 	src.emag.name = "Mickey Finn's Special Brew"
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R)
@@ -327,7 +336,7 @@
 	src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
 	src.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src)
 	src.emag = new /obj/item/borg/stun(src)
-		
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/deathsquad
@@ -341,7 +350,7 @@
 	src.modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
 	src.emag = null
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/syndicate
@@ -357,9 +366,9 @@
 	src.modules += new /obj/item/weapon/crowbar(src)
 	src.modules += new /obj/item/weapon/pinpointer/operative(src)
 	src.emag = null
-	
+
 	fix_modules()
-	
+
 /obj/item/weapon/robot_module/syndicate_medical
 	name = "syndicate medical robot module"
 	stacktypes = list(
@@ -368,7 +377,7 @@
 		/obj/item/stack/medical/splint = 25,
 		/obj/item/stack/nanopaste = 25
 	)
-	
+
 /obj/item/weapon/robot_module/syndicate_medical/New()
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.modules += new /obj/item/device/healthanalyzer/advanced(src)
@@ -395,7 +404,7 @@
 	src.modules += new /obj/item/weapon/crowbar(src)
 	src.modules += new /obj/item/weapon/pinpointer/operative(src)
 	src.emag = null
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/combat
@@ -410,7 +419,7 @@
 	src.modules += new /obj/item/borg/combat/mobility(src)
 	src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
-	
+
 	fix_modules()
 
 /obj/item/weapon/robot_module/alien/hunter

code/modules/mob/living/silicon/silicon.dm

@@ -64,8 +64,6 @@
 	src << "\red Warning: Electromagnetic pulse detected."
 	..()
 
-/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount)
-	return	//immune
 
 /mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
 	return

code/modules/mob/living/simple_animal/bees.dm

@@ -30,7 +30,6 @@
 /mob/living/simple_animal/bee/New(loc, var/obj/machinery/apiary/new_parent)
 	..()
 	parent = new_parent
-	verbs -= /atom/movable/verb/pull
 
 /mob/living/simple_animal/bee/Destroy()
 	if(parent)

code/modules/mob/living/simple_animal/constructs.dm

@@ -64,10 +64,10 @@
 /mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob)
 	if(istype(M, /mob/living/simple_animal/construct/builder))
 		health += 5
-		M.emote("mends some of \the <EM>[src]'s</EM> wounds.")
+		M.custom_emote(1,"mends some of \the <EM>[src]'s</EM> wounds.")
 	else
 		if(M.melee_damage_upper <= 0)
-			M.emote("[M.friendly] \the <EM>[src]</EM>")
+			M.custom_emote(1, "[M.friendly] \the <EM>[src]</EM>")
 		else
 			M.do_attack_animation(src)
 			if(M.attack_sound)

code/modules/mob/living/simple_animal/corpse.dm

@@ -78,7 +78,7 @@
 			W.assignment = corpseidjob
 		W.registered_name = M.real_name
 		M.equip_to_slot_or_del(W, slot_wear_id)
-	del(src)
+	qdel(src)
 
 
 

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -39,7 +39,7 @@
 		if(!stat && !resting && !buckled)
 			for(var/mob/living/simple_animal/mouse/M in view(1,src))
 				if(!M.stat && Adjacent(M))
-					emote("me", 1, "splats \the [M]!")
+					custom_emote(1, "splats \the [M]!")
 					M.splat()
 					movement_target = null
 					stop_automated_movement = 0

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -38,9 +38,6 @@
 		if(fire)
 			if(fire_alert)							fire.icon_state = "fire[fire_alert]" //fire_alert is either 0 if no alert, 1 for heat and 2 for cold.
 			else									fire.icon_state = "fire0"
-		if(pullin)
-			if(pulling)								pullin.icon_state = "pull1"
-			else									pullin.icon_state = "pull0"
 		if(oxygen)
 			if(oxygen_alert)						oxygen.icon_state = "oxy1"
 			else									oxygen.icon_state = "oxy0"
@@ -97,7 +94,7 @@
 				user << "<span class='warning'>[src] is wearing too much armor! You can't reach \his skin.<span>"
 				visible_message("[user] gently taps [src] with [O].")
 			if(health>0 && prob(15))
-				emote("me", 1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
+				custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
 			return
 
 	if (istype(O, /obj/item/weapon/razor))
@@ -189,6 +186,7 @@
 					var/list/allowed_types = list(
 						/obj/item/clothing/suit/armor/vest,
 						/obj/item/clothing/suit/space/deathsquad,
+						/obj/item/clothing/suit/space/rig/engineering,
 						/obj/item/device/radio,
 						/obj/item/device/radio/off,
 						/obj/item/clothing/suit/cardborg,
@@ -369,6 +367,11 @@
 				desc = "That's not red paint. That's real corgi blood."
 				valid = 1
 
+			if(/obj/item/clothing/head/helmet/space/rig/engineering)
+				name = "Space Explorer [real_name]"
+				desc = "That's one small step for a corgi. One giant yap for corgikind."
+				valid = 1
+
 			if(/obj/item/clothing/mask/fakemoustache)
 				name = "Definitely Not [real_name]"
 				desc = "That's Definitely Not [real_name]"
@@ -461,10 +464,10 @@
 							movement_target.attack_animal(src)
 						else if(ishuman(movement_target.loc) )
 							if(prob(20))
-								emote("me", 1, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
+								custom_emote(1, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
 
 		if(prob(1))
-			emote("me", 1, pick("dances around.","chases its tail!"))
+			custom_emote(1, pick("dances around.","chases its tail!"))
 			spawn(0)
 				if (ckey == null)
 					for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
@@ -591,7 +594,7 @@
 	if(!stat && !resting && !buckled)
 		if(prob(1))
 			if (ckey == null)
-				emote("me", 1, pick("dances around.","chases her tail."))
+				custom_emote(1, pick("dances around.","chases her tail."))
 				spawn(0)
 					for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 						dir = i
@@ -609,10 +612,10 @@
 		if(change > 0)
 			if(M && stat != DEAD) // Added check to see if this mob (the corgi) is dead to fix issue 2454
 				flick_overlay(image('icons/mob/animal.dmi',src,"heart-ani2",MOB_LAYER+1), list(M.client), 20)
-				emote("me", 1, "yaps happily!")
+				custom_emote(1, "yaps happily!")
 		else
 			if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
-				emote("me", 1, "growls!")
+				custom_emote(1, "growls!")
 
 /mob/living/simple_animal/pet/corgi/Ian/borgi
 	name = "E-N"

code/modules/mob/living/simple_animal/friendly/crab.dm

@@ -63,7 +63,7 @@
 					health = min(maxHealth, health + MED.heal_brute)
 					MED.amount -= 1
 					if(MED.amount <= 0)
-						del(MED)
+						qdel(MED)
 					for(var/mob/M in viewers(src, null))
 						if ((M.client && !( M.blinded )))
 							M.show_message("\blue [user] applies the [MED] on [src]")

code/modules/mob/living/simple_animal/friendly/pug.dm

@@ -24,7 +24,7 @@
 
 	if(!stat && !resting && !buckled)
 		if(prob(1))
-			emote("me", 1, pick("chases its tail."))
+			custom_emote(1, pick("chases its tail."))
 			spawn(0)
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					dir = i

code/modules/mob/living/simple_animal/hostile/bat.dm

@@ -50,13 +50,13 @@
 /mob/living/simple_animal/hostile/scarybat/FindTarget()
 	. = ..()
 	if(.)
-		emote("flutters towards [.]")
+		custom_emote(1, "flutters towards [.]")
 
 /mob/living/simple_animal/hostile/scarybat/Found(var/atom/A)//This is here as a potential override to pick a specific target if available
 	if(istype(A) && A == owner)
 		return 0
 	return ..()
-	
+
 /mob/living/simple_animal/hostile/scarybat/CanAttack(var/atom/the_target)//This is here as a potential override to pick a specific target if available
 	if(istype(the_target) && the_target == owner)
 		return 0

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -86,7 +86,7 @@
 					if(stance_step in list(1,4,7)) //every 3 ticks
 						var/action = pick( list( "growls at [target]", "stares angrily at [target]", "prepares to attack [target]", "closely watches [target]" ) )
 						if(action)
-							emote(action)
+							custom_emote(1, action)
 			if(!found_mob)
 				stance_step--
 
@@ -97,7 +97,7 @@
 
 		if(HOSTILE_STANCE_ATTACKING)
 			if(stance_step >= 20)	//attacks for 20 ticks, then it gets tired and needs to rest
-				emote( "is worn out and needs to rest" )
+				custom_emote(1, "is worn out and needs to rest" )
 				stance = HOSTILE_STANCE_TIRED
 				stance_step = 0
 				walk(src, 0) //This stops the bear's walking
@@ -125,14 +125,14 @@
 /mob/living/simple_animal/hostile/bear/FindTarget()
 	. = ..()
 	if(.)
-		emote("stares alertly at [.]")
+		custom_emote(1, "stares alertly at [.]")
 		stance = HOSTILE_STANCE_ALERT
 
 /mob/living/simple_animal/hostile/bear/LoseTarget()
 	..(5)
 
 /mob/living/simple_animal/hostile/bear/AttackingTarget()
-	emote( pick( list("slashes at [target]", "bites [target]") ) )
+	custom_emote(1, pick( list("slashes at [target]", "bites [target]") ) )
 
 	var/damage = rand(20,30)
 

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -48,7 +48,7 @@
 /mob/living/simple_animal/hostile/carp/FindTarget()
 	. = ..()
 	if(.)
-		emote("me", 1, "gnashes at [.]!")
+		custom_emote(1, "gnashes at [.]!")
 
 /mob/living/simple_animal/hostile/carp/AttackingTarget()
 	..()

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -39,7 +39,7 @@
 /mob/living/simple_animal/hostile/faithless/FindTarget()
 	. = ..()
 	if(.)
-		emote("me", 1, "wails at [.]!")
+		custom_emote(1, "wails at [.]!")
 
 /mob/living/simple_animal/hostile/faithless/AttackingTarget()
 	..()

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -41,7 +41,7 @@
 /mob/living/simple_animal/hostile/mimic/FindTarget()
 	. = ..()
 	if(.)
-		emote("growls at [.]")
+		custom_emote(1, "growls at [.]")
 
 /mob/living/simple_animal/hostile/mimic/Die()
 	..()

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -161,7 +161,7 @@
 	..()
 	qdel(src)
 
-/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy() //Seriously, what the actual hell.
 	//some random debris left behind
 	if(has_loot)
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -170,16 +170,16 @@
 		var/obj/O
 
 		//shards
-		O = PoolOrNew(/obj/item/weapon/shard, loc)
+		O = new /obj/item/weapon/shard(loc)
 		step_to(O, get_turf(pick(view(7, src))))
 		if(prob(75))
-			O = PoolOrNew(/obj/item/weapon/shard, loc)
+			O = new /obj/item/weapon/shard(loc)
 			step_to(O, get_turf(pick(view(7, src))))
 		if(prob(50))
-			O = PoolOrNew(/obj/item/weapon/shard, loc)
+			O = new /obj/item/weapon/shard(loc)
 			step_to(O, get_turf(pick(view(7, src))))
 		if(prob(25))
-			O = PoolOrNew(/obj/item/weapon/shard, loc)
+			O = new /obj/item/weapon/shard(loc)
 			step_to(O, get_turf(pick(view(7, src))))
 
 		//rods

code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm

@@ -59,7 +59,7 @@
 /mob/living/simple_animal/hostile/retaliate/ghost/FindTarget()
 	. = ..()
 	if(.)
-		emote("wails at [.]")
+		custom_emote(1, "wails at [.]")
 
 /mob/living/simple_animal/hostile/retaliate/ghost/Life()
 	if(target)

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -40,7 +40,7 @@
 /mob/living/simple_animal/hostile/tree/FindTarget()
 	. = ..()
 	if(.)
-		emote("growls at [.]")
+		custom_emote(1, "growls at [.]")
 
 /mob/living/simple_animal/hostile/tree/AttackingTarget()
 	. =..()

code/modules/mob/living/simple_animal/parrot.dm

@@ -343,7 +343,7 @@
 			//Search for item to steal
 			parrot_interest = search_for_item()
 			if(parrot_interest)
-				emote("looks in [parrot_interest]'s direction and takes flight")
+				custom_emote(1,"looks in [parrot_interest]'s direction and takes flight")
 				parrot_state = PARROT_SWOOP | PARROT_STEAL
 				icon_state = "parrot_fly"
 			return
@@ -365,7 +365,7 @@
 			if(AM)
 				if(istype(AM, /obj/item) || isliving(AM))	//If stealable item
 					parrot_interest = AM
-					emote("turns and flies towards [parrot_interest]")
+					custom_emote(1,"turns and flies towards [parrot_interest]")
 					parrot_state = PARROT_SWOOP | PARROT_STEAL
 					return
 				else	//Else it's a perch
@@ -479,11 +479,11 @@
 				var/obj/item/organ/external/affecting = H.get_organ(ran_zone(pick(parrot_dam_zone)))
 
 				H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp=1)
-				emote(pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons."))
+				custom_emote(1, pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons."))
 
 			else
 				L.adjustBruteLoss(damage)
-				emote(pick("pecks at [L].", "claws [L]."))
+				custom_emote(1, pick("pecks at [L].", "claws [L]."))
 			return
 
 		//Otherwise, fly towards the mob!

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -152,23 +152,23 @@
 					else
 						randomValue -= speak.len
 						if(emote_see && randomValue <= emote_see.len)
-							emote(pick(emote_see),1)
+							custom_emote(1, pick(emote_see))
 						else
-							emote(pick(emote_hear),2)
+							custom_emote(2, pick(emote_hear))
 				else
 					say(pick(speak))
 			else
 				if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
-					emote(pick(emote_see),1)
+					custom_emote(1, pick(emote_see))
 				if((emote_hear && emote_hear.len) && !(emote_see && emote_see.len))
-					emote(pick(emote_hear),2)
+					custom_emote(2, pick(emote_hear))
 				if((emote_hear && emote_hear.len) && (emote_see && emote_see.len))
 					var/length = emote_hear.len + emote_see.len
 					var/pick = rand(1,length)
 					if(pick <= emote_see.len)
-						emote(pick(emote_see),1)
+						custom_emote(1, pick(emote_see))
 					else
-						emote(pick(emote_hear),2)
+						custom_emote(2,pick(emote_hear))
 
 
 	//Atmos
@@ -272,7 +272,7 @@
 
 /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob)
 	if(M.melee_damage_upper == 0)
-		M.emote("me", 1, "[M.friendly] [src]")
+		M.custom_emote(1, "[M.friendly] [src]")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)

code/modules/mob/login.dm

@@ -30,7 +30,9 @@
 
 	client.images = null				//remove the images such as AIs being unable to see runes
 	client.screen = list()				//remove hud items just in case
-	if(hud_used)	del(hud_used)		//remove the hud objects
+	if(hud_used)
+		qdel(hud_used)		//remove the hud objects
+		hud_used = null
 	hud_used = new /datum/hud(src)
 
 	next_move = 1
@@ -46,7 +48,7 @@
 
 
 	if(ckey in deadmins)
-		verbs += /client/proc/readmin	
+		verbs += /client/proc/readmin
 
 	//Clear ability list and update from mob.
 	client.verbs -= ability_verbs
@@ -58,12 +60,12 @@
 		var/mob/living/carbon/human/H = src
 		if(H.species && H.species.abilities)
 			client.verbs |= H.species.abilities
-	
+
 		client.screen += client.void
-		
+
 
 	CallHook("Login", list("client" = src.client, "mob" = src))
-	
+
 // Calling update_interface() in /mob/Login() causes the Cyborg to immediately be ghosted; because of winget().
 // Calling it in the overriden Login, such as /mob/living/Login() doesn't cause this.
 /mob/proc/update_interface()

code/modules/mob/mob.dm

@@ -3,9 +3,13 @@
 	dead_mob_list -= src
 	living_mob_list -= src
 	qdel(hud_used)
+	hud_used = null
 	if(mind && mind.current == src)
 		spellremove(src)
 	ghostize()
+	for(var/mob/dead/observer/M in following_mobs)
+		M.following = null
+	following_mobs = null
 	return ..()
 
 /mob/New()
@@ -841,6 +845,30 @@ var/list/slot_equipment_priority = list( \
 	if(istype(M,/mob/living/silicon/ai)) return
 	show_inv(usr)
 
+//this and stop_pulling really ought to be /mob/living procs
+/mob/proc/start_pulling(atom/movable/AM)
+	if ( !AM || !src || src==AM || !isturf(AM.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
+		return
+	if (!( AM.anchored ))
+		AM.add_fingerprint(src)
+
+		// If we're pulling something then drop what we're currently pulling and pull this instead.
+		if(pulling)
+			// Are we trying to pull something we are already pulling? Then just stop here, no need to continue.
+			if(AM == pulling)
+				return
+			stop_pulling()
+
+		src.pulling = AM
+		AM.pulledby = src
+		if(pullin)
+			pullin.update_icon(src)
+		if(ismob(AM))
+			var/mob/M = AM
+			if(!iscarbon(src))
+				M.LAssailant = null
+			else
+				M.LAssailant = usr
 
 /mob/verb/stop_pulling()
 
@@ -850,37 +878,8 @@ var/list/slot_equipment_priority = list( \
 	if(pulling)
 		pulling.pulledby = null
 		pulling = null
-
-/mob/proc/start_pulling(var/atom/movable/AM)
-
-	if ( !AM || !usr || src==AM || !isturf(src.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
-		return
-
-	if (AM.anchored)
-		usr << "<span class='notice'>It won't budge!</span>"
-		return
-
-	var/mob/M = AM
-	if(ismob(AM))
-		if(!iscarbon(src))
-			M.LAssailant = null
-		else
-			M.LAssailant = usr
-
-	if(pulling)
-		var/pulling_old = pulling
-		stop_pulling()
-		// Are we pulling the same thing twice? Just stop pulling.
-		if(pulling_old == AM)
-			return
-
-	src.pulling = AM
-	AM.pulledby = src
-
-	//Attempted fix for people flying away through space when cuffed and dragged.
-	if(ismob(AM))
-		var/mob/pulled = AM
-		pulled.inertia_dir = 0
+		if(pullin)
+			pullin.update_icon(src)
 
 /mob/proc/can_use_hands()
 	return
@@ -1443,4 +1442,9 @@ mob/proc/yank_out_object()
 		M.pixel_y = initial(M.pixel_y)
 
 /mob/proc/can_unbuckle(mob/user)
-	return 1
+	return 1
+
+
+//Can the mob see reagents inside of containers?
+/mob/proc/can_see_reagents()
+	return 0

code/modules/mob/mob_defines.dm

@@ -131,6 +131,9 @@
 
 	var/datum/hud/hud_used = null
 
+	var/research_scanner = 0 //For research scanner equipped mobs. Enable to show research data when examining.
+	var/datum/action/scan_mode/scanner = new
+
 	var/list/grabbed_by = list(  )
 	var/list/requests = list(  )
 

code/modules/mob/mob_movement.dm

@@ -450,5 +450,27 @@
 /mob/proc/mob_negates_gravity()
 	return 0
 
+/mob/proc/Move_Pulled(atom/A)
+	if (!canmove || restrained() || !pulling)
+		return
+	if (pulling.anchored)
+		return
+	if (!pulling.Adjacent(src))
+		return
+	if (A == loc && pulling.density)
+		return
+	if (!Process_Spacemove(get_dir(pulling.loc, A)))
+		return
+	if (ismob(pulling))
+		var/mob/M = pulling
+		var/atom/movable/t = M.pulling
+		M.stop_pulling()
+		step(pulling, get_dir(pulling.loc, A))
+		if(M)
+			M.start_pulling(t)
+	else
+		step(pulling, get_dir(pulling.loc, A))
+	return
+
 /mob/proc/update_gravity()
 	return

code/modules/mob/new_player/new_player.dm

@@ -481,6 +481,7 @@
 
 		domutcheck(new_character)
 		new_character.dna.UpdateSE()
+		new_character.sync_organ_dna() //just fucking incase I guess
 
 		// Do the initial caching of the player's body icons.
 		new_character.force_update_limbs()

code/modules/mob/new_player/preferences_setup.dm

@@ -189,9 +189,9 @@ datum/preferences
 		return clothes_s
 
 	proc/update_preview_icon(var/for_observer=0)		//seriously. This is horrendous.
-		del(preview_icon_front)
-		del(preview_icon_side)
-		del(preview_icon)
+		qdel(preview_icon_front)
+		qdel(preview_icon_side)
+		qdel(preview_icon)
 
 		var/g = "m"
 		if(gender == FEMALE)	g = "f"
@@ -806,8 +806,8 @@ datum/preferences
 		preview_icon_front = new(preview_icon, dir = SOUTH)
 		preview_icon_side = new(preview_icon, dir = WEST)
 
-		del(eyes_s)
-		del(underwear_s)
-		del(undershirt_s)
-		del(socks_s)
-		del(clothes_s)
+		qdel(eyes_s)
+		qdel(underwear_s)
+		qdel(undershirt_s)
+		qdel(socks_s)
+		qdel(clothes_s)

code/modules/organs/organ.dm

@@ -323,4 +323,7 @@ var/list/organ_cache = list()
 	if(fingerprintslast) O.fingerprintslast = fingerprintslast
 
 	user.put_in_active_hand(O)
-	qdel(src)
+	qdel(src)
+
+/obj/item/organ/proc/surgeryize()
+	return

code/modules/organs/organ_internal.dm

@@ -33,10 +33,10 @@
 
 	if(is_bruised())
 		if(prob(2))
-			spawn owner.emote("me", 1, "coughs up blood!")
+			spawn owner.custom_emote(1, "coughs up blood!")
 			owner.drip(10)
 		if(prob(4))
-			spawn owner.emote("me", 1, "gasps for air!")
+			spawn owner.custom_emote(1, "gasps for air!")
 			owner.losebreath += 5
 
 /obj/item/organ/kidneys
@@ -81,6 +81,14 @@
 		owner.b_eyes ? owner.b_eyes : 0
 		)
 
+/obj/item/organ/eyes/surgeryize()
+	if(!owner)
+		return
+	owner.disabilities &= ~NEARSIGHTED
+	owner.sdisabilities &= ~BLIND
+	owner.eye_blurry = 0
+	owner.eye_blind = 0
+
 /obj/item/organ/liver
 	name = "liver"
 	icon_state = "liver"

code/modules/pooling/pool.dm

@@ -16,7 +16,7 @@ To put a object back in the pool, call PlaceInPool(object)
 This will call destroy on the object, set its loc to null,
 and reset all of its vars to their default
 
-You can override your object's destroy to return QDEL_HINT_PLACEINPOOL
+You can override your object's destroy to return QDEL_HINT_PUTINPOOL
 to ensure its always placed in this pool (this will only be acted on if qdel calls destroy, and destroy will not get called twice)
 
 */