Merge remote-tracking branch 'upstream/master' into alarm-overhaul

_maps/map_files/Delta/delta.dmm

@@ -33633,7 +33633,7 @@
 	dir = 4;
 	level = 1
 	},
-/obj/machinery/icecream_vat,
+/obj/machinery/icemachine,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/kitchen)

_maps/map_files/MetaStation/MetaStation.v41A.II.dmm

@@ -58653,7 +58653,7 @@
 	},
 /area/crew_quarters/kitchen)
 "bXn" = (
-/obj/machinery/icecream_vat,
+/obj/machinery/icemachine,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},

_maps/map_files/RandomZLevels/centcomAway.dmm

@@ -6142,7 +6142,7 @@
 	},
 /area/awaymission/centcomAway/thunderdome)
 "oN" = (
-/obj/machinery/icecream_vat,
+/obj/machinery/icemachine,
 /turf/simulated/floor/plasteel{
 	tag = "icon-barber (WEST)";
 	icon_state = "barber";

code/ATMOSPHERICS/atmospherics.dm

@@ -59,7 +59,7 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
 	for(var/mob/living/L in src) //ventcrawling is serious business
 		L.remove_ventcrawl()
 		L.forceMove(get_turf(src))
-	QDEL_NULL(pipe_image) //we have to del it, or it might keep a ref somewhere else
+	QDEL_NULL(pipe_image) //we have to qdel it, or it might keep a ref somewhere else
 	return ..()
 
 // Icons/overlays/underlays

code/__DEFINES/genetics.dm

@@ -145,7 +145,6 @@
 #define RESISTCOLD		"resist_cold"
 #define NO_EXAMINE		"no_examine"
 #define CAN_WINGDINGS	"can_wingdings"
-#define NOZOMBIE 		"no_zombie"
 #define NO_GERMS		"no_germs"
 #define NO_DECAY		"no_decay"
 #define PIERCEIMMUNE	"pierce_immunity"

code/__DEFINES/is_helpers.dm

@@ -3,7 +3,6 @@
 
 // Mobs
 #define ismegafauna(A) istype(A, /mob/living/simple_animal/hostile/megafauna)
-#define iszombie(A) (is_species(A, /datum/species/zombie))
 
 //Simple animals
 #define isshade(A) (istype(A, /mob/living/simple_animal/shade))

code/__HELPERS/game.dm

@@ -362,7 +362,7 @@
 	for(var/i = 1; i <= GLOB.player_list.len; i++)
 		var/mob/M = GLOB.player_list[i]
 		if(M && M.client)
-			if(istype(M, /mob/new_player)) // exclude people in the lobby
+			if(isnewplayer(M)) // exclude people in the lobby
 				continue
 			else if(isobserver(M)) // Ghosts are fine if they were playing once (didn't start as observers)
 				var/mob/dead/observer/O = M

code/__HELPERS/unique_ids.dm

@@ -16,8 +16,6 @@
 
 GLOBAL_VAR_INIT(next_unique_datum_id, 1)
 
-// /client/var/tmp/unique_datum_id = null
-
 /datum/proc/UID()
 	if(!unique_datum_id)
 		var/tag_backup = tag
@@ -37,8 +35,6 @@ GLOBAL_VAR_INIT(next_unique_datum_id, 1)
 
 	var/datum/D = locate(copytext(uid, 1, splitat))
 
-	// We might locate a client instead of a datum, but just using : is easier
-	// than actually checking and typecasting
-	if(D && D:unique_datum_id == uid)
+	if(D && D.unique_datum_id == uid)
 		return D
 	return null

code/__HELPERS/unsorted.dm

@@ -329,8 +329,9 @@ Turf and target are seperate in case you want to teleport some distance from a t
 /proc/select_active_ai_with_fewest_borgs()
 	var/mob/living/silicon/ai/selected
 	var/list/active = active_ais()
-	for(var/mob/living/silicon/ai/A in active)
-		if(!selected || (selected.connected_robots > A.connected_robots))
+	for(var/thing in active)
+		var/mob/living/silicon/ai/A = thing
+		if(!selected || (length(selected.connected_robots) > length(A.connected_robots)))
 			selected = A
 
 	return selected

code/_globalvars/lists/objects.dm

@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(prisoncomputer_list, list())
 GLOBAL_LIST_INIT(celltimers_list, list()) // list of all cell timers
 GLOBAL_LIST_INIT(cell_logs, list())
 GLOBAL_LIST_INIT(navigation_computers, list())
-GLOBAL_LIST_INIT(zombie_infection_list, list())
 
 GLOBAL_LIST_INIT(all_areas, list())
 GLOBAL_LIST_INIT(machines, list())

code/_globalvars/misc.dm

@@ -4,7 +4,7 @@ GLOBAL_DATUM(slmaster, /obj/effect/overlay)
 GLOBAL_VAR_INIT(CELLRATE, 0.002)  // conversion ratio between a watt-tick and kilojoule
 GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
 
-// Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it.
+// Announcer intercom, because too much stuff creates an intercom for one message then qdel()s it.
 GLOBAL_DATUM_INIT(global_announcer, /obj/item/radio/intercom, create_global_announcer())
 GLOBAL_DATUM_INIT(command_announcer, /obj/item/radio/intercom/command, create_command_announcer())
 

code/_onclick/hud/_defines.dm

@@ -161,10 +161,13 @@
 #define ui_bot_pull "EAST-2:26,SOUTH:7"
 
 //Ghosts
-#define ui_ghost_jumptomob "SOUTH:6,CENTER-2:24"
-#define ui_ghost_orbit "SOUTH:6,CENTER-1:24"
-#define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24"
-#define ui_ghost_teleport "SOUTH:6,CENTER+1:24"
+#define ui_ghost_jumptomob "SOUTH:6,CENTER-2"
+#define ui_ghost_orbit "SOUTH:6,CENTER-1"
+#define ui_ghost_reenter_corpse "SOUTH:6,CENTER"
+#define ui_ghost_teleport "SOUTH:6,CENTER+1"
+#define ui_ghost_respawn_list "SOUTH:6,CENTER+2"
+#define ui_ghost_respawn_mob "SOUTH:6+1,CENTER+2"
+#define ui_ghost_respawn_pai "SOUTH:6+2,CENTER+2"
 
 //HUD styles. Please ensure HUD_VERSIONS is the same as the maximum index. Index order defines how they are cycled in F12.
 #define HUD_STYLE_STANDARD 1

code/_onclick/hud/ghost.dm

@@ -40,6 +40,52 @@
 	var/mob/dead/observer/G = usr
 	G.dead_tele()
 
+/obj/screen/ghost/respawn_list
+	name = "Ghost spawns"
+	icon = 'icons/mob/screen_midnight.dmi'
+	icon_state = "template"
+
+/obj/screen/ghost/respawn_list/Initialize(mapload)
+	. = ..()
+	update_hidden_state()
+
+/obj/screen/ghost/respawn_list/Click()
+	var/client/C = hud.mymob.client
+	hud.inventory_shown = !hud.inventory_shown
+	if(hud.inventory_shown)
+		C.screen += hud.toggleable_inventory
+	else
+		C.screen -= hud.toggleable_inventory
+	update_hidden_state()
+
+/obj/screen/ghost/respawn_list/proc/update_hidden_state()
+	var/matrix/M = matrix(transform)
+	M.Turn(-90)
+
+	overlays.Cut()
+	var/image/img = image('icons/mob/actions/actions.dmi', src, (hud && hud.inventory_shown) ? "hide" : "show")
+	img.transform = M
+	overlays += img
+
+/obj/screen/ghost/respawn_mob
+	name = "Mob spawners"
+	icon_state = "mob_spawner"
+
+/obj/screen/ghost/respawn_mob/Click()
+	var/mob/dead/observer/G = usr
+	G.open_spawners_menu()
+
+/obj/screen/ghost/respawn_pai
+	name = "Configure pAI"
+	icon_state = "pai"
+
+/obj/screen/ghost/respawn_pai/Click()
+	var/mob/dead/observer/G = usr
+	GLOB.paiController.recruitWindow(G)
+
+/datum/hud/ghost
+	inventory_shown = FALSE
+
 /datum/hud/ghost/New(mob/owner)
 	..()
 	var/obj/screen/using
@@ -59,6 +105,22 @@
 	using = new /obj/screen/ghost/teleport()
 	using.screen_loc = ui_ghost_teleport
 	static_inventory += using
+	static_inventory += using
+
+	using = new /obj/screen/ghost/respawn_list()
+	using.screen_loc = ui_ghost_respawn_list
+	static_inventory += using
+
+	using = new /obj/screen/ghost/respawn_mob()
+	using.screen_loc = ui_ghost_respawn_mob
+	toggleable_inventory += using
+
+	using = new /obj/screen/ghost/respawn_pai()
+	using.screen_loc = ui_ghost_respawn_pai
+	toggleable_inventory += using
+
+	for(var/obj/screen/S in (static_inventory + toggleable_inventory))
+		S.hud = src
 
 /datum/hud/ghost/show_hud()
 	mymob.client.screen = list()

code/controllers/configuration.dm

@@ -36,7 +36,7 @@
 	var/vote_no_default = 0				// vote does not default to nochange/norestart (tbi)
 	var/vote_no_dead = 0				// dead people can't vote (tbi)
 //	var/enable_authentication = 0		// goon authentication
-	var/del_new_on_log = 1				// del's new players if they log before they spawn in
+	var/del_new_on_log = 1				// qdel's new players if they log before they spawn in
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other

code/controllers/subsystem/machinery.dm

@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(machines)
 	while(currentrun.len)
 		var/obj/O = currentrun[currentrun.len]
 		currentrun.len--
-		if(O)
+		if(O && !QDELETED(O))
 			var/datum/powernet/newPN = new() // create a new powernet...
 			propagate_network(O, newPN)//... and propagate it to the other side of the cable
 

code/controllers/subsystem/ticker.dm

@@ -407,7 +407,7 @@ SUBSYSTEM_DEF(ticker)
 				EquipCustomItems(player)
 	if(captainless)
 		for(var/mob/M in GLOB.player_list)
-			if(!istype(M,/mob/new_player))
+			if(!isnewplayer(M))
 				to_chat(M, "Captainship not forced on anyone.")
 
 /datum/controller/subsystem/ticker/proc/send_tip_of_the_round()

code/controllers/subsystem/tickets/tickets.dm

@@ -20,16 +20,16 @@ SUBSYSTEM_DEF(tickets)
 	init_order = INIT_ORDER_TICKETS
 	wait = 300
 	priority = FIRE_PRIORITY_TICKETS
-	
+
 	flags = SS_BACKGROUND
-	
+
 	var/list/allTickets = list()	//make it here because someone might ahelp before the system has initialized
 
 	var/ticketCounter = 1
 
 /datum/controller/subsystem/tickets/Initialize()
 	close_messages = list("<font color='red' size='4'><b>- [ticket_name] Rejected! -</b></font>",
-				"<span class='boldmessage'>Please try to be calm, clear, and descriptive in admin helps, do not assume the staff member has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.</span>", 
+				"<span class='boldmessage'>Please try to be calm, clear, and descriptive in admin helps, do not assume the staff member has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.</span>",
 				"<span class='[span_class]'>Your [ticket_name] has now been closed.</span>")
 	return ..()
 
@@ -112,7 +112,7 @@ SUBSYSTEM_DEF(tickets)
 		message_staff("<span class='[span_class]'>[usr.client] / ([usr]) resolved [ticket_name] number [N]</span>")
 		to_chat_safe(returnClient(N), "<span class='[span_class]'>Your [ticket_name] has now been resolved.</span>")
 		return TRUE
-		
+
 
 /datum/controller/subsystem/tickets/proc/autoRespond(N)
 	if(!check_rights(R_ADMIN|R_MOD))
@@ -124,19 +124,19 @@ SUBSYSTEM_DEF(tickets)
 		if(alert(usr, "[T.ticketState == TICKET_OPEN ? "Another admin appears to already be handling this." : "This ticket is already marked as closed or resolved"] Are you sure you want to continue?", "Confirmation", "Yes", "No") != "Yes")
 			return
 	T.assignStaff(C)
-	
-	var/response_phrases = list("Thanks" = "Thanks, have a Paradise day!", 
+
+	var/response_phrases = list("Thanks" = "Thanks, have a Paradise day!",
 		"Handling It" = "The issue is being looked into, thanks.",
 		"Already Resolved" = "The problem has been resolved already.",
 		"Mentorhelp" = "Please redirect your question to Mentorhelp, as they are better experienced with these types of questions.",
 		"Happens Again" = "Thanks, let us know if it continues to happen.",
-		"Clear Cache" = "To fix a blank screen, please leave the game and clear your Byond Cache. To clear your Byond Cache, there is a Settings icon in the top right of the launcher. After you click that, go into the Games tab and hit the Clear Cache button. If the issue persists a few minutes after rejoining and doing this, please adminhelp again and state you cleared your cache." ,
+		"Clear Cache" = "To fix a blank screen, go to the 'Special Verbs' tab and press 'Reload UI Resources'. If that fails, clear your BYOND cache (instructions provided with 'Reload UI Resources'). If that still fails, please adminhelp again, stating you have already done the following." ,
 		"IC Issue" = "This is an In Character (IC) issue and will not be handled by admins. You could speak to Security, Internal Affairs, a Departmental Head, Nanotrasen Representetive, or any other relevant authority currently on station.",
 		"Reject" = "Reject",
 		"Man Up" = "Man Up",
 		"Appeal on the Forums" = "Appealing a ban must occur on the forums. Privately messaging, or adminhelping about your ban will not resolve it. To appeal your ban, please head to <a href='[config.banappeals]'>[config.banappeals]</a>"
 		)
-		
+
 	var/sorted_responses = list()
 	for(var/key in response_phrases)	//build a new list based on the short descriptive keys of the master list so we can send this as the input instead of the full paragraphs to the admin choosing which autoresponse
 		sorted_responses += key
@@ -351,7 +351,7 @@ UI STUFF
 			dat += "<tr><td>[T.content[i]]</td></tr>"
 
 	dat += "</table><br /><br />"
-	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a>[check_rights(R_ADMIN|R_MOD, 0) ? "<a href='?src=[UID()];autorespond=[T.ticketNum]'>Auto</a>": ""]<a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />" 
+	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a>[check_rights(R_ADMIN|R_MOD, 0) ? "<a href='?src=[UID()];autorespond=[T.ticketNum]'>Auto</a>": ""]<a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />"
 
 	if(!T.staffAssigned)
 		dat += "No staff member assigned to this [ticket_name] - <a href='?src=[UID()];assignstaff=[T.ticketNum]'>Take Ticket</a><br />"
@@ -447,7 +447,7 @@ UI STUFF
 			return
 		if(closeTicket(indexNum))
 			showDetailUI(usr, indexNum)
-			
+
 
 	if(href_list["detailreopen"])
 		var/indexNum = text2num(href_list["detailreopen"])

code/datums/components/ducttape.dm

@@ -37,10 +37,10 @@
 	I.anchored = initial(I.anchored)
 	for(var/datum/action/item_action/remove_tape/RT in I.actions)
 		RT.Remove(user)
-		RT.Destroy()
+		qdel(RT)
 	I.overlays.Cut(tape_overlay)
 	user.transfer_fingerprints_to(I)
-	Destroy()
+	qdel(src)
 
 /datum/component/ducttape/proc/afterattack(obj/item/I, atom/target, mob/user, proximity, params)
 	if(!proximity)

code/datums/datumvars.dm

@@ -1232,22 +1232,6 @@
 		log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
 		qdel(rem_organ)
 
-	else if(href_list["fix_nano"])
-		if(!check_rights(R_DEBUG)) return
-
-		var/mob/H = locateUID(href_list["fix_nano"])
-
-		if(!istype(H) || !H.client)
-			to_chat(usr, "This can only be done on mobs with clients")
-			return
-
-		H.client.reload_nanoui_resources()
-
-		to_chat(usr, "Resource files sent")
-		to_chat(H, "Your NanoUI Resource files have been refreshed")
-
-		log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)]")
-
 	else if(href_list["regenerateicons"])
 		if(!check_rights(0))	return
 

code/datums/mind.dm

@@ -89,6 +89,9 @@
 			if(antag_datum.delete_on_mind_deletion)
 				qdel(i)
 		antag_datums = null
+	current = null
+	original = null
+	soulOwner = null
 	return ..()
 
 /datum/mind/proc/transfer_to(mob/living/new_character)
@@ -544,11 +547,20 @@
 				if(objective&&(objective.type in objective_list) && objective:target)
 					def_target = objective.target.current
 				possible_targets = sortAtom(possible_targets)
-				possible_targets += "Free objective"
 
-				var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
-				if(!new_target)
-					return
+				var/new_target
+				if(length(possible_targets) > 0)
+					if(alert(usr, "Do you want to pick the objective yourself? No will randomise it", "Pick objective", "Yes", "No") == "Yes")
+						possible_targets += "Free objective"
+						new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
+					else
+						new_target = pick(possible_targets)
+
+					if(!new_target)
+						return
+				else
+					to_chat(usr, "<span class='warning'>No possible target found. Defaulting to a Free objective.</span>")
+					new_target = "Free objective"
 
 				var/objective_path = text2path("/datum/objective/[new_obj_type]")
 				if(new_target == "Free objective")

code/datums/uplink_item.dm

@@ -188,15 +188,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	item = /obj/item/storage/box/syndie_kit/fake_revolver
 	cost = 1
 	job = list("Clown")
-/*
-/datum/uplink_item/stealthy_weapons/romerol_kit
-	name = "Romerol"
-	reference = "ROM"
-	desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. On death, these nodules take control of the dead body, causing limited revivification, along with slurred speech, aggression, and the ability to infect others with this agent."
-	item = /obj/item/storage/box/syndie_kit/romerol
-	cost = 25
-	cant_discount = TRUE
-*/
 //mime
 /datum/uplink_item/jobspecific/caneshotgun
 	name = "Cane Shotgun and Assassination Shells"
@@ -247,6 +238,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 2
 	job = list("Chef")
 
+/datum/uplink_item/jobspecific/Chef_CQC
+	name = " A chefs manual to CQC"
+	desc = "An old manual teaching you how to bring your home advantage outside the kitchen."
+	reference = "CCQC"
+	item = /obj/item/CQC_manual/chef
+	cost = 12
+	job = list("Chef")
+
 //Chaplain
 
 /datum/uplink_item/jobspecific/voodoo

code/game/atoms_movable.dm

@@ -50,6 +50,7 @@
 		loc.handle_atom_del(src)
 	for(var/atom/movable/AM in contents)
 		qdel(AM)
+	LAZYCLEARLIST(client_mobs_in_contents)
 	loc = null
 	if(pulledby)
 		pulledby.stop_pulling()

code/game/dna/dna_modifier.dm

@@ -118,17 +118,15 @@
 
 	if(usr.incapacitated())
 		return
-
-	eject_occupant()
-
+	eject_occupant(usr)
 	add_fingerprint(usr)
 
 /obj/machinery/dna_scannernew/Destroy()
-	eject_occupant()
+	eject_occupant(null, TRUE)
 	return ..()
 
-/obj/machinery/dna_scannernew/proc/eject_occupant()
-	go_out()
+/obj/machinery/dna_scannernew/proc/eject_occupant(user, force)
+	go_out(user, force)
 	for(var/obj/O in src)
 		if(!istype(O,/obj/item/circuitboard/clonescanner) && \
 		   !istype(O,/obj/item/stock_parts) && \
@@ -271,15 +269,15 @@
 
 		occupant.notify_ghost_cloning(source = src)
 
-/obj/machinery/dna_scannernew/proc/go_out()
+/obj/machinery/dna_scannernew/proc/go_out(mob/user, force)
 	if(!occupant)
-		to_chat(usr, "<span class='warning'>The scanner is empty!</span>")
+		if(user)
+			to_chat(user, "<span class='warning'>The scanner is empty!</span>")
 		return
-
-	if(locked)
-		to_chat(usr, "<span class='warning'>The scanner is locked!</span>")
+	if(locked && !force)
+		if(user)
+			to_chat(user, "<span class='warning'>The scanner is locked!</span>")
 		return
-
 	occupant.forceMove(loc)
 	occupant = null
 	icon_state = "scanner_open"
@@ -751,7 +749,7 @@
 		return TRUE
 
 	if(href_list["ejectOccupant"])
-		connected.eject_occupant()
+		connected.eject_occupant(usr)
 		return TRUE
 
 	// Transfer Buffer Management

code/game/gamemodes/blob/blob.dm

@@ -46,7 +46,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 		var/datum/mind/blob = pick(possible_blobs)
 		infected_crew += blob
 		blob.special_role = SPECIAL_ROLE_BLOB
-		update_blob_icons_added(blob)
 		blob.restricted_roles = restricted_jobs
 		log_game("[key_name(blob)] has been selected as a Blob")
 		possible_blobs -= blob
@@ -152,6 +151,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 	for(var/datum/mind/blob in infected_crew)
 		greet_blob(blob)
+		update_blob_icons_added(blob)
 
 	if(SSshuttle)
 		SSshuttle.emergencyNoEscape = 1

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -363,6 +363,10 @@
 	to_chat(S, "<span class='warning'>This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting.</span>")
 	return FALSE
 
+/obj/structure/spacepoddoor/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+	to_chat(S, "<span class='warning'>Disrupting this energy field would overload us. Aborting.</span>")
+	return FALSE
+
 /turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
 	var/isonshuttle = istype(loc, /area/shuttle)
 	for(var/turf/T in range(1, src))

code/game/gamemodes/objective.dm

@@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 
 /datum/objective/assassinate/check_completion()
 	if(target && target.current)
-		if(target.current.stat == DEAD || iszombie(target))
+		if(target.current.stat == DEAD)
 			return 1
 		if(issilicon(target.current) || isbrain(target.current)) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
 			return 1
@@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 
 /datum/objective/maroon/check_completion()
 	if(target && target.current)
-		if(target.current.stat == DEAD || iszombie(target))
+		if(target.current.stat == DEAD)
 			return 1
 		if(!target.current.ckey)
 			return 1
@@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 	if(!target) //If it's a free objective.
 		return 1
 	if(target.current)
-		if(target.current.stat == DEAD || iszombie(target))
+		if(target.current.stat == DEAD)
 			return 0
 		if(issilicon(target.current))
 			return 0
@@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 		return 0
 	if(isbrain(owner.current))
 		return 0
-	if(!owner.current || owner.current.stat == DEAD || iszombie(owner))
+	if(!owner.current || owner.current.stat == DEAD)
 		return 0
 	if(SSticker.force_ending) //This one isn't their fault, so lets just assume good faith
 		return 1
@@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 	explanation_text = "Die a glorious death."
 
 /datum/objective/die/check_completion()
-	if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current) || iszombie(owner))
+	if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current))
 		return 1
 	if(issilicon(owner.current) && owner.current != owner.original)
 		return 1

code/game/machinery/slotmachine.dm

@@ -20,6 +20,12 @@
 			account = null
 	ui_interact(user)
 
+/obj/machinery/slot_machine/wrench_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.tool_use_check(user, 0))
+		return
+	default_unfasten_wrench(user, I)
+
 /obj/machinery/slot_machine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)

code/game/machinery/tcomms/_base.dm

@@ -306,7 +306,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines)
 		if(is_admin(R) && !R.get_preference(CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
 			continue
 
-		if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes.
+		if(isnewplayer(R)) // we don't want new players to hear messages. rare but generates runtimes.
 			continue
 
 		// --- Can understand the speech ---

code/game/objects/items/stacks/stack.dm

@@ -204,7 +204,7 @@
 
 		if(amount < 1) // Just in case a stack's amount ends up fractional somehow
 			var/oldsrc = src
-			src = null //dont kill proc after del()
+			src = null //dont kill proc after qdel()
 			usr.unEquip(oldsrc, 1)
 			qdel(oldsrc)
 			if(istype(O, /obj/item))

code/game/objects/items/weapons/cigs.dm

@@ -31,6 +31,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	var/smoketime = 150
 	var/chem_volume = 60
 	var/list/list_reagents = list("nicotine" = 40)
+	var/first_puff = TRUE // the first puff is a bit more reagents ingested
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi',
 		"Unathi" = 'icons/mob/species/unathi/mask.dmi',
@@ -194,8 +195,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 	if(reagents && reagents.total_volume)	//	check if it has any reagents at all
 		if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
 			var/mob/living/carbon/C = loc
-			for (var/datum/reagent/R in reagents.reagent_list)
-				reagents.trans_id_to(C, R.id, max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
+			for(var/datum/reagent/R in reagents.reagent_list)
+				reagents.trans_id_to(C, R.id, first_puff ? 1 : max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
+			first_puff = FALSE
 			if(!reagents.total_volume) // There were reagents, but now they're gone
 				to_chat(C, "<span class='notice'>Your [name] loses its flavor.</span>")
 		else // else just remove some of the reagents
@@ -377,6 +379,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		to_chat(user, "<span class='notice'>You refill the pipe with tobacco.</span>")
 		reagents.add_reagent("nicotine", chem_volume)
 		smoketime = initial(smoketime)
+		first_puff = TRUE
 
 /obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers))

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -121,19 +121,6 @@
 	desc = "A sleek, sturdy box"
 	icon_state = "box_of_doom"
 
-/obj/item/storage/box/syndie_kit/romerol
-	name = "Romerol Kit"
-	desc = "A box containing a deadly virus capable of reanimating dead as zombies."
-	max_w_class = WEIGHT_CLASS_NORMAL
-	can_hold = list(/obj/item/reagent_containers/glass/bottle/romerol,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/dropper)
-
-/obj/item/storage/box/syndie_kit/romerol/New()
-	..()
-	new /obj/item/reagent_containers/glass/bottle/romerol(src)
-	new /obj/item/reagent_containers/syringe(src)
-	new /obj/item/reagent_containers/dropper(src)
-	return
-
 /obj/item/storage/box/syndie_kit/space
 	name = "Boxed Space Suit and Helmet"
 	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)

code/game/objects/structures/crates_lockers/closets.dm

@@ -230,7 +230,7 @@
 	add_fingerprint(user)
 
 /obj/structure/closet/attack_ai(mob/user)
-	if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI
+	if(isrobot(user) && Adjacent(user) && !istype(user.loc, /obj/machinery/atmospherics)) //Robots can open/close it, but not the AI
 		attack_hand(user)
 
 /obj/structure/closet/relaymove(mob/user)

code/game/verbs/who.dm

@@ -27,7 +27,7 @@
 							entry += " - <font color='gray'>Observing</font>"
 						else
 							entry += " - <font color='black'><b>DEAD</b></font>"
-					else if(istype(C.mob, /mob/new_player))
+					else if(isnewplayer(C.mob))
 						entry += " - <font color='green'>New Player</font>"
 					else
 						entry += " - <font color='black'><b>DEAD</b></font>"
@@ -90,7 +90,7 @@
 
 				if(isobserver(C.mob))
 					msg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
+				else if(isnewplayer(C.mob))
 					msg += " - Lobby"
 				else
 					msg += " - Playing"
@@ -106,7 +106,7 @@
 
 				if(isobserver(C.mob))
 					modmsg += " - Observing"
-				else if(istype(C.mob,/mob/new_player))
+				else if(isnewplayer(C.mob))
 					modmsg += " - Lobby"
 				else
 					modmsg += " - Playing"

code/game/world.dm

@@ -232,7 +232,7 @@ GLOBAL_VAR_INIT(world_topic_spam_protect_time, world.timeofday)
 		if(!C)
 			return "No client with that name on server"
 
-		del(C)
+		qdel(C)
 
 		return "Kick Successful"
 

code/modules/admin/DB ban/functions.dm

@@ -146,7 +146,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 
 	if(kickbannedckey)
 		if(banned_mob && banned_mob.client && banned_mob.client.ckey == banckey)
-			del(banned_mob.client)
+			qdel(banned_mob.client)
 
 	if(isjobban)
 		jobban_client_fullban(ckey, job)

code/modules/admin/admin.dm

@@ -72,7 +72,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		body += "\[<A href='?_src_=holder;editrights=rank;ckey=[M.ckey]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\] "
 		body += "\[<A href='?_src_=holder;getplaytimewindow=[M.UID()]'>" + M.client.get_exp_type(EXP_TYPE_CREW) + " as [EXP_TYPE_CREW]</a>\]"
 
-	if(istype(M, /mob/new_player))
+	if(isnewplayer(M))
 		body += " <B>Hasn't Entered Game</B> "
 	else
 		body += " \[<A href='?_src_=holder;revive=[M.UID()]'>Heal</A>\] "
@@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 			body += {" | <A href='?_src_=holder;cryossd=[M.UID()]'>Cryo</A> "}
 
 	if(M.client)
-		if(!istype(M, /mob/new_player))
+		if(!isnewplayer(M))
 			body += "<br><br>"
 			body += "<b>Transformation:</b>"
 			body += "<br>"
@@ -1004,13 +1004,13 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space
 /proc/kick_clients_in_lobby(message, kick_only_afk = 0)
 	var/list/kicked_client_names = list()
 	for(var/client/C in GLOB.clients)
-		if(istype(C.mob, /mob/new_player))
+		if(isnewplayer(C.mob))
 			if(kick_only_afk && !C.is_afk())	//Ignore clients who are not afk
 				continue
 			if(message)
 				to_chat(C, message)
 			kicked_client_names.Add("[C.ckey]")
-			del(C)
+			qdel(C)
 	return kicked_client_names
 
 //returns 1 to let the dragdrop code know we are trapping this event

code/modules/admin/admin_verbs.dm

@@ -337,7 +337,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
 		ghost.reenter_corpse()
 		log_admin("[key_name(usr)] re-entered their body")
 		feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	else if(istype(mob,/mob/new_player))
+	else if(isnewplayer(mob))
 		to_chat(src, "<font color='red'>Error: Aghost: Can't admin-ghost whilst in the lobby. Join or observe first.</font>")
 	else
 		//ghostize
@@ -542,7 +542,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
 			message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban")
 			log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban")
 			to_chat(C, "<font color='red'><BIG><B>You have been autobanned due to a warning by [ckey].</B></BIG><br>This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.")
-			del(C)
+			qdel(C)
 		else
 			message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban")
 			log_admin("[key_name(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban")

code/modules/admin/player_panel.dm

@@ -268,7 +268,7 @@
 				else
 					M_job = "Living"
 
-			else if(istype(M,/mob/new_player))
+			else if(isnewplayer(M))
 				M_job = "New player"
 
 			else if(isobserver(M))
@@ -356,7 +356,7 @@
 			dat += "<td>[M.real_name]</td>"
 		else if(istype(M, /mob/living/silicon/pai))
 			dat += "<td>pAI</td>"
-		else if(istype(M, /mob/new_player))
+		else if(isnewplayer(M))
 			dat += "<td>New Player</td>"
 		else if(isobserver(M))
 			dat += "<td>Ghost</td>"

code/modules/admin/topic.dm

@@ -909,7 +909,7 @@
 			log_admin("[key_name(usr)] booted [key_name(M)].")
 			message_admins("<span class='notice'>[key_name_admin(usr)] booted [key_name_admin(M)].</span>", 1)
 			//M.client = null
-			del(M.client)
+			qdel(M.client)
 
 	//Player Notes
 	else if(href_list["addnote"])
@@ -1011,8 +1011,7 @@
 				log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
 				message_admins("<span class='notice'>[key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.</span>")
 
-				del(M.client)
-				//qdel(M)	// See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
+				qdel(M.client)
 			if("No")
 				var/reason = input(usr,"Please state the reason","Reason") as message|null
 				if(!reason)
@@ -1032,8 +1031,7 @@
 				feedback_inc("ban_perma",1)
 				DB_ban_record(BANTYPE_PERMA, M, -1, reason)
 
-				del(M.client)
-				//qdel(M)
+				qdel(M.client)
 			if("Cancel")
 				return
 
@@ -1507,7 +1505,7 @@
 		if(!check_rights(R_SPAWN))	return
 
 		var/mob/M = locateUID(href_list["makeanimal"])
-		if(istype(M, /mob/new_player))
+		if(isnewplayer(M))
 			to_chat(usr, "This cannot be used on instances of type /mob/new_player")
 			return
 		if(alert(usr, "Confirm make animal?",, "Yes", "No") != "Yes")

code/modules/admin/verbs/adminpm.dm

@@ -19,7 +19,7 @@
 	var/list/client/targets[0]
 	for(var/client/T)
 		if(T.mob)
-			if(istype(T.mob, /mob/new_player))
+			if(isnewplayer(T.mob))
 				targets["(New Player) - [T]"] = T
 			else if(istype(T.mob, /mob/dead/observer))
 				targets["[T.mob.name](Ghost) - [T]"] = T
@@ -42,7 +42,7 @@
 	var/list/client/targets[0]
 	for(var/client/T)
 		if(T.mob)
-			if(istype(T.mob, /mob/new_player))
+			if(isnewplayer(T.mob))
 				targets["[T] - (New Player)"] = T
 			else if(istype(T.mob, /mob/dead/observer))
 				targets["[T] - [T.mob.name](Ghost)"] = T

code/modules/admin/verbs/debug.dm

@@ -251,7 +251,7 @@ GLOBAL_PROTECT(AdminProcCaller)
 		alert("That mob doesn't seem to exist, close the panel and try again.")
 		return
 
-	if(istype(M, /mob/new_player))
+	if(isnewplayer(M))
 		alert("The mob must not be a new_player.")
 		return
 
@@ -382,7 +382,7 @@ GLOBAL_PROTECT(AdminProcCaller)
 	if(!check_rights(R_DEBUG))
 		return
 
-	//This gets a confirmation check because it's way easier to accidentally hit this and delete things than it is with del-all
+	//This gets a confirmation check because it's way easier to accidentally hit this and delete things than it is with qdel-all
 	var/confirm = alert("This will delete ALL Singularities and Tesla orbs except for any that are on away mission z-levels or the centcomm z-level. Are you sure you want to delete them?", "Confirm Panic Button", "Yes", "No")
 	if(confirm != "Yes")
 		return
@@ -816,21 +816,6 @@ GLOBAL_PROTECT(AdminProcCaller)
 	else
 		alert("Invalid mob")
 
-/client/proc/reload_nanoui_resources()
-	set category = "Debug"
-	set name = "Reload NanoUI Resources"
-	set desc = "Force the client to redownload NanoUI Resources"
-
-	// Close open NanoUIs.
-	SSnanoui.close_user_uis(usr)
-
-	// Re-load the assets.
-	var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui)
-	assets.register()
-
-	// Clear the user's cache so they get resent.
-	usr.client.cache = list()
-
 /client/proc/view_runtimes()
 	set category = "Debug"
 	set name = "View Runtimes"

code/modules/admin/verbs/toggledebugverbs.dm

@@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(admin_verbs_show_debug_verbs, list(
 	/client/proc/print_jobban_old_filter,
 	/client/proc/forceEvent,
 	/client/proc/nanomapgen_DumpImage,
-	/client/proc/reload_nanoui_resources,
 	/client/proc/admin_redo_space_transitions,
 	/client/proc/make_turf_space_map,
 	/client/proc/vv_by_ref

code/modules/client/client defines.dm

@@ -59,10 +59,6 @@
 	var/karma = 0
 	var/karma_spent = 0
 	var/karma_tab = 0
-	/////////////////////////////////////////////
-	// /vg/: MEDIAAAAAAAA
-	// Set on login.
-	var/datum/media_manager/media = null
 
 	var/topic_debugging = 0 //if set to true, allows client to see nanoUI errors -- yes i realize this is messy but it'll make live testing infinitely easier
 
@@ -85,10 +81,10 @@
 	// If set to true, this client can interact with atoms such as buttons and doors on top of regular machinery interaction
 	var/advanced_admin_interaction = FALSE
 
-	// Has the client been varedited by an admin? [Inherits from datum now]
-	// var/var_edited = FALSE
-
 	var/client_keysend_amount = 0
 	var/next_keysend_reset = 0
 	var/next_keysend_trip_reset = 0
 	var/keysend_tripped = FALSE
+
+	// Last world.time that the player tried to request their resources.
+	var/last_ui_resource_send = 0

code/modules/client/client procs.dm

@@ -432,7 +432,13 @@
 //////////////
 //DISCONNECT//
 //////////////
+
 /client/Del()
+	if(!gc_destroyed)
+		Destroy() //Clean up signals and timers.
+	return ..()
+
+/client/Destroy()
 	if(holder)
 		holder.owner = null
 		GLOB.admins -= src
@@ -442,7 +448,8 @@
 		movingmob.client_mobs_in_contents -= mob
 		UNSETEMPTY(movingmob.client_mobs_in_contents)
 	Master.UpdateTickRate()
-	return ..()
+	..() //Even though we're going to be hard deleted there are still some things that want to know the destroy is happening
+	return QDEL_HINT_HARDDEL_NOW
 
 
 /client/proc/donator_check()
@@ -556,7 +563,7 @@
 		if(GLOB.panic_bunker_enabled)
 			var/threshold = config.panic_bunker_threshold
 			src << "Server is not accepting connections from never-before-seen players until player count is less than [threshold]. Please try again later."
-			del(src)
+			qdel(src)
 			return // Dont insert or they can just go in again
 
 		var/DBQuery/query_insert = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("player")] (id, ckey, firstseen, lastseen, ip, computerid, lastadminrank) VALUES (null, '[ckey]', Now(), Now(), '[sql_ip]', '[sql_computerid]', '[sql_admin_rank]')")
@@ -906,3 +913,35 @@
 	return TRUE
 
 #undef SSD_WARNING_TIMER
+
+/client/verb/resend_ui_resources()
+	set name = "Reload UI Resources"
+	set desc = "Reload your UI assets if they are not working"
+	set category = "Special Verbs"
+
+	if(last_ui_resource_send > world.time)
+		to_chat(usr, "<span class='warning'>You requested your UI resource files too quickly. Please try again in [(last_ui_resource_send - world.time)/10] seconds.</span>")
+		return
+
+	var/choice = alert(usr, "This will reload your NanoUI and TGUI resources. If you have any open UIs this may break them. Are you sure?", "Resource Reloading", "Yes", "No")
+	if(choice == "Yes")
+		// 600 deciseconds = 1 minute
+		last_ui_resource_send = world.time + 60 SECONDS
+
+		// Close their open UIs
+		SSnanoui.close_user_uis(usr)
+		SStgui.close_user_uis(usr)
+
+		// Resend the resources
+		var/datum/asset/nano_assets = get_asset_datum(/datum/asset/nanoui)
+		nano_assets.register()
+
+		var/datum/asset/tgui_assets = get_asset_datum(/datum/asset/simple/tgui)
+		tgui_assets.register()
+
+		// Clear the user's cache so they get resent.
+		// This is not fully clearing their BYOND cache, just their assets sent from the server this round
+		cache = list()
+
+		to_chat(usr, "<span class='notice'>UI resource files resent successfully. If you are still having issues, please try manually clearing your BYOND cache. <b>This can be achieved by opening your BYOND launcher, pressing the cog in the top right, selecting preferences, going to the Games tab, and pressing 'Clear Cache'.</b></span>")
+

code/modules/clothing/head/soft_caps.dm

@@ -113,7 +113,7 @@
 
 /obj/item/clothing/head/soft/sec/corp
 	name = "corporate security cap"
-	desc = "It's baseball hat in corpotate colours."
+	desc = "It's a baseball hat in corporate colours."
 	icon_state = "corpsoft"
 	item_color = "corp"
 

code/modules/clothing/under/accessories/accessory.dm

@@ -330,7 +330,7 @@
 	item_color = "lawyerbadge"
 	var/cached_bubble_icon = null
 
-/obj/item/clothing/accessory/attack_self(mob/user)
+/obj/item/clothing/accessory/lawyers_badge/attack_self(mob/user)
 	if(prob(1))
 		user.say("The testimony contradicts the evidence!")
 	user.visible_message("<span class='notice'>[user] shows [user.p_their()] attorney's badge.</span>", "<span class='notice'>You show your attorney's badge.</span>")

code/modules/events/dust.dm

@@ -16,7 +16,7 @@
 	density = 1
 	anchored = 1
 	var/strength = 2 //ex_act severity number
-	var/life = 2 //how many things we hit before del(src)
+	var/life = 2 //how many things we hit before qdel(src)
 	var/atom/goal = null
 
 /obj/effect/space_dust/weak

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -115,7 +115,7 @@
 	//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
 	SplashReagents(target)
 
-	//Finally, smash the bottle. This kills (del) the bottle.
+	//Finally, smash the bottle. This kills (qdel) the bottle.
 	smash(target, user)
 
 /obj/item/reagent_containers/food/drinks/bottle/proc/SplashReagents(mob/M)

code/modules/food_and_drinks/food/foods/desserts.dm

@@ -17,10 +17,10 @@
 	update_icon()
 
 /obj/item/reagent_containers/food/snacks/icecream/update_icon()
-	overlays.Cut()
-	var/image/filling = image('icons/obj/kitchen.dmi', src, "icecream_color")
-	filling.icon += mix_color_from_reagents(reagents.reagent_list)
-	overlays += filling
+	cut_overlays()
+	var/mutable_appearance/filling = mutable_appearance('icons/obj/kitchen.dmi', "icecream_color")
+	filling.color = mix_color_from_reagents(reagents.reagent_list)
+	add_overlay(filling)
 
 /obj/item/reagent_containers/food/snacks/icecream/icecreamcone
 	name = "ice cream cone"

code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

@@ -43,10 +43,9 @@
 		return
 	if(istype(I, /obj/item/reagent_containers/food/snacks/icecream))
 		if(!I.reagents.has_reagent("sprinkles"))
-			if(I.reagents.total_volume > 29) I.reagents.remove_any(1)
-			I.reagents.add_reagent("sprinkles",1)
-			var/image/sprinkles = image('icons/obj/kitchen.dmi', src, "sprinkles")
-			I.overlays += sprinkles
+			if(I.reagents.total_volume > 29)
+				I.reagents.remove_any(1)
+			I.reagents.add_reagent("sprinkles", 1)
 			I.name += " with sprinkles"
 			I.desc += ". This also has sprinkles."
 		else

code/modules/food_and_drinks/kitchen_machinery/icecream_vat_2.dm

@@ -1,256 +0,0 @@
-#define ICECREAM_VANILLA 1
-#define FLAVOUR_CHOCOLATE 2
-#define FLAVOUR_STRAWBERRY 3
-#define FLAVOUR_BLUE 4
-#define CONE_WAFFLE 5
-#define CONE_CHOC 6
-#define INGR_MILK 7
-#define INGR_FLOUR 8
-#define INGR_SUGAR 9
-#define INGR_ICE 10
-#define MUCK 11
-
-GLOBAL_LIST_INIT(ingredients_source, list(
-"berryjuice" = FLAVOUR_STRAWBERRY,\
-"cocoa" = FLAVOUR_CHOCOLATE,\
-"singulo" = FLAVOUR_BLUE,\
-"milk" = INGR_MILK,\
-"soymilk" = INGR_MILK,\
-"ice" = INGR_ICE,\
-"flour" = INGR_FLOUR,\
-"sugar" = INGR_SUGAR,\
-))
-
-/proc/get_icecream_flavour_string(var/flavour_type)
-	switch(flavour_type)
-		if(FLAVOUR_CHOCOLATE)
-			return "chocolate"
-		if(FLAVOUR_STRAWBERRY)
-			return "strawberry"
-		if(FLAVOUR_BLUE)
-			return "blue"
-		if(CONE_WAFFLE)
-			return "waffle"
-		if(CONE_CHOC)
-			return "chocolate"
-		if(INGR_MILK)
-			return "milk"
-		if(INGR_FLOUR)
-			return "flour"
-		if(INGR_SUGAR)
-			return "sugar"
-		if(INGR_ICE)
-			return "ice"
-		if(MUCK)
-			return "muck"
-		else
-			return "vanilla"
-
-/obj/machinery/icecream_vat
-	name = "icecream vat"
-	desc = "Ding-aling ding dong. Get your Nanotrasen-approved ice cream!"
-	icon = 'icons/obj/kitchen.dmi'
-	icon_state = "icecream_vat"
-	density = 1
-	anchored = 0
-	max_integrity = 300
-	var/list/ingredients = list()
-	var/dispense_flavour = 1
-	var/obj/item/reagent_containers/glass/held_container
-
-/obj/machinery/icecream_vat/New()
-	..()
-	create_reagents(50)
-	while(ingredients.len < 11)
-		ingredients.Add(5)
-
-/obj/machinery/icecream_vat/attack_hand(mob/user)
-	user.set_machine(src)
-	interact(user)
-
-/obj/machinery/icecream_vat/interact(mob/user)
-	var/dat
-	dat += "<a href='?src=[UID()];dispense=[ICECREAM_VANILLA]'><b>Dispense vanilla icecream</b></a> There is [ingredients[ICECREAM_VANILLA]] scoops of vanilla icecream left (made from milk and ice).<br>"
-	dat += "<a href='?src=[UID()];dispense=[FLAVOUR_STRAWBERRY]'><b>Dispense strawberry icecream</b></a> There is [ingredients[FLAVOUR_STRAWBERRY]] dollops of strawberry flavouring left (obtained from berry juice.<br>"
-	dat += "<a href='?src=[UID()];dispense=[FLAVOUR_CHOCOLATE]'><b>Dispense chocolate icecream</b></a> There is [ingredients[FLAVOUR_CHOCOLATE]] dollops of chocolate flavouring left (obtained from cocoa powder).<br>"
-	dat += "<a href='?src=[UID()];dispense=[FLAVOUR_BLUE]'><b>Dispense blue icecream</b></a> There is [ingredients[FLAVOUR_BLUE]] dollops of blue flavouring left (obtained from bluespace tomato singulo).<br>"
-	dat += "<br>"
-	dat += "<a href='?src=[UID()];cone=[CONE_WAFFLE]'><b>Dispense waffle cones</b></a> There are [ingredients[CONE_WAFFLE]] waffle cones left. <br>"
-	dat += "<a href='?src=[UID()];cone=[CONE_CHOC]'><b>Dispense chocolate cones</b></a> There are [ingredients[CONE_CHOC]] chocolate cones left.<br>"
-	dat += "<br>"
-	dat += "<a href='?src=[UID()];make=[CONE_WAFFLE]'><b>Make waffle cones</b></a> There is [ingredients[INGR_FLOUR]]/[ingredients[INGR_SUGAR]] of flour and sugar left.<br>"
-	dat += "<a href='?src=[UID()];make=[CONE_CHOC]'><b>Make chocolate cones</b></a> There is [ingredients[FLAVOUR_CHOCOLATE]]/[ingredients[CONE_WAFFLE]] of chocolate flavouring and waffle cones left.<br>"
-	dat += "<a href='?src=[UID()];make=[ICECREAM_VANILLA]'><b>Make vanilla icecream</b></a> There is [ingredients[INGR_MILK]]/[ingredients[INGR_ICE]] of milk and ice left.<br>"
-	dat += "<br>"
-	if(held_container)
-		dat += "<a href='?src=[UID()];eject=1'>Eject [held_container]</a> "
-	else
-		dat += "No beaker inserted. "
-	dat += "<a href='?src=[UID()];refresh=1'>Refresh</a> <a href='?src=[UID()];close=1'>Close</a>"
-
-	var/datum/browser/popup = new(user, "icecreamvat", name, 600, 400)
-	popup.set_content(dat)
-	popup.open(0)
-
-/obj/machinery/icecream_vat/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/reagent_containers))
-		if(istype(O, /obj/item/reagent_containers/food/snacks/icecream))
-			var/obj/item/reagent_containers/food/snacks/icecream/I = O
-			if(!I.ice_creamed)
-				if(ingredients[ICECREAM_VANILLA] > 0)
-					var/flavour_name = get_icecream_flavour_string(dispense_flavour)
-					if(dispense_flavour < 11 && ingredients[dispense_flavour] > 0)
-						visible_message("[bicon(src)] <span class='info'>[user] scoops delicious [flavour_name] flavoured icecream into [I].</span>")
-						ingredients[dispense_flavour] -= 1
-						ingredients[ICECREAM_VANILLA] -= 1
-
-						I.add_ice_cream(dispense_flavour)
-						if(held_container)
-							held_container.reagents.trans_to(I, 10)
-						if(I.reagents.total_volume < 10)
-							I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
-					else
-						to_chat(user, "<span class='warning'>There is not enough [flavour_name] flavouring left! Insert more of the required ingredients.</span>")
-				else
-					to_chat(user, "<span class='warning'>There is not enough icecream left! Insert more milk and ice.</span>")
-			else
-				to_chat(user, "<span class='notice'>[O] already has icecream in it.</span>")
-		else if(istype(O, /obj/item/reagent_containers/glass))
-			if(held_container)
-				to_chat(user, "<span class='notice'>You must remove [held_container] from [src] first.</span>")
-			else
-				if(!user.drop_item())
-					to_chat(user, "<span class='warning'>\The [O] is stuck to your hand!</span>")
-					return
-				O.forceMove(src)
-				to_chat(user, "<span class='info'>You insert [O] into [src].</span>")
-				held_container = O
-		else
-			var/obj/item/reagent_containers/R = O
-			if(R.reagents)
-				visible_message("<span class='info'>[user] has emptied all of [R] into [src].</span>")
-				for(var/datum/reagent/current_reagent in R.reagents.reagent_list)
-					if(GLOB.ingredients_source[current_reagent.id])
-						add(GLOB.ingredients_source[current_reagent.id], current_reagent.volume / 2)
-					else
-						add(MUCK, current_reagent.volume / 5)
-				R.reagents.clear_reagents()
-		return 1
-	else
-		return ..()
-
-/obj/machinery/icecream_vat/proc/add(var/add_type, var/amount)
-	if(add_type <= ingredients.len)
-		ingredients[add_type] += amount
-		updateDialog()
-
-/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type)
-	switch(make_type)
-		if(CONE_WAFFLE)
-			if(ingredients[INGR_FLOUR] > 0 && ingredients[INGR_SUGAR] > 0)
-				var/amount = max( min(ingredients[INGR_FLOUR], ingredients[INGR_SUGAR]), 5)
-				ingredients[INGR_FLOUR] -= amount
-				ingredients[INGR_SUGAR] -= amount
-				ingredients[CONE_WAFFLE] += amount
-				visible_message("<span class='info'>[user] cooks up some waffle cones.</span>")
-			else
-				to_chat(user, "<span class='notice'>You require sugar and flour to make waffle cones.</span>")
-		if(CONE_CHOC)
-			if(ingredients[FLAVOUR_CHOCOLATE] > 0 && ingredients[CONE_WAFFLE] > 0)
-				var/amount = min(ingredients[CONE_WAFFLE], ingredients[FLAVOUR_CHOCOLATE])
-				ingredients[CONE_WAFFLE] -= amount
-				ingredients[FLAVOUR_CHOCOLATE] -= amount
-				ingredients[CONE_CHOC] += amount
-				visible_message("<span class='info'>[user] cooks up some chocolate cones.</span>")
-			else
-				to_chat(user, "<span class='notice'>You require waffle cones and chocolate flavouring to make chocolate cones.</span>")
-		if(ICECREAM_VANILLA)
-			if(ingredients[INGR_ICE] > 0 && ingredients[INGR_MILK] > 0)
-				var/amount = min(ingredients[INGR_ICE], ingredients[INGR_MILK])
-				ingredients[INGR_ICE] -= amount
-				ingredients[INGR_MILK] -= amount
-				ingredients[ICECREAM_VANILLA] += amount
-				visible_message("<span class='info'>[user] whips up some vanilla icecream.</span>")
-			else
-				to_chat(user, "<span class='notice'>You require milk and ice to make vanilla icecream.</span>")
-	updateDialog()
-
-/obj/machinery/icecream_vat/Topic(href, href_list)
-	if(..())
-		return
-	if(href_list["dispense"])
-		dispense_flavour = text2num(href_list["dispense"])
-		visible_message("<span class='notice'>[usr] sets [src] to dispense [get_icecream_flavour_string(dispense_flavour)] flavoured icecream.</span>")
-
-	if(href_list["cone"])
-		var/dispense_cone = text2num(href_list["cone"])
-		if(ingredients[dispense_cone] <= ingredients.len)
-			var/cone_name = get_icecream_flavour_string(dispense_cone)
-			if(ingredients[dispense_cone] >= 1)
-				ingredients[dispense_cone] -= 1
-				var/obj/item/reagent_containers/food/snacks/icecream/I = new(loc)
-				I.cone_type = cone_name
-				I.icon_state = "icecream_cone_[cone_name]"
-				I.desc = "Delicious [cone_name] cone, but no ice cream."
-				visible_message("<span class='info'>[usr] dispenses a crunchy [cone_name] cone from [src].</span>")
-			else
-				to_chat(usr, "<span class='warning'>There are no [cone_name] cones left!</span>")
-		updateDialog()
-
-	if(href_list["make"])
-		make( usr, text2num(href_list["make"]) )
-		updateDialog()
-
-	if(href_list["eject"])
-		if(held_container)
-			held_container.forceMove(loc)
-			held_container = null
-		updateDialog()
-
-	if(href_list["refresh"])
-		updateDialog()
-
-	if(href_list["close"])
-		usr.unset_machine()
-		usr << browse(null,"window=icecreamvat")
-	return
-
-/obj/machinery/icecream_vat/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-		new /obj/item/stack/sheet/metal(loc, 4)
-	qdel(src)
-
-
-/obj/item/reagent_containers/food/snacks/icecream
-	name = "ice cream cone"
-	desc = "Delicious waffle cone, but no ice cream."
-	icon = 'icons/obj/kitchen.dmi'
-	icon_state = "icecream_cone"
-	layer = 3.1
-	var/ice_creamed = 0
-	var/cone_type
-	bitesize = 3
-
-/obj/item/reagent_containers/food/snacks/icecream/New()
-	..()
-	create_reagents(20)
-	reagents.add_reagent("nutriment", 5)
-
-/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour)
-	var/flavour_name = get_icecream_flavour_string(flavour)
-	name = "[flavour_name] icecream"
-	overlays += "icecream_[flavour_name]"
-	desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream."
-	ice_creamed = 1
-
-#undef ICECREAM_VANILLA
-#undef FLAVOUR_CHOCOLATE
-#undef FLAVOUR_STRAWBERRY
-#undef FLAVOUR_BLUE
-#undef CONE_WAFFLE
-#undef CONE_CHOC
-#undef INGR_MILK
-#undef INGR_FLOUR
-#undef INGR_SUGAR
-#undef INGR_ICE
-#undef MUCK

code/modules/hydroponics/hydroponics.dm

@@ -978,7 +978,7 @@
 /obj/machinery/hydroponics/proc/spawnplant() // why would you put strange reagent in a hydro tray you monster I bet you also feed them blood
 	var/list/livingplants = list(/mob/living/simple_animal/hostile/tree, /mob/living/simple_animal/hostile/killertomato)
 	var/chosen = pick(livingplants)
-	var/mob/living/simple_animal/hostile/C = new chosen
+	var/mob/living/simple_animal/hostile/C = new chosen(get_turf(src))
 	C.faction = list("plants")
 
 /obj/machinery/hydroponics/proc/become_self_sufficient() // Ambrosia Gaia effect

code/modules/martial_arts/martial.dm

@@ -195,6 +195,9 @@
 	icon = 'icons/obj/library.dmi'
 	icon_state = "cqcmanual"
 
+/obj/item/CQC_manual/chef
+	desc = "A small, black manual. Written on the back it says: Bringing the home advantage with you."
+
 /obj/item/CQC_manual/attack_self(mob/living/carbon/human/user)
 	if(!istype(user) || !user)
 		return

code/modules/mob/emote.dm

@@ -135,7 +135,7 @@
 
 	if(message)
 		for(var/mob/M in GLOB.player_list)
-			if(istype(M, /mob/new_player))
+			if(isnewplayer(M))
 				continue
 
 			if(check_rights(R_ADMIN|R_MOD, 0, M) && M.get_preference(CHAT_DEAD)) // Show the emote to admins/mods

code/modules/mob/language.dm

@@ -767,17 +767,6 @@
 	desc = "Bark bark bark."
 	key = "vu"
 
-/datum/language/zombie
-	name = "Zombie"
-	desc = "BRAAAAAAINS!"
-	speech_verb = "moans"
-	whisper_verb = "mutters"
-	exclaim_verb = "wails"
-	colour = "zombie"
-	key = "zom"
-	flags = RESTRICTED
-	syllables = list("BRAAAAAAAAAAAAAAAAINS", "BRAAINS", "BRAINS")
-
 /mob/proc/grant_all_babel_languages()
 	for(var/la in GLOB.all_languages)
 		var/datum/language/new_language = GLOB.all_languages[la]

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

@@ -18,7 +18,7 @@
 		dna = new /datum/dna(null)
 		// Species name is handled by set_species()
 
-	..()
+	. = ..()
 
 	set_species(new_species, 1, delay_icon_update = 1, skip_same_check = TRUE)
 
@@ -68,55 +68,55 @@
 	status_flags = GODMODE|CANPUSH
 
 /mob/living/carbon/human/skrell/Initialize(mapload)
-	..(mapload, /datum/species/skrell)
+	. = ..(mapload, /datum/species/skrell)
 
 /mob/living/carbon/human/tajaran/Initialize(mapload)
-	..(mapload, /datum/species/tajaran)
+	. = ..(mapload, /datum/species/tajaran)
 
 /mob/living/carbon/human/vulpkanin/Initialize(mapload)
-	..(mapload, /datum/species/vulpkanin)
+	. = ..(mapload, /datum/species/vulpkanin)
 
 /mob/living/carbon/human/unathi/Initialize(mapload)
-	..(mapload, /datum/species/unathi)
+	. = ..(mapload, /datum/species/unathi)
 
 /mob/living/carbon/human/vox/Initialize(mapload)
-	..(mapload, /datum/species/vox)
+	. = ..(mapload, /datum/species/vox)
 
 /mob/living/carbon/human/voxarmalis/Initialize(mapload)
-	..(mapload, /datum/species/vox/armalis)
+	. = ..(mapload, /datum/species/vox/armalis)
 
 /mob/living/carbon/human/skeleton/Initialize(mapload)
-	..(mapload, /datum/species/skeleton)
+	. = ..(mapload, /datum/species/skeleton)
 
 /mob/living/carbon/human/kidan/Initialize(mapload)
-	..(mapload, /datum/species/kidan)
+	. = ..(mapload, /datum/species/kidan)
 
 /mob/living/carbon/human/plasma/Initialize(mapload)
-	..(mapload, /datum/species/plasmaman)
+	. = ..(mapload, /datum/species/plasmaman)
 
 /mob/living/carbon/human/slime/Initialize(mapload)
-	..(mapload, /datum/species/slime)
+	. = ..(mapload, /datum/species/slime)
 
 /mob/living/carbon/human/grey/Initialize(mapload)
-	..(mapload, /datum/species/grey)
+	. = ..(mapload, /datum/species/grey)
 
 /mob/living/carbon/human/abductor/Initialize(mapload)
-	..(mapload, /datum/species/abductor)
+	. = ..(mapload, /datum/species/abductor)
 
 /mob/living/carbon/human/diona/Initialize(mapload)
-	..(mapload, /datum/species/diona)
+	. = ..(mapload, /datum/species/diona)
 
 /mob/living/carbon/human/pod_diona/Initialize(mapload)
-	..(mapload, /datum/species/diona/pod)
+	. = ..(mapload, /datum/species/diona/pod)
 
 /mob/living/carbon/human/machine/Initialize(mapload)
-	..(mapload, /datum/species/machine)
+	. = ..(mapload, /datum/species/machine)
 
 /mob/living/carbon/human/machine/created
 	name = "Integrated Robotic Chassis"
 
 /mob/living/carbon/human/machine/created/Initialize(mapload)
-	..()
+	. = ..()
 	rename_character(null, "Integrated Robotic Chassis ([rand(1, 9999)])")
 	update_dna()
 	for(var/obj/item/organ/external/E in bodyparts)
@@ -129,34 +129,34 @@
 	death()
 
 /mob/living/carbon/human/shadow/Initialize(mapload)
-	..(mapload, /datum/species/shadow)
+	. = ..(mapload, /datum/species/shadow)
 
 /mob/living/carbon/human/golem/Initialize(mapload)
-	..(mapload, /datum/species/golem)
+	. = ..(mapload, /datum/species/golem)
 
 /mob/living/carbon/human/wryn/Initialize(mapload)
-	..(mapload, /datum/species/wryn)
+	. = ..(mapload, /datum/species/wryn)
 
 /mob/living/carbon/human/nucleation/Initialize(mapload)
-	..(mapload, /datum/species/nucleation)
+	. = ..(mapload, /datum/species/nucleation)
 
 /mob/living/carbon/human/drask/Initialize(mapload)
-	..(mapload, /datum/species/drask)
+	. = ..(mapload, /datum/species/drask)
 
 /mob/living/carbon/human/monkey/Initialize(mapload)
-	..(mapload, /datum/species/monkey)
+	. = ..(mapload, /datum/species/monkey)
 
 /mob/living/carbon/human/farwa/Initialize(mapload)
-	..(mapload, /datum/species/monkey/tajaran)
+	. = ..(mapload, /datum/species/monkey/tajaran)
 
 /mob/living/carbon/human/wolpin/Initialize(mapload)
-	..(mapload, /datum/species/monkey/vulpkanin)
+	. = ..(mapload, /datum/species/monkey/vulpkanin)
 
 /mob/living/carbon/human/neara/Initialize(mapload)
-	..(mapload, /datum/species/monkey/skrell)
+	. = ..(mapload, /datum/species/monkey/skrell)
 
 /mob/living/carbon/human/stok/Initialize(mapload)
-	..(mapload, /datum/species/monkey/unathi)
+	. = ..(mapload, /datum/species/monkey/unathi)
 
 /mob/living/carbon/human/Stat()
 	..()

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

@@ -7,7 +7,7 @@
 	species_exception = list(/datum/species/monkey)
 
 /mob/living/carbon/human/monkey/punpun/Initialize(mapload)
-	..()
+	. = ..()
 	name = "Pun Pun"
 	real_name = name
 	equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)

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

@@ -53,7 +53,6 @@
 	var/stun_mod = 1	 // If a species is more/less impacated by stuns/weakens/paralysis
 	var/speed_mod = 0	// this affects the race's speed. positive numbers make it move slower, negative numbers make it move faster
 	var/blood_damage_type = OXY //What type of damage does this species take if it's low on blood?
-	var/obj/item/mutanthands
 	var/total_health = 100
 	var/punchdamagelow = 0       //lowest possible punch damage
 	var/punchdamagehigh = 9      //highest possible punch damage

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

@@ -1,102 +0,0 @@
-#define REGENERATION_DELAY 60  // After taking damage, how long it takes for automatic regeneration to begin
-
-/datum/species/zombie
-	// 1spooky
-	name = "High-Functioning Zombie"
-	name_plural = "High-Functioning Zombies"
-	icobase = 'icons/mob/human_races/r_zombie.dmi'
-	deform = 'icons/mob/human_races/r_def_zombie.dmi'
-	dies_at_threshold = TRUE
-	language = "Zombie"
-	species_traits = list(NO_BLOOD, NOZOMBIE, NOTRANSSTING, NO_BREATHE, RADIMMUNE, NO_SCAN)
-	var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')
-	warning_low_pressure = -1
-	hazard_low_pressure = -1
-	hazard_high_pressure = 999999999
-	warning_high_pressure = 999999999
-	cold_level_1 = -1
-	cold_level_2 = -1
-	cold_level_3 = -1
-	tox_mod = 0
-	flesh_color = "#00FF00" // for green examine text
-	bodyflags = HAS_SKIN_COLOR
-	dietflags = DIET_CARN
-	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
-		"liver" =    /obj/item/organ/internal/liver,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
-		"appendix" = /obj/item/organ/internal/appendix,
-		"eyes" =     /obj/item/organ/internal/eyes,
-		"ears" = 	/obj/item/organ/internal/ears)
-
-
-/datum/species/zombie/infectious
-	name = "Infectious Zombie"
-	mutanthands = /obj/item/zombie_hand
-	icobase = 'icons/mob/human_races/r_zombie.dmi'
-	deform = 'icons/mob/human_races/r_def_zombie.dmi'
-	brute_mod = 0.8    // 120 damage to KO a zombie, which kills it
-	burn_mod = 0.8
-	clone_mod = 0.8
-	brain_mod = 0.8
-	stamina_mod = 0.8
-	speed_mod = 1.6
-	default_language = "Zombie"
-	var/heal_rate = 1
-	var/regen_cooldown = 0
-
-/datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H, amount)
-	. = min(20, amount)
-
-/datum/species/zombie/infectious/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = 0, obj/used_weapon = null)
-	. = ..()
-	if(damage)
-		regen_cooldown = world.time + REGENERATION_DELAY
-
-/datum/species/zombie/infectious/handle_life(mob/living/carbon/human/H)
-	. = ..()
-	H.a_intent = INTENT_HARM // THE SUFFERING MUST FLOW
-
-	//Zombies never actually die, they just fall down until they regenerate enough to rise back up.
-	//They must be restrained, beheaded or gibbed to stop being a threat.
-	if(regen_cooldown < world.time)
-		var/heal_amt = heal_rate
-		if(H.InCritical())
-			heal_amt *= 2
-		H.heal_overall_damage(heal_amt,heal_amt)
-		H.adjustToxLoss(-heal_amt)
-	if(!H.InCritical() && prob(4))
-		playsound(H, pick(spooks), 50, TRUE, 10)
-
-//Congrats you somehow died so hard you stopped being a zombie
-/datum/species/zombie/infectious/handle_death(gibbed, mob/living/carbon/C)
-	. = ..()
-	var/obj/item/organ/internal/zombie_infection/infection
-	infection = C.get_organ_slot("zombie_infection")
-	if(infection)
-		qdel(infection)
-
-/datum/species/zombie/infectious/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
-	. = ..()
-	// Deal with the source of this zombie corruption
-	//  Infection organ needs to be handled separately from mutant_organs
-	//  because it persists through species transitions
-	if(mutanthands)
-		H.drop_l_hand()
-		H.drop_r_hand()
-		H.put_in_hands(new mutanthands())
-		H.put_in_hands(new mutanthands())
-	var/obj/item/organ/internal/zombie_infection/infection
-	infection = H.get_organ_slot("zombie_infection")
-	if(!infection)
-		infection = new()
-		infection.insert(H)
-
-/datum/species/zombie/infectious/on_species_loss(mob/living/carbon/human/C, datum/species/old_species)
-	QDEL_NULL(C.r_hand)
-	QDEL_NULL(C.l_hand)
-	return ..()
-
-#undef REGENERATION_DELAY

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

@@ -276,7 +276,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
 
 /mob/living/silicon/ai/proc/show_borg_info()
 	stat(null, text("Connected cyborgs: [connected_robots.len]"))
-	for(var/mob/living/silicon/robot/R in connected_robots)
+	for(var/thing in connected_robots)
+		var/mob/living/silicon/robot/R = thing
 		var/robot_status = "Nominal"
 		if(R.stat || !R.client)
 			robot_status = "OFFLINE"
@@ -284,8 +285,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
 			robot_status = "DEPOWERED"
 		// Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
 		var/area/A = get_area(R)
+		var/area_name = A ? sanitize(A.name) : "Unknown"
 		stat(null, text("[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge] / [R.cell.maxcharge]" : "Empty"] | \
-		Module: [R.designation] | Loc: [sanitize(A.name)] | Status: [robot_status]"))
+		Module: [R.designation] | Loc: [area_name] | Status: [robot_status]"))
 
 /mob/living/silicon/ai/rename_character(oldname, newname)
 	if(!..(oldname, newname))

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

@@ -14,6 +14,7 @@
 	braintype = "Robot"
 	lawupdate = 0
 	density = 0
+	has_camera = FALSE
 	req_one_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
 	ventcrawler = 2
 	magpulse = 1

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

@@ -85,6 +85,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/lockcharge //Used when locking down a borg to preserve cell charge
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
+	var/has_camera = TRUE
 	var/pdahide = 0 //Used to hide the borg from the messenger list
 	var/tracking_entities = 0 //The number of known entities currently accessing the internal camera
 	var/braintype = "Cyborg"
@@ -135,7 +136,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 
 	init()
 
-	if(!camera && (!scrambledcodes || designation == "ERT"))
+	if(has_camera && !camera)
 		camera = new /obj/machinery/camera(src)
 		camera.c_tag = real_name
 		camera.network = list("SS13","Robots")
@@ -1402,6 +1403,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	designation = "SpecOps"
 	lawupdate = 0
 	scrambledcodes = 1
+	has_camera = FALSE
 	req_one_access = list(ACCESS_CENT_SPECOPS)
 	ionpulse = 1
 	magpulse = 1
@@ -1490,6 +1492,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	designation = "Destroyer"
 	lawupdate = 0
 	scrambledcodes = 1
+	has_camera = FALSE
 	req_one_access = list(ACCESS_CENT_SPECOPS)
 	ionpulse = 1
 	magpulse = 1

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

@@ -3,6 +3,7 @@
 	icon_state = "syndie_bloodhound"
 	lawupdate = 0
 	scrambledcodes = 1
+	has_camera = FALSE
 	pdahide = 1
 	faction = list("syndicate")
 	bubble_icon = "syndibot"

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

@@ -33,7 +33,7 @@
 /obj/machinery/bot_core/honkbot
 	req_one_access = list(ACCESS_CLOWN, ACCESS_ROBOTICS, ACCESS_MIME)
 
-/mob/living/simple_animal/bot/honkbot/Initialize()
+/mob/living/simple_animal/bot/honkbot/Initialize(mapload)
 	. = ..()
 	update_icon()
 	auto_patrol = TRUE

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

@@ -103,9 +103,9 @@
 	name = "Space Wizard Corpse"
 	outfit = /datum/outfit/wizardcorpse
 
-/obj/effect/mob_spawn/human/corpse/clownoff/Initialize()
+/obj/effect/mob_spawn/human/corpse/clownoff/Initialize(mapload)
 	mob_name = "[pick(GLOB.wizard_first)], [pick(GLOB.wizard_second)]"
-	..()
+	. = ..()
 
 /datum/outfit/wizardcorpse
 	name = "Space Wizard Corpse"

code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm

@@ -534,7 +534,7 @@ obj/effect/temp_visual/fireball
 	duration = 9
 	pixel_z = 270
 
-/obj/effect/temp_visual/fireball/Initialize()
+/obj/effect/temp_visual/fireball/Initialize(mapload)
 	. = ..()
 	animate(src, pixel_z = 0, time = duration)
 

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

@@ -48,8 +48,8 @@
 	var/attempt_open = 0
 
 // Pickup loot
-/mob/living/simple_animal/hostile/mimic/crate/Initialize()
-	..()
+/mob/living/simple_animal/hostile/mimic/crate/Initialize(mapload)
+	. = ..()
 	for(var/obj/item/I in loc)
 		I.loc = src
 

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

@@ -31,7 +31,7 @@
 	deathmessage = "wails as its form turns into a pulpy mush."
 	death_sound = 'sound/voice/hiss6.ogg'
 
-/mob/living/simple_animal/hostile/netherworld/migo/Initialize()
+/mob/living/simple_animal/hostile/netherworld/migo/Initialize(mapload)
 	. = ..()
 	migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/voice/bcreep.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/mpatchedup.ogg', 'sound/voice/mfeelbetter.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heartbeat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/goonstation/effects/screech.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/goonstation/misc/airraid_loop.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/chainsaw.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gunshots/gunshot_silenced.ogg', 'sound/weapons/gunshots/gunshot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlock_close.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlock_open.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/outbreak5.ogg', 'sound/ai/outbreak7.ogg', 'sound/ai/poweroff.ogg', 'sound/ai/radiation.ogg', 'sound/ai/shuttlecalled.ogg', 'sound/ai/shuttledock.ogg', 'sound/ai/shuttlerecalled.ogg', 'sound/ai/aimalf.ogg', 'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen3.ogg', 'sound/ambience/ambigen4.ogg', 'sound/ambience/ambigen5.ogg', 'sound/ambience/ambigen6.ogg', 'sound/ambience/ambigen10.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg') //hahahaha fuck you code divers
 
@@ -82,14 +82,14 @@
 
 /obj/structure/spawner/nether/examine(mob/user)
 	. = ..()
-	if(isskeleton(user) || iszombie(user))
+	if(isskeleton(user))
 		. += "A direct link to another dimension full of creatures very happy to see you. <span class='nicegreen'>You can see your house from here!</span>"
 	else
 		. += "A direct link to another dimension full of creatures not very happy to see you. <span class='warning'>Entering the link would be a very bad idea.</span>"
 
 /obj/structure/spawner/nether/attack_hand(mob/user)
 	. = ..()
-	if(isskeleton(user) || iszombie(user))
+	if(isskeleton(user))
 		to_chat(user, "<span class='notice'>You don't feel like going home yet...</span>")
 	else
 		user.visible_message("<span class='warning'>[user] is violently pulled into the link!</span>", \

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

@@ -260,7 +260,7 @@
 	alert_on_shield_breach = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize(mapload)
-	..()
+	. = ..()
 	if(prob(50))
 		// 50% chance of switching to extremely dangerous ranged variant
 		melee_damage_lower = 10

code/modules/mob/mob.dm

@@ -23,7 +23,7 @@
 	LAssailant = null
 	return ..()
 
-/mob/Initialize()
+/mob/Initialize(mapload)
 	GLOB.mob_list += src
 	if(stat == DEAD)
 		GLOB.dead_mob_list += src
@@ -31,7 +31,7 @@
 		GLOB.alive_mob_list += src
 	set_focus(src)
 	prepare_huds()
-	..()
+	. = ..()
 
 /atom/proc/prepare_huds()
 	hud_list = list()
@@ -752,7 +752,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
 
 	if(client.holder && (client.holder.rights & R_ADMIN))
 		is_admin = 1
-	else if(stat != DEAD || istype(src, /mob/new_player))
+	else if(stat != DEAD || isnewplayer(src))
 		to_chat(usr, "<span class='notice'>You must be observing to use this!</span>")
 		return
 
@@ -1297,8 +1297,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
 	.["Add Organ"] = "?_src_=vars;addorgan=[UID()]"
 	.["Remove Organ"] = "?_src_=vars;remorgan=[UID()]"
 
-	.["Fix NanoUI"] = "?_src_=vars;fix_nano=[UID()]"
-
 	.["Add Verb"] = "?_src_=vars;addverb=[UID()]"
 	.["Remove Verb"] = "?_src_=vars;remverb=[UID()]"
 

code/modules/mob/mob_grab.dm

@@ -434,7 +434,7 @@
 	if(affecting)
 		if(!affecting.buckled)
 			affecting.pixel_x = 0
-			affecting.pixel_y = 0 //used to be an animate, not quick enough for del'ing
+			affecting.pixel_y = 0 //used to be an animate, not quick enough for qdel'ing
 			affecting.layer = initial(affecting.layer)
 		affecting.grabbed_by -= src
 		affecting = null

code/modules/mob/mob_helpers.dm

@@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM
 				name = realname
 
 	for(var/mob/M in GLOB.player_list)
-		if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || check_rights(R_ADMIN|R_MOD,0,M)) && M.get_preference(CHAT_DEAD))
+		if(M.client && ((!isnewplayer(M) && M.stat == DEAD) || check_rights(R_ADMIN|R_MOD,0,M)) && M.get_preference(CHAT_DEAD))
 			var/follow
 			var/lname
 			if(subject)

code/modules/mob/mob_transformation_simple.dm

@@ -4,7 +4,7 @@
 //Note that this proc does NOT do MMI related stuff!
 /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/forcekey = 0)
 
-	if(istype(src,/mob/new_player))
+	if(isnewplayer(src))
 		to_chat(usr, "<span class='warning'>cannot convert players who have not entered yet.</span>")
 		return
 

code/modules/mob/new_player/new_player.dm

@@ -12,8 +12,13 @@
 	stat = 2
 	canmove = 0
 
-/mob/new_player/New()
+/mob/new_player/Initialize(mapload)
+	SHOULD_CALL_PARENT(FALSE)
+	if(initialized)
+		stack_trace("Warning: [src]([type]) initialized multiple times!")
+	initialized = TRUE
 	GLOB.mob_list += src
+	return INITIALIZE_HINT_NORMAL
 
 /mob/new_player/verb/new_player_panel()
 	set src = usr
@@ -205,6 +210,7 @@
 			if(!client.holder && !config.antag_hud_allowed)           // For new ghosts we remove the verb from even showing up if it's not allowed.
 				observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD        // Poor guys, don't know what they are missing!
 			observer.key = key
+			QDEL_NULL(mind)
 			GLOB.respawnable_list += observer
 			qdel(src)
 			return 1

code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

@@ -48,7 +48,7 @@
 	var/gender = NEUTER	//Determines if the accessory will be skipped or included in random hair generations
 
 	// Restrict some styles to specific species
-	var/list/species_allowed = list("Human", "Slime People", "Infectious Zombie", "High-Functioning Zombie")
+	var/list/species_allowed = list("Human", "Slime People")
 	var/list/sprite_sheets = list() //For accessories common across species but need to use 'fitted' sprites (like underwear). e.g. list("Vox" = 'icons/mob/species/vox/iconfile.dmi')
 	var/list/models_allowed = list() //Specifies which, if any, hairstyles or markings can be accessed by which prosthetics. Should equal the manufacturing company name in robolimbs.dm.
 	var/list/heads_allowed = null //Specifies which, if any, alt heads a head marking, hairstyle or facial hair style is compatible with.

code/modules/power/apc.dm

@@ -70,7 +70,6 @@
 	var/locked = 1
 	var/coverlocked = 1
 	var/aidisabled = 0
-	var/tdir = null
 	var/obj/machinery/power/terminal/terminal = null
 	var/lastused_light = 0
 	var/lastused_equip = 0
@@ -155,15 +154,12 @@
 	GLOB.apcs = sortAtom(GLOB.apcs)
 
 	wires = new(src)
-	// offset 24 pixels in direction of dir
-	// this allows the APC to be embedded in a wall, yet still inside an area
-	if(building)
-		setDir(direction) // We set this to direction only for pixel location determination.
-
-	set_pixel_offsets_from_dir(24, -24, 24, -24) // Set pixel offsets based on `dir`
-	setDir(SOUTH) // APC's should always appear to *face* south.
 
 	if(building)
+		// Offset 24 pixels in direction of dir. This allows the APC to be embedded in a wall, yet still inside an area
+		setDir(direction) // This is only used for pixel offsets, and later terminal placement. APC dir doesn't affect its sprite since it only has one orientation.
+		set_pixel_offsets_from_dir(24, -24, 24, -24)
+
 		area = get_area(src)
 		area.apc |= src
 		opened = 1
@@ -193,8 +189,8 @@
 /obj/machinery/power/apc/proc/make_terminal()
 	// create a terminal object at the same position as original turf loc
 	// wires will attach to this
-	terminal = new/obj/machinery/power/terminal(src.loc)
-	terminal.setDir(tdir)
+	terminal = new/obj/machinery/power/terminal(get_turf(src))
+	terminal.setDir(dir)
 	terminal.master = src
 
 /obj/machinery/power/apc/Initialize(mapload)

code/modules/projectiles/guns/magic/staff.dm

@@ -58,8 +58,6 @@
 	ammo_type = /obj/item/ammo_casing/magic/slipping
 	icon_state = "staffofslipping"
 	item_state = "staffofslipping"
-	max_charges = 10
-	recharge_rate = 2
 	fire_sound = 'sound/items/bikehorn.ogg'
 
 /obj/item/gun/magic/staff/slipping/honkmother

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -226,37 +226,6 @@
 		if(B && islist(B.data) && !data)
 			data = B.data.Copy()
 
-/datum/reagent/romerol
-	name = "romerol"
-	// the REAL zombie powder
-	id = "romerol"
-	description = "Romerol is a highly experimental bioterror agent \
-		which causes dormant nodules to be etched into the grey matter of \
-		the subject. These nodules only become active upon death of the \
-		host, upon which, the secondary structures activate and take control \
-		of the host body."
-	color = "#123524" // RGB (18, 53, 36)
-	metabolization_rate = INFINITY
-	can_synth = FALSE
-	taste_description = "CAAAARL"
-
-/datum/reagent/romerol/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume)
-	if(!istype(H))
-		return
-	// Silently add the zombie infection organ to be activated upon death
-	if(!H.get_organ_slot("zombie_infection"))
-		var/obj/item/organ/internal/zombie_infection/nodamage/ZI = new()
-		ZI.insert(H)
-	..()
-
-/datum/reagent/romerol/on_mob_life(mob/living/M)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(!H.get_organ_slot("zombie_infection"))
-			var/obj/item/organ/internal/zombie_infection/nodamage/ZI = new()
-			ZI.insert(H)
-	return ..()
-
 /datum/reagent/uranium
 	name ="Uranium"
 	id = "uranium"

code/modules/reagents/reagent_containers/bottle.dm

@@ -12,11 +12,6 @@
 	container_type = OPENCONTAINER
 	volume = 30
 
-/obj/item/reagent_containers/glass/bottle/romerol
-	name = "romerol bottle"
-	desc = "A small bottle of Romerol. The REAL zombie powder."
-	list_reagents = list("romerol" = 30)
-	
 /obj/item/reagent_containers/glass/bottle/on_reagent_change()
 	update_icon()
 

code/modules/research/designs/medical_designs.dm

@@ -371,7 +371,7 @@
 	name = "X-Ray implant"
 	desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
 	id = "ci-xray"
-	req_tech = list("materials" = 7, "programming" = 5, "biotech" = 7, "magnets" = 5,"plasmatech" = 6)
+	req_tech = list("materials" = 7, "programming" = 5, "biotech" = 8, "magnets" = 5,"plasmatech" = 6)
 	build_type = PROTOLATHE | MECHFAB
 	construction_time = 60
 	materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_URANIUM = 1000, MAT_DIAMOND = 1000, MAT_BLUESPACE = 1000)

code/modules/shuttle/emergency.dm

@@ -178,8 +178,6 @@
 			continue
 		if(player.stat == DEAD)  // Corpses
 			continue
-		if(iszombie(player))  // Walking corpses
-			continue
 		if(issilicon(player)) //Borgs are technically dead anyways
 			continue
 		if(isanimal(player)) //Poly does not own the shuttle

code/modules/spacepods/spacepod.dm

@@ -973,7 +973,7 @@
 			var/obj/I = pick(true_contents)
 			if(user.put_in_any_hand_if_possible(I))
 				src.contents -= I
-				to_chat(user, "<span class='notice'>You find a [I] [pick("under the seat", "under the console", "in the mainenance access")]!</span>")
+				to_chat(user, "<span class='notice'>You find a [I] [pick("under the seat", "under the console", "in the maintenance access")]!</span>")
 			else
 				to_chat(user, "<span class='notice'>You think you saw something shiny, but you can't reach it!</span>")
 		else

code/modules/surgery/organs/augments_eyes.dm

@@ -62,7 +62,7 @@
 	name = "X-ray implant"
 	desc = "These cybernetic eye implants will give you X-ray vision. Blinking is futile."
 	implant_color = "#000000"
-	origin_tech = "materials=4;programming=4;biotech=6;magnets=4"
+	origin_tech = "materials=4;programming=4;biotech=7;magnets=4"
 	vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE

code/modules/zombie/items.dm

@@ -1,69 +0,0 @@
-/obj/item/zombie_hand
-	name = "zombie claw"
-	desc = "A zombie's claw is its primary tool, capable of infecting \
-		unconscious or dead humans, butchering all other living things to \
-		sustain the zombie, forcing open airlock doors and opening \
-		child-safe caps on bottles."
-	flags = NODROP|ABSTRACT|DROPDEL
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "bloodhand_left"
-	var/icon_left = "bloodhand_left"
-	var/icon_right = "bloodhand_right"
-	hitsound = 'sound/hallucinations/growl1.ogg'
-	force = 21 // Just enough to break airlocks with melee attacks
-	damtype = "brute"
-
-/obj/item/zombie_hand/equipped(mob/user, slot)
-	. = ..()
-	switch(slot)
-		// Yes, these intentionally don't match
-		if(slot_l_hand)
-			icon_state = icon_right
-		if(slot_r_hand)
-			icon_state = icon_left
-
-/obj/item/zombie_hand/afterattack(atom/target, mob/user, proximity_flag)
-	. = ..()
-	if(!proximity_flag)
-		return
-
-	else if(isliving(target))
-		if(ishuman(target))
-			try_to_zombie_infect(target)
-		else
-			check_feast(target, user)
-
-/proc/try_to_zombie_infect(mob/living/carbon/human/target)
-	CHECK_DNA_AND_SPECIES(target)
-
-	if(NOZOMBIE in target.dna.species.species_traits)
-		// cannot infect any NOZOMBIE subspecies (such as high functioning
-		// zombies)
-		return
-
-	var/obj/item/organ/internal/zombie_infection/infection
-	infection = target.get_organ_slot("zombie_infection")
-	if(!infection)
-		infection = new()
-		infection.insert(target)
-
-/obj/item/zombie_hand/proc/check_feast(mob/living/target, mob/living/user)
-	if(target.stat == DEAD)
-		var/hp_gained = target.maxHealth
-		target.gib()
-		user.adjustBruteLoss(-hp_gained, FALSE)
-		user.adjustToxLoss(-hp_gained, FALSE)
-		user.adjustFireLoss(-hp_gained, FALSE)
-		user.adjustCloneLoss(-hp_gained, FALSE)
-		user.adjustBrainLoss(-hp_gained, FALSE) // Zom Bee gibbers "BRAAAAISNSs!1!"
-		user.updatehealth()
-
-/obj/item/zombie_hand/suicide_act(mob/living/carbon/human/user)
-	user.visible_message("<span class='suicide'>[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	if(ishuman(user))
-		var/mob/living/carbon/human/L = user
-		var/obj/item/organ/external/O = L.get_organ("head")
-		if(O)
-			O.droplimb()
-	return (BRUTELOSS)

code/modules/zombie/organs.dm

@@ -1,99 +0,0 @@
-/obj/item/organ/internal/zombie_infection
-	name = "festering ooze"
-	desc = "A black web of pus and viscera."
-	parent_organ = "head"
-	slot = "zombie_infection"
-	icon_state = "blacktumor"
-	var/causes_damage = TRUE
-	var/datum/species/old_species = /datum/species/human
-	var/living_transformation_time = 30
-	var/converts_living = FALSE
-
-	var/revive_time_min = 450
-	var/revive_time_max = 700
-	var/timer_id
-
-/obj/item/organ/internal/zombie_infection/New(mob/living/carbon/holder)
-	..()
-	GLOB.zombie_infection_list += src
-
-/obj/item/organ/internal/zombie_infection/Destroy()
-	GLOB.zombie_infection_list -= src
-	. = ..()
-
-/obj/item/organ/internal/zombie_infection/insert(mob/living/carbon/human/M, special = 0)
-	..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/organ/internal/zombie_infection/remove(mob/living/carbon/human/M, special = 0)
-	STOP_PROCESSING(SSobj, src)
-	if(iszombie(M) && old_species)
-		M.set_species(old_species, retain_damage = TRUE)
-	if(timer_id)
-		deltimer(timer_id)
-	. = ..()
-
-/obj/item/organ/internal/zombie_infection/on_find(mob/living/finder)
-	to_chat(finder, "<span class='warning'>Inside the head is a disgusting black \
-		web of pus and viscera, bound tightly around the brain like some \
-		biological harness.</span>")
-
-/obj/item/organ/internal/zombie_infection/process()
-	if(!owner)
-		return
-	if(!(src in owner.internal_organs))
-		remove(owner)
-	if(causes_damage && !iszombie(owner) && owner.stat != DEAD)
-		owner.adjustToxLoss(1)
-		if (prob(10))
-			to_chat(owner, "<span class='danger'>You feel sick...</span>")
-	if(timer_id)
-		return
-	if(owner.suiciding)
-		return
-	if(owner.stat != DEAD && !converts_living)
-		return
-	if(!owner.get_int_organ(/obj/item/organ/internal/brain))
-		return
-	if(!iszombie(owner))
-		to_chat(owner, "<span class='cultlarge'>You can feel your heart stopping, but something isn't right... \
-		life has not abandoned your broken form. You can only feel a deep and immutable hunger that \
-		not even death can stop, you will rise again!</span>")
-	var/revive_time = rand(revive_time_min, revive_time_max)
-	var/flags = TIMER_STOPPABLE
-	timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags)
-
-/obj/item/organ/internal/zombie_infection/proc/zombify()
-	timer_id = null
-
-	if(!converts_living && owner.stat != DEAD)
-		return
-
-	if(!iszombie(owner))
-		old_species = owner.dna.species.type
-		owner.set_species(/datum/species/zombie/infectious)
-		for(var/datum/disease/critical/crit in owner.viruses) // cure any new crit viruses
-			crit.cure(0)
-
-	var/stand_up = (owner.stat == DEAD) || (owner.stat == UNCONSCIOUS)
-	//Fully heal the zombie's damage the first time they rise
-	owner.setToxLoss(0)
-	owner.setOxyLoss(0)
-	owner.setBrainLoss(0)
-	owner.setCloneLoss(0)
-	owner.SetLoseBreath(0)
-	owner.heal_overall_damage(INFINITY, INFINITY, TRUE, TRUE, FALSE)
-	owner.setStaminaLoss(0)
-
-	if(!owner.update_revive())
-		return
-
-	owner.grab_ghost()
-	owner.visible_message("<span class='danger'>[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!</span>", "<span class='alien'>You HUNGER!</span>")
-	playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, TRUE)
-	owner.do_jitter_animation(living_transformation_time)
-	owner.Stun(living_transformation_time * 0.05)
-	to_chat(owner, "<span class='alertalien'>You are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm your zombie brethren and spread the disease by killing others. You are a creature of hunger and violence.</span>")
-
-/obj/item/organ/internal/zombie_infection/nodamage
-	causes_damage = FALSE

paradise.dme

@@ -1561,7 +1561,6 @@
 #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\grill_new.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat_2.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\juicer.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\kitchen_machine.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
@@ -1841,7 +1840,6 @@
 #include "code\modules\mob\living\carbon\human\species\vox.dm"
 #include "code\modules\mob\living\carbon\human\species\vulpkanin.dm"
 #include "code\modules\mob\living\carbon\human\species\wryn.dm"
-#include "code\modules\mob\living\carbon\human\species\zombies.dm"
 #include "code\modules\mob\living\silicon\death.dm"
 #include "code\modules\mob\living\silicon\emote.dm"
 #include "code\modules\mob\living\silicon\laws.dm"
@@ -2492,8 +2490,6 @@
 #include "code\modules\vehicle\speedbike.dm"
 #include "code\modules\vehicle\sportscar.dm"
 #include "code\modules\vehicle\vehicle.dm"
-#include "code\modules\zombie\items.dm"
-#include "code\modules\zombie\organs.dm"
 #include "goon\code\datums\browserOutput.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"

tgui/docs/tutorial-and-examples.md

@@ -37,7 +37,7 @@ powerful interactions for embedded objects or remote access.
 Let's start with a very basic hello world.
 
 ```dm
-/obj/machinery/my_machine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = default_state)
+/obj/machinery/my_machine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
   ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
   if(!ui)
     ui = new(user, src, ui_key, "my_machine", name, 300, 300, master_ui, state)
@@ -294,7 +294,7 @@ here's what you need (note that you'll probably be forced to clean your shit up
 upon code review):
 
 ```dm
-/obj/copypasta/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) // Remember to use the appropriate state.
+/obj/copypasta/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) // Remember to use the appropriate state.
   ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
   if(!ui)
     ui = new(user, src, ui_key, "copypasta", name, 300, 300, master_ui, state)