Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281

code/__DEFINES/components.dm

@@ -70,7 +70,7 @@
 #define COMSIG_ATOM_CANREACH "atom_can_reach"					//from internal loop in atom/movable/proc/CanReach(): (list/next)
 	#define COMPONENT_BLOCK_REACH 1
 #define COMSIG_ATOM_SCREWDRIVER_ACT "atom_screwdriver_act"		//from base of atom/screwdriver_act(): (mob/living/user, obj/item/I)
-#define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"		//called when teleporting into a protected turf: (channel, turf/origin)
+#define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"		//called when teleporting into a protected turf: (channel, turf/origin, turf/destination)
 	#define COMPONENT_BLOCK_TELEPORT 1
 /////////////////
 #define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost"			//from base of atom/attack_ghost(): (mob/dead/observer/ghost)
@@ -118,6 +118,7 @@
 #define COMSIG_MOVABLE_Z_CHANGED "movable_ztransit" 			//from base of atom/movable/onTransitZ(): (old_z, new_z)
 #define COMSIG_MOVABLE_HEAR "movable_hear"						//from base of atom/movable/Hear(): (message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
 #define COMSIG_MOVABLE_DISPOSING "movable_disposing"			//called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source)
+#define COMSIG_MOVABLE_TELEPORTED "movable_teleported"			//from base of do_teleport(): (channel, turf/origin, turf/destination)
 
 // /mind signals
 #define  COMSIG_MIND_TRANSFER "mind_transfer"					//from base of mind/transfer_to(): (new_character, old_character)
@@ -154,6 +155,7 @@
 #define COMSIG_LIVING_EXTINGUISHED "living_extinguished"		//from base of mob/living/ExtinguishMob() (/mob/living)
 #define COMSIG_LIVING_ELECTROCUTE_ACT "living_electrocute_act"		//from base of mob/living/electrocute_act(): (shock_damage)
 #define COMSIG_LIVING_MINOR_SHOCK "living_minor_shock"			//sent by stuff like stunbatons and tasers: ()
+#define COMSIG_LIVING_GUN_PROCESS_FIRE "living_gun_process_fire"	//from base of /obj/item/gun/proc/process_fire(): (atom/target, params, zone_override)
 
 // /mob/living/carbon signals
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))

code/__HELPERS/roundend.dm

@@ -534,10 +534,12 @@
 	return parts.Join()
 
 
-/proc/printobjectives(datum/mind/ply)
+/proc/printobjectives(list/objectives)
+	if(!objectives || !objectives.len)
+		return
 	var/list/objective_parts = list()
 	var/count = 1
-	for(var/datum/objective/objective in ply.objectives)
+	for(var/datum/objective/objective in objectives)
 		if(objective.check_completion())
 			objective_parts += "<b>Objective #[count]</b>: [objective.explanation_text] <span class='greentext'>Success!</span>"
 		else

code/__HELPERS/unsorted.dm

@@ -759,7 +759,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
 	/obj/item/pipe)))
 
 /proc/can_embed(obj/item/W)
-	if(W.is_sharp())
+	if(W.get_sharpness())
 		return 1
 	if(is_pointed(W))
 		return 1

code/_onclick/item_attack.dm

@@ -47,7 +47,7 @@
 			if(do_mob(user, src, butchering.speed) && Adjacent(I))
 				butchering.Butcher(user, src)
 			return 1
-		else if(I.is_sharp() && !butchering) //give sharp objects butchering functionality, for consistency
+		else if(I.get_sharpness() && !butchering) //give sharp objects butchering functionality, for consistency
 			I.AddComponent(/datum/component/butchering, 80 * I.toolspeed)
 			attackby(I, user, params) //call the attackby again to refresh and do the butchering check again
 			return

code/controllers/subsystem/chat.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(chat)
 	name = "Chat"
-	flags = SS_TICKER|SS_NO_INIT
+	flags = SS_TICKER
 	wait = 1
 	priority = FIRE_PRIORITY_CHAT
 	init_order = INIT_ORDER_CHAT

code/controllers/subsystem/shuttle.dm

@@ -37,6 +37,7 @@ SUBSYSTEM_DEF(shuttle)
 	var/points = 5000					//number of trade-points we have
 	var/centcom_message = ""			//Remarks from CentCom on how well you checked the last order.
 	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentCom, associated with their potencies
+	var/passive_supply_points_per_minute = 750
 
 	var/list/supply_packs = list()
 	var/list/shoppinglist = list()
@@ -111,6 +112,12 @@ SUBSYSTEM_DEF(shuttle)
 				qdel(T, force=TRUE)
 	CheckAutoEvac()
 
+	//Cargo stuff start
+	var/fire_time_diff = max(0, world.time - last_fire)		//Don't want this to be below 0, seriously.
+	var/point_gain = (fire_time_diff / 600) * passive_supply_points_per_minute
+	points += point_gain
+	//Cargo stuff end
+
 	if(!SSmapping.clearing_reserved_turfs)
 		while(transit_requesters.len)
 			var/requester = popleft(transit_requesters)

code/datums/action.dm

@@ -245,6 +245,14 @@
 /datum/action/item_action/toggle_helmet_light
 	name = "Toggle Helmet Light"
 
+/datum/action/item_action/toggle_welding_screen
+	name = "Toggle Welding Screen"
+
+/datum/action/item_action/toggle_welding_screen/Trigger()
+	var/obj/item/clothing/head/hardhat/weldhat/H = target
+	if(istype(H))
+		H.toggle_welding_screen(owner)
+
 /datum/action/item_action/toggle_headphones
 	name = "Toggle Headphones"
 	desc = "UNTZ UNTZ UNTZ"

code/datums/components/jousting.dm

@@ -45,7 +45,7 @@
 		var/knockdown_chance = (target_buckled? mounted_knockdown_chance_per_tile : unmounted_knockdown_chance_per_tile) * current
 		var/knockdown_time = (target_buckled? mounted_knockdown_time : unmounted_knockdown_time)
 		var/damage = (target_buckled? mounted_damage_boost_per_tile : unmounted_damage_boost_per_tile) * current
-		var/sharp = I.is_sharp()
+		var/sharp = I.get_sharpness()
 		var/msg
 		if(damage)
 			msg += "[user] [sharp? "impales" : "slams into"] [target] [sharp? "on" : "with"] their [parent]"

code/datums/components/thermite.dm

@@ -15,7 +15,7 @@
 		/turf/closed/indestructible,
 		/turf/open/indestructible)
 		)
-	
+
 	var/static/list/resistlist = typecacheof(
 		/turf/closed/wall/r_wall
 		)
@@ -77,5 +77,5 @@
 		thermite_melt()
 
 /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
-	if(thing.is_hot())
+	if(thing.get_temperature())
 		thermite_melt(user)

code/datums/dash_weapon.dm

@@ -34,11 +34,10 @@
 	var/turf/T = get_turf(target)
 	if(target in view(user.client.view, user))
 		var/obj/spot1 = new phaseout(get_turf(user), user.dir)
-		user.forceMove(T)
-		playsound(T, dash_sound, 25, 1)
-		var/obj/spot2 = new phasein(get_turf(user), user.dir)
-		spot1.Beam(spot2,beam_effect,time=20)
-		current_charges--
+		if(do_teleport(user, T, null, TRUE, null, null, dash_sound, dash_sound, TRUE, TELEPORT_CHANNEL_FREE, TRUE))
+			var/obj/spot2 = new phasein(get_turf(user), user.dir)
+			spot1.Beam(spot2,beam_effect,time=20)
+			current_charges--
 		holder.update_action_buttons_icon()
 		addtimer(CALLBACK(src, .proc/charge), charge_rate)
 

code/datums/helper_datums/teleport.dm

@@ -79,6 +79,7 @@
 		tele_play_specials(teleatom, destturf, effectout, asoundout)
 		if(ismegafauna(teleatom))
 			message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
+		SEND_SIGNAL(teleatom, COMSIG_MOVABLE_TELEPORTED, channel, curturf, destturf)
 
 	if(ismob(teleatom))
 		var/mob/M = teleatom

code/datums/mind.dm

@@ -41,8 +41,6 @@
 	var/special_role
 	var/list/restricted_roles = list()
 
-	var/list/datum/objective/objectives = list()
-
 	var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
 
 	var/linglink
@@ -360,13 +358,15 @@
 	output += memory
 
 
+	var/list/all_objectives = list()
 	for(var/datum/antagonist/A in antag_datums)
 		output += A.antag_memory
+		all_objectives |= A.objectives
 
-	if(objectives.len)
+	if(all_objectives.len)
 		output += "<B>Objectives:</B>"
 		var/obj_count = 1
-		for(var/datum/objective/objective in objectives)
+		for(var/datum/objective/objective in all_objectives)
 			output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]"
 			var/list/datum/mind/other_owners = objective.get_owners() - src
 			if(other_owners.len)
@@ -377,7 +377,7 @@
 
 	if(window)
 		recipient << browse(output,"window=memory")
-	else if(objectives.len || memory)
+	else if(all_objectives.len || memory)
 		to_chat(recipient, "<i>[output]</i>")
 
 /datum/mind/Topic(href, href_list)
@@ -408,34 +408,24 @@
 		memory = new_memo
 
 	else if (href_list["obj_edit"] || href_list["obj_add"])
-		var/datum/objective/objective
-		var/objective_pos
+		var/objective_pos //Edited objectives need to keep same order in antag objective list
 		var/def_value
-
 		var/datum/antagonist/target_antag
+		var/datum/objective/old_objective //The old objective we're replacing/editing
+		var/datum/objective/new_objective //New objective we're be adding
 
-		if (href_list["obj_edit"])
-			objective = locate(href_list["obj_edit"])
-			if (!objective)
+		if(href_list["obj_edit"])
+			for(var/datum/antagonist/A in antag_datums)
+				old_objective = locate(href_list["obj_edit"]) in A.objectives
+				if(old_objective)
+					target_antag = A
+					objective_pos = A.objectives.Find(old_objective)
+					break
+			if(!old_objective)
+				to_chat(usr,"Invalid objective.")
 				return
 
-			for(var/datum/antagonist/A in antag_datums)
-				if(objective in A.objectives)
-					target_antag = A
-					objective_pos = A.objectives.Find(objective)
-					break
-
-			if(!target_antag) //Shouldn't happen anymore
-				stack_trace("objective without antagonist found")
-				objective_pos = objectives.Find(objective)
-
-			//Text strings are easy to manipulate. Revised for simplicity.
-			var/temp_obj_type = "[objective.type]"//Convert path into a text string.
-			def_value = copytext(temp_obj_type, 19)//Convert last part of path into an objective keyword.
-			if(!def_value)//If it's a custom objective, it will be an empty string.
-				def_value = "custom"
 		else
-			//We're adding this objective
 			if(href_list["target_antag"])
 				var/datum/antagonist/X = locate(href_list["target_antag"]) in antag_datums
 				if(X)
@@ -447,7 +437,7 @@
 					if(1)
 						target_antag = antag_datums[1]
 					else
-						var/datum/antagonist/target = input("Which antagonist gets the objective:", "Antagonist", def_value) as null|anything in antag_datums + "(new custom antag)"
+						var/datum/antagonist/target = input("Which antagonist gets the objective:", "Antagonist", "(new custom antag)") as null|anything in antag_datums + "(new custom antag)"
 						if (QDELETED(target))
 							return
 						else if(target == "(new custom antag)")
@@ -455,149 +445,88 @@
 						else
 							target_antag = target
 
-		var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom")
-		if (!new_obj_type)
+		var/static/list/choices
+		if(!choices)
+			choices = list()
+
+			var/list/allowed_types = list(
+				/datum/objective/assassinate,
+				/datum/objective/maroon,
+				/datum/objective/debrain,
+				/datum/objective/protect,
+				/datum/objective/destroy,
+				/datum/objective/hijack,
+				/datum/objective/escape,
+				/datum/objective/survive,
+				/datum/objective/martyr,
+				/datum/objective/steal,
+				/datum/objective/download,
+				/datum/objective/nuclear,
+				/datum/objective/capture,
+				/datum/objective/absorb,
+				/datum/objective/custom
+			)
+
+			for(var/T in allowed_types)
+				var/datum/objective/X = T
+				choices[initial(X.name)] = T
+
+		if(old_objective)
+			if(old_objective.name in choices)
+				def_value = old_objective.name
+
+		var/selected_type = input("Select objective type:", "Objective type", def_value) as null|anything in choices
+		selected_type = choices[selected_type]
+		if (!selected_type)
 			return
 
-		var/datum/objective/new_objective = null
+		if(!old_objective)
+			//Add new one
+			new_objective = new selected_type
+			new_objective.owner = src
+			new_objective.admin_edit(usr)
+			target_antag.objectives += new_objective
 
-		switch (new_obj_type)
-			if ("assassinate","protect","debrain","maroon")
-				var/list/possible_targets = list("Free objective")
-				for(var/datum/mind/possible_target in SSticker.minds)
-					if ((possible_target != src) && ishuman(possible_target.current))
-						possible_targets += possible_target.current
-
-				var/mob/def_target = null
-				var/list/objective_list = typecacheof(list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/maroon))
-				if (is_type_in_typecache(objective, objective_list) && objective.target)
-					def_target = objective.target.current
-
-				var/mob/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
-				if (!new_target)
-					return
-
-				var/objective_path = text2path("/datum/objective/[new_obj_type]")
-				if (new_target == "Free objective")
-					new_objective = new objective_path
-					new_objective.owner = src
-					new_objective.target = null
-					new_objective.explanation_text = "Free objective"
-				else
-					new_objective = new objective_path
-					new_objective.owner = src
-					new_objective.target = new_target.mind
-					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
-					new_objective.update_explanation_text()
-
-			if ("destroy")
-				var/list/possible_targets = active_ais(1)
-				if(possible_targets.len)
-					var/mob/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
-					new_objective = new /datum/objective/destroy
-					new_objective.target = new_target.mind
-					new_objective.owner = src
-					new_objective.update_explanation_text()
-				else
-					to_chat(usr, "No active AIs with minds")
-
-			if ("prevent")
-				new_objective = new /datum/objective/block
-				new_objective.owner = src
-
-			if ("hijack")
-				new_objective = new /datum/objective/hijack
-				new_objective.owner = src
-
-			if ("escape")
-				new_objective = new /datum/objective/escape
-				new_objective.owner = src
-
-			if ("survive")
-				new_objective = new /datum/objective/survive
-				new_objective.owner = src
-
-			if("martyr")
-				new_objective = new /datum/objective/martyr
-				new_objective.owner = src
-
-			if ("nuclear")
-				new_objective = new /datum/objective/nuclear
-				new_objective.owner = src
-
-			if ("steal")
-				if (!istype(objective, /datum/objective/steal))
-					new_objective = new /datum/objective/steal
-					new_objective.owner = src
-				else
-					new_objective = objective
-				var/datum/objective/steal/steal = new_objective
-				if (!steal.select_target())
-					return
-
-			if("download","capture","absorb")
-				var/def_num
-				if(objective&&objective.type==text2path("/datum/objective/[new_obj_type]"))
-					def_num = objective.target_amount
-
-				var/target_number = input("Input target number:", "Objective", def_num) as num | null
-				if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
-					return
-
-				switch(new_obj_type)
-					if("download")
-						new_objective = new /datum/objective/download
-						new_objective.explanation_text = "Download [target_number] research node\s."
-					if("capture")
-						new_objective = new /datum/objective/capture
-						new_objective.explanation_text = "Capture [target_number] lifeforms with an energy net. Live, rare specimens are worth more."
-					if("absorb")
-						new_objective = new /datum/objective/absorb
-						new_objective.explanation_text = "Absorb [target_number] compatible genomes."
-				new_objective.owner = src
-				new_objective.target_amount = target_number
-
-			if ("custom")
-				var/expl = stripped_input(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "")
-				if (!expl)
-					return
-				new_objective = new /datum/objective
-				new_objective.owner = src
-				new_objective.explanation_text = expl
-
-		if (!new_objective)
-			return
-
-		if (objective)
-			if(target_antag)
-				target_antag.objectives -= objective
-			objectives -= objective
-			target_antag.objectives.Insert(objective_pos, new_objective)
-			message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]")
-			log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]")
-		else
-			if(target_antag)
-				target_antag.objectives += new_objective
-			objectives += new_objective
 			message_admins("[key_name_admin(usr)] added a new objective for [current]: [new_objective.explanation_text]")
 			log_admin("[key_name(usr)] added a new objective for [current]: [new_objective.explanation_text]")
+		else
+			if(old_objective.type == selected_type)
+				//Edit the old
+				old_objective.admin_edit(usr)
+				new_objective = old_objective
+			else
+				//Replace the old
+				new_objective = new selected_type
+				new_objective.owner = src
+				new_objective.admin_edit(usr)
+				target_antag.objectives -= old_objective
+				target_antag.objectives.Insert(objective_pos, new_objective)
+			message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]")
+			log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]")
 
 	else if (href_list["obj_delete"])
-		var/datum/objective/objective = locate(href_list["obj_delete"])
-		if(!istype(objective))
-			return
+		var/datum/objective/objective
 
 		for(var/datum/antagonist/A in antag_datums)
-			if(objective in A.objectives)
-				A.objectives -= objective
+			objective = locate(href_list["obj_delete"]) in A.objectives
+			if(istype(objective))
 				break
-		objectives -= objective
+		if(!objective)
+			to_chat(usr,"Invalid objective.")
+			return
+		//qdel(objective) Needs cleaning objective destroys
 		message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
 		log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")
 
 	else if(href_list["obj_completed"])
-		var/datum/objective/objective = locate(href_list["obj_completed"])
-		if(!istype(objective))
+		var/datum/objective/objective
+		for(var/datum/antagonist/A in antag_datums)
+			objective = locate(href_list["obj_completed"]) in A.objectives
+			if(istype(objective))
+				objective = objective
+				break
+		if(!objective)
+			to_chat(usr,"Invalid objective.")
 			return
 		objective.completed = !objective.completed
 		log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]")
@@ -652,10 +581,16 @@
 		usr = current
 	traitor_panel()
 
+/datum/mind/proc/get_all_objectives()
+	var/list/all_objectives = list()
+	for(var/datum/antagonist/A in antag_datums)
+		all_objectives |= A.objectives
+	return all_objectives
+
 /datum/mind/proc/announce_objectives()
 	var/obj_count = 1
 	to_chat(current, "<span class='notice'>Your current objectives:</span>")
-	for(var/objective in objectives)
+	for(var/objective in get_all_objectives())
 		var/datum/objective/O = objective
 		to_chat(current, "<B>Objective #[obj_count]</B>: [O.explanation_text]")
 		obj_count++

code/datums/radiation_wave.dm

@@ -66,6 +66,8 @@
 		place = cmaster_turf
 		for(var/i in 1 to distance)
 			place = get_step(place, dir)
+			if(!place)
+				break
 			atoms += get_rad_contents(place)
 
 	return atoms
@@ -108,7 +110,7 @@
 		if(!can_contaminate || blacklisted[thing.type])
 			continue
 		if(prob(contamination_chance)) // Only stronk rads get to have little baby rads
-			if(SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
+			if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
 				continue
 			var/rad_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT
 			thing.AddComponent(/datum/component/radioactive, rad_strength, source)

code/datums/traits/neutral.dm

@@ -103,14 +103,13 @@
 	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
 
 /datum/quirk/libido/add()
-	var/mob/living/M = quirk_holder
-	M.min_arousal = 16
-	M.arousal_rate = 3
+	quirk_holder.min_arousal = 16
+	quirk_holder.arousal_rate = 3
 
 /datum/quirk/libido/remove()
-	var/mob/living/M = quirk_holder
-	M.min_arousal = initial(M.min_arousal)
-	M.arousal_rate = initial(M.arousal_rate)
+	if(quirk_holder)
+		quirk_holder.min_arousal = initial(quirk_holder.min_arousal)
+		quirk_holder.arousal_rate = initial(quirk_holder.arousal_rate)
 
 /datum/quirk/maso
 	name = "Masochism"

code/game/gamemodes/devil/devil agent/devil_agent.dm

@@ -34,11 +34,12 @@
 	//If you override this method, have it return the number of objectives added.
 	if(devil_target_list.len && devil_target_list[devil]) // Is a double agent
 		var/datum/mind/target_mind = devil_target_list[devil]
+		var/datum/antagonist/devil/D = target_mind.has_antag_datum(/datum/antagonist/devil)
 		var/datum/objective/devil/outsell/outsellobjective = new
 		outsellobjective.owner = devil
 		outsellobjective.target = target_mind
 		outsellobjective.update_explanation_text()
-		devil.objectives += outsellobjective
+		D.objectives += outsellobjective
 		return 1
 	return 0
 

code/game/gamemodes/devil/game_mode.dm

@@ -4,11 +4,12 @@
 
 /datum/game_mode/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
 	var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
+	var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
 	for(var/i = 1 to quantity)
 		var/type = pick(validtypes)
 		var/datum/objective/devil/objective = new type(null)
 		objective.owner = devil_mind
-		devil_mind.objectives += objective
+		D.objectives += objective
 		if(!istype(objective, /datum/objective/devil/buy_target))
 			validtypes -= type //prevent duplicate objectives, EXCEPT for buy_target.
 		else

code/game/gamemodes/objective.dm

@@ -4,7 +4,8 @@ GLOBAL_LIST_EMPTY(objectives)
 
 /datum/objective
 	var/datum/mind/owner				//The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code.
-	var/datum/team/team       //An alternative to 'owner': a team. Use this when writing new code.
+	var/datum/team/team					//An alternative to 'owner': a team. Use this when writing new code.
+	var/name = "generic objective" 		//Name for admin prompts
 	var/explanation_text = "Nothing"	//What that person is supposed to do.
 	var/team_explanation_text			//For when there are multiple owners.
 	var/datum/mind/target = null		//If they are focused on a particular person.
@@ -22,6 +23,32 @@ GLOBAL_LIST_EMPTY(objectives)
 	if(owner)
 		. += owner
 
+/datum/objective/proc/admin_edit(mob/admin)
+	return
+
+//Shared by few objective types
+/datum/objective/proc/admin_simple_target_pick(mob/admin)
+	var/list/possible_targets = list("Free objective")
+	var/def_value
+	for(var/datum/mind/possible_target in SSticker.minds)
+		if ((possible_target != src) && ishuman(possible_target.current))
+			possible_targets += possible_target.current
+
+
+	if(target && target.current)
+		def_value = target.current
+
+	var/mob/new_target = input(admin,"Select target:", "Objective target", def_value) as null|anything in possible_targets
+	if (!new_target)
+		return
+
+	if (new_target == "Free objective")
+		target = null
+	else
+		target = new_target.mind
+
+	update_explanation_text()
+
 /datum/objective/proc/considered_escaped(datum/mind/M)
 	if(!considered_alive(M))
 		return FALSE
@@ -42,7 +69,7 @@ GLOBAL_LIST_EMPTY(objectives)
 /datum/objective/proc/is_unique_objective(possible_target)
 	var/list/datum/mind/owners = get_owners()
 	for(var/datum/mind/M in owners)
-		for(var/datum/objective/O in M.objectives)
+		for(var/datum/objective/O in M.get_all_objectives()) //This scope is debatable, probably should be passed in by caller.
 			if(istype(O, type) && O.get_target() == possible_target)
 				return FALSE
 	return TRUE
@@ -122,6 +149,7 @@ GLOBAL_LIST_EMPTY(objectives)
 				H.equip_in_one_of_slots(O, slots)
 
 /datum/objective/assassinate
+	name = "assasinate"
 	var/target_role_type=0
 	martyr_compatible = 1
 
@@ -141,6 +169,9 @@ GLOBAL_LIST_EMPTY(objectives)
 	else
 		explanation_text = "Free Objective"
 
+/datum/objective/assassinate/admin_edit(mob/admin)
+	admin_simple_target_pick(admin)
+
 /datum/objective/assassinate/internal
 	var/stolen = 0 		//Have we already eliminated this target?
 
@@ -150,6 +181,7 @@ GLOBAL_LIST_EMPTY(objectives)
 		explanation_text = "Assassinate [target.name], who was obliterated"
 
 /datum/objective/mutiny
+	name = "mutiny"
 	var/target_role_type=0
 	martyr_compatible = 1
 
@@ -173,6 +205,7 @@ GLOBAL_LIST_EMPTY(objectives)
 		explanation_text = "Free Objective"
 
 /datum/objective/maroon
+	name = "maroon"
 	var/target_role_type=0
 	martyr_compatible = 1
 
@@ -191,7 +224,11 @@ GLOBAL_LIST_EMPTY(objectives)
 	else
 		explanation_text = "Free Objective"
 
+/datum/objective/maroon/admin_edit(mob/admin)
+	admin_simple_target_pick(admin)
+
 /datum/objective/debrain
+	name = "debrain"
 	var/target_role_type=0
 
 /datum/objective/debrain/find_target_by_role(role, role_type=0, invert=0)
@@ -222,7 +259,11 @@ GLOBAL_LIST_EMPTY(objectives)
 	else
 		explanation_text = "Free Objective"
 
+/datum/objective/debrain/admin_edit(mob/admin)
+	admin_simple_target_pick(admin)
+
 /datum/objective/protect//The opposite of killing a dude.
+	name = "protect"
 	martyr_compatible = 1
 	var/target_role_type = 0
 	var/human_check = TRUE
@@ -243,10 +284,15 @@ GLOBAL_LIST_EMPTY(objectives)
 	else
 		explanation_text = "Free Objective"
 
+/datum/objective/protect/admin_edit(mob/admin)
+	admin_simple_target_pick(admin)
+
 /datum/objective/protect/nonhuman
+	name = "protect nonhuman"
 	human_check = FALSE
 
 /datum/objective/hijack
+	name = "hijack"
 	explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody."
 	team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind."
 	martyr_compatible = 0 //Technically you won't get both anyway.
@@ -261,6 +307,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return SSshuttle.emergency.is_hijacked()
 
 /datum/objective/block
+	name = "no organics on shuttle"
 	explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
 	martyr_compatible = 1
 
@@ -274,6 +321,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/purge
+	name = "no mutants on shuttle"
 	explanation_text = "Ensure no mutant humanoid species are present aboard the escape shuttle."
 	martyr_compatible = 1
 
@@ -288,6 +336,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/robot_army
+	name = "robot army"
 	explanation_text = "Have at least eight active cyborgs synced to you."
 	martyr_compatible = 0
 
@@ -304,6 +353,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return counter >= 8
 
 /datum/objective/escape
+	name = "escape"
 	explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody."
 	team_explanation_text = "Have all members of your team escape on a shuttle or pod alive, without being in custody."
 
@@ -316,6 +366,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/escape/escape_with_identity
+	name = "escape with identity"
 	var/target_real_name // Has to be stored because the target's real_name can change over the course of the round
 	var/target_missing_id
 
@@ -351,7 +402,11 @@ GLOBAL_LIST_EMPTY(objectives)
 			return TRUE
 	return FALSE
 
+/datum/objective/escape/escape_with_identity/admin_edit(mob/admin)
+	admin_simple_target_pick(admin)
+
 /datum/objective/survive
+	name = "survive"
 	explanation_text = "Stay alive until the end."
 
 /datum/objective/survive/check_completion()
@@ -362,6 +417,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/survive/exist //Like survive, but works for silicons and zombies and such.
+	name = "survive nonhuman"
 
 /datum/objective/survive/exist/check_completion()
 	var/list/datum/mind/owners = get_owners()
@@ -371,6 +427,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/martyr
+	name = "martyr"
 	explanation_text = "Die a glorious death."
 
 /datum/objective/martyr/check_completion()
@@ -383,6 +440,7 @@ GLOBAL_LIST_EMPTY(objectives)
 	return TRUE
 
 /datum/objective/nuclear
+	name = "nuclear"
 	explanation_text = "Destroy the station with a nuclear device."
 	martyr_compatible = 1
 
@@ -393,6 +451,7 @@ GLOBAL_LIST_EMPTY(objectives)
 
 GLOBAL_LIST_EMPTY(possible_items)
 /datum/objective/steal
+	name = "steal"
 	var/datum/objective_item/targetinfo = null //Save the chosen item datum so we can access it later.
 	var/obj/item/steal_target = null //Needed for custom objectives (they're just items, not datums).
 	martyr_compatible = 0
@@ -430,18 +489,19 @@ GLOBAL_LIST_EMPTY(possible_items)
 		explanation_text = "Free objective"
 		return
 
-/datum/objective/steal/proc/select_target() //For admins setting objectives manually.
+/datum/objective/steal/admin_edit(mob/admin)
 	var/list/possible_items_all = GLOB.possible_items+"custom"
-	var/new_target = input("Select target:", "Objective target", steal_target) as null|anything in possible_items_all
+	var/new_target = input(admin,"Select target:", "Objective target", steal_target) as null|anything in possible_items_all
 	if (!new_target)
 		return
 
 	if (new_target == "custom") //Can set custom items.
-		var/obj/item/custom_target = input("Select type:","Type") as null|anything in typesof(/obj/item)
-		if (!custom_target)
+		var/custom_path = input(admin,"Search for target item type:","Type") as null|text
+		if (!custom_path)
 			return
+		var/obj/item/custom_target = pick_closest_path(custom_path, make_types_fancy(subtypesof(/obj/item)))
 		var/custom_name = initial(custom_target.name)
-		custom_name = stripped_input("Enter target name:", "Objective target", custom_name)
+		custom_name = stripped_input(admin,"Enter target name:", "Objective target", custom_name)
 		if (!custom_name)
 			return
 		steal_target = custom_target
@@ -449,7 +509,6 @@ GLOBAL_LIST_EMPTY(possible_items)
 
 	else
 		set_target(new_target)
-	return steal_target
 
 /datum/objective/steal/check_completion()
 	var/list/datum/mind/owners = get_owners()
@@ -476,6 +535,7 @@ GLOBAL_LIST_EMPTY(possible_items)
 
 GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/steal/special //ninjas are so special they get their own subtype good for them
+	name = "steal special"
 
 /datum/objective/steal/special/New()
 	..()
@@ -487,8 +547,12 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	return set_target(pick(GLOB.possible_items_special))
 
 /datum/objective/steal/exchange
+	name = "exchange"
 	martyr_compatible = 0
 
+/datum/objective/steal/exchange/admin_edit(mob/admin)
+	return
+
 /datum/objective/steal/exchange/proc/set_faction(faction,otheragent)
 	target = otheragent
 	if(faction == "red")
@@ -508,6 +572,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 
 
 /datum/objective/steal/exchange/backstab
+	name = "prevent exchange"
 
 /datum/objective/steal/exchange/backstab/set_faction(faction)
 	if(faction == "red")
@@ -519,12 +584,17 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 
 
 /datum/objective/download
+	name = "download"
 
 /datum/objective/download/proc/gen_amount_goal()
 	target_amount = rand(20,40)
-	explanation_text = "Download [target_amount] research node\s."
+	update_explanation_text()
 	return target_amount
 
+/datum/objective/download/update_explanation_text()
+	..()
+	explanation_text = "Download [target_amount] research node\s."
+
 /datum/objective/download/check_completion()
 	var/datum/techweb/checking = new
 	var/list/datum/mind/owners = get_owners()
@@ -541,13 +611,24 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 				TD.stored_research.copy_research_to(checking)
 	return checking.researched_nodes.len >= target_amount
 
+/datum/objective/download/admin_edit(mob/admin)
+	var/count = input(admin,"How many nodes ?","Nodes",target_amount) as num|null
+	if(count)
+		target_amount = count
+	update_explanation_text()
+
 /datum/objective/capture
+	name = "capture"
 	var/captured_amount = 0
 
 /datum/objective/capture/proc/gen_amount_goal()
-		target_amount = rand(5,10)
-		explanation_text = "Capture [target_amount] lifeform\s with an energy net. Live, rare specimens are worth more."
-		return target_amount
+	target_amount = rand(5,10)
+	explanation_text = "Capture [target_amount] lifeform\s with an energy net. Live, rare specimens are worth more."
+	return target_amount
+
+/datum/objective/capture/update_explanation_text()
+	. = ..()
+	explanation_text = "Capture [target_amount] lifeform\s with an energy net. Live, rare specimens are worth more."
 
 /datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth.
 	/*var/area/centcom/holding/A = GLOB.areas_by_type[/area/centcom/holding]
@@ -576,10 +657,16 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 		captured_amount+=2*/ //Removed in favour of adding points on capture, in energy_net_nets.dm
 	return captured_amount >= target_amount
 
+/datum/objective/capture/admin_edit(mob/admin)
+	var/count = input(admin,"How many mobs to capture ?","capture",target_amount) as num|null
+	if(count)
+		target_amount = count
+	update_explanation_text()
 
 //Changeling Objectives
 
 /datum/objective/absorb
+	name = "absorb"
 
 /datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
 	target_amount = rand (lowbound,highbound)
@@ -595,9 +682,19 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 				n_p ++
 	target_amount = min(target_amount, n_p)
 
-	explanation_text = "Extract [target_amount] compatible genome\s."
+	update_explanation_text()
 	return target_amount
 
+/datum/objective/absorb/update_explanation_text()
+	. = ..()
+	explanation_text = "Extract [target_amount] compatible genome\s."
+
+/datum/objective/absorb/admin_edit(mob/admin)
+	var/count = input(admin,"How many people to absorb?","absorb",target_amount) as num|null
+	if(count)
+		target_amount = count
+	update_explanation_text()
+
 /datum/objective/absorb/check_completion()
 	var/list/datum/mind/owners = get_owners()
 	var/absorbedcount = 0
@@ -611,6 +708,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	return absorbedcount >= target_amount
 
 /datum/objective/absorb_most
+	name = "absorb most"
 	explanation_text = "Extract more compatible genomes than any other Changeling."
 
 /datum/objective/absorb_most/check_completion()
@@ -631,6 +729,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	return TRUE
 
 /datum/objective/absorb_changeling
+	name = "absorb changeling"
 	explanation_text = "Absorb another Changeling."
 
 /datum/objective/absorb_changeling/check_completion()
@@ -653,6 +752,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 //End Changeling Objectives
 
 /datum/objective/destroy
+	name = "destroy AI"
 	martyr_compatible = 1
 
 /datum/objective/destroy/find_target()
@@ -674,10 +774,20 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	else
 		explanation_text = "Free Objective"
 
+/datum/objective/destroy/admin_edit(mob/admin)
+	var/list/possible_targets = active_ais(1)
+	if(possible_targets.len)
+		var/mob/new_target = input(admin,"Select target:", "Objective target") as null|anything in possible_targets
+		target = new_target.mind
+	else
+		to_chat(admin, "No active AIs with minds")
+	update_explanation_text()
+
 /datum/objective/destroy/internal
 	var/stolen = FALSE 		//Have we already eliminated this target?
 
 /datum/objective/steal_five_of_type
+	name = "steal five of"
 	explanation_text = "Steal at least five items!"
 	var/list/wanted_items = list(/obj/item)
 
@@ -686,10 +796,12 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	wanted_items = typecacheof(wanted_items)
 
 /datum/objective/steal_five_of_type/summon_guns
+	name = "steal guns"
 	explanation_text = "Steal at least five guns!"
 	wanted_items = list(/obj/item/gun)
 
 /datum/objective/steal_five_of_type/summon_magic
+	name = "steal magic"
 	explanation_text = "Steal at least five magical artefacts!"
 	wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/necromantic_stone)
 
@@ -705,6 +817,14 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 				stolen_count++
 	return stolen_count >= 5
 
+//Created by admin tools
+/datum/objective/custom
+	name = "custom"
+
+/datum/objective/custom/admin_edit(mob/admin)
+	var/expl = stripped_input(admin, "Custom objective:", "Objective", explanation_text)
+	if(expl)
+		explanation_text = expl
 
 ////////////////////////////////
 // Changeling team objectives //

code/game/machinery/_machinery.dm

@@ -113,11 +113,6 @@ Class Procs:
 	var/atom/movable/occupant = null
 	var/speed_process = FALSE // Process as fast as possible?
 	var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
-	var/obj/item/card/id/inserted_scan_id
-	var/obj/item/card/id/inserted_modify_id
-	var/list/region_access = null // For the identification console (card.dm)
-	var/list/head_subordinates = null // For the identification console (card.dm)
-	var/authenticated = 0 // For the identification console (card.dm)
 
 	var/interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE
 
@@ -459,22 +454,20 @@ Class Procs:
 /obj/machinery/examine(mob/user)
 	. = ..()
 	if(stat & BROKEN)
-		. += "<span class='notice'>It looks broken and non-functional.</span>"
+		to_chat(user, "<span class='notice'>It looks broken and non-functional.</span>")
 	if(!(resistance_flags & INDESTRUCTIBLE))
 		if(resistance_flags & ON_FIRE)
-			. += "<span class='warning'>It's on fire!</span>"
+			to_chat(user, "<span class='warning'>It's on fire!</span>")
 		var/healthpercent = (obj_integrity/max_integrity) * 100
 		switch(healthpercent)
 			if(50 to 99)
-				. += "It looks slightly damaged."
+				to_chat(user, "It looks slightly damaged.")
 			if(25 to 50)
-				. += "It appears heavily damaged."
+				to_chat(user, "It appears heavily damaged.")
 			if(0 to 25)
-				. += "<span class='warning'>It's falling apart!</span>"
+				to_chat(user, "<span class='warning'>It's falling apart!</span>")
 	if(user.research_scanner && component_parts)
-		. += display_parts(user, TRUE)
-	if(inserted_scan_id || inserted_modify_id)
-		. += "<span class='notice'>Alt-click to eject the ID card.</span>"
+		to_chat(user, display_parts(user, TRUE))
 
 //called on machinery construction (i.e from frame to machinery) but not on initialization
 /obj/machinery/proc/on_construction()
@@ -509,73 +502,3 @@ Class Procs:
 	. = . % 9
 	AM.pixel_x = -8 + ((.%3)*8)
 	AM.pixel_y = -8 + (round( . / 3)*8)
-
-/obj/machinery/proc/id_insert_scan(mob/user, obj/item/card/id/I)
-	I = user.get_active_held_item()
-	if(istype(I))
-		if(inserted_scan_id)
-			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
-			return
-		if(!user.transferItemToLoc(I, src))
-			return
-		inserted_scan_id = I
-		user.visible_message("<span class='notice'>[user] inserts an ID card into the console.</span>", \
-							"<span class='notice'>You insert the ID card into the console.</span>")
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
-		updateUsrDialog()
-
-/obj/machinery/proc/id_eject_scan(mob/user)
-	if(!inserted_scan_id)
-		to_chat(user, "<span class='warning'>There's no ID card in the console!</span>")
-		return
-	if(inserted_scan_id)
-		inserted_scan_id.forceMove(drop_location())
-		if(!issilicon(user) && Adjacent(user))
-			user.put_in_hands(inserted_scan_id)
-		inserted_scan_id = null
-		user.visible_message("<span class='notice'>[user] gets an ID card from the console.</span>", \
-							"<span class='notice'>You get the ID card from the console.</span>")
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
-		updateUsrDialog()
-
-/obj/machinery/proc/id_eject_modify(mob/user)
-	if(inserted_modify_id)
-		GLOB.data_core.manifest_modify(inserted_modify_id.registered_name, inserted_modify_id.assignment)
-		inserted_modify_id.update_label()
-		inserted_modify_id.forceMove(drop_location())
-		if(!issilicon(user) && Adjacent(user))
-			user.put_in_hands(inserted_modify_id)
-		user.visible_message("<span class='notice'>[user] gets an ID card from the console.</span>", \
-							"<span class='notice'>You get the ID card from the console.</span>")
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
-		inserted_modify_id = null
-		region_access = null
-		head_subordinates = null
-		updateUsrDialog()
-
-/obj/machinery/proc/id_insert_modify(mob/user)
-	var/obj/item/card/id/I = user.get_active_held_item()
-	if(istype(I))
-		if(inserted_modify_id)
-			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
-			return
-		if(!user.transferItemToLoc(I, src))
-			return
-		inserted_modify_id = I
-		user.visible_message("<span class='notice'>[user] inserts an ID card into the console.</span>", \
-							"<span class='notice'>You insert the ID card into the console.</span>")
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
-		updateUsrDialog()
-
-/obj/machinery/AltClick(mob/user)
-	. = ..()
-	if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
-		return
-	if(inserted_modify_id)
-		id_eject_modify(user)
-		authenticated = FALSE
-		return
-	if(inserted_scan_id)
-		id_eject_scan(user)
-		authenticated = FALSE
-		return

code/game/machinery/computer/_computer.dm

@@ -13,6 +13,7 @@
 	var/icon_keyboard = "generic_key"
 	var/icon_screen = "generic"
 	var/clockwork = FALSE
+	var/authenticated = FALSE
 
 /obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()

code/game/machinery/computer/card.dm

@@ -11,8 +11,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	icon_keyboard = "id_key"
 	req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
 	circuit = /obj/item/circuitboard/computer/card
-	var/obj/item/card/id/scan = null
-	var/obj/item/card/id/modify = null
 	var/mode = 0
 	var/printing = null
 	var/target_dept = 0 //Which department this computer has access to. 0=all departments
@@ -38,68 +36,68 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 	//This is used to keep track of opened positions for jobs to allow instant closing
 	//Assoc array: "JobName" = (int)<Opened Positions>
-	var/list/opened_positions = list();
+	var/list/opened_positions = list()
+	var/obj/item/card/id/inserted_scan_id
+	var/obj/item/card/id/inserted_modify_id
+	var/list/region_access = null
+	var/list/head_subordinates = null
 
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/card/examine(mob/user)
 	..()
-	if(scan || modify)
+	if(inserted_scan_id || inserted_modify_id)
 		to_chat(user, "<span class='notice'>Alt-click to eject the ID card.</span>")
 
 /obj/machinery/computer/card/Initialize()
 	. = ..()
 	change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay)
 
-/obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY
-	if(istype(O, /obj/item/card/id))
-		var/obj/item/card/id/idcard = O
-		if(check_access(idcard))
-			if(!scan)
-				if (!user.transferItemToLoc(idcard,src))
-					return
-				scan = idcard
-				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-			else if(!modify)
-				if (!user.transferItemToLoc(idcard,src))
-					return
-				modify = idcard
-				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
+/obj/machinery/computer/card/examine(mob/user)
+	. = ..()
+	if(inserted_scan_id || inserted_modify_id)
+		to_chat(user, "<span class='notice'>Alt-click to eject the ID card.</span>")
+
+/obj/machinery/computer/card/attackby(obj/I, mob/user, params)
+	if(istype(I, /obj/item/card/id))
+		if(!inserted_scan_id)
+			if(id_insert(user, I, inserted_scan_id))
+				inserted_scan_id = I
+				return
+		if(!inserted_modify_id)
+			if(id_insert(user, I, inserted_modify_id))
+				inserted_modify_id = I
+				return
 		else
-			if(!modify)
-				if (!user.transferItemToLoc(idcard,src))
-					return
-				modify = idcard
-				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-		updateUsrDialog()
+			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
 	else
 		return ..()
 
 /obj/machinery/computer/card/Destroy()
-	if(scan)
-		qdel(scan)
-		scan = null
-	if(modify)
-		qdel(modify)
-		modify = null
+	if(inserted_scan_id)
+		qdel(inserted_scan_id)
+		inserted_scan_id = null
+	if(inserted_modify_id)
+		qdel(inserted_modify_id)
+		inserted_modify_id = null
 	return ..()
 
 /obj/machinery/computer/card/handle_atom_del(atom/A)
 	..()
-	if(A == scan)
-		scan = null
+	if(A == inserted_scan_id)
+		inserted_scan_id = null
 		updateUsrDialog()
-	if(A == modify)
-		modify = null
+	if(A == inserted_modify_id)
+		inserted_modify_id = null
 		updateUsrDialog()
 
 /obj/machinery/computer/card/on_deconstruction()
-	if(scan)
-		scan.forceMove(drop_location())
-		scan = null
-	if(modify)
-		modify.forceMove(drop_location())
-		modify = null
+	if(inserted_scan_id)
+		inserted_scan_id.forceMove(drop_location())
+		inserted_scan_id = null
+	if(inserted_modify_id)
+		inserted_modify_id.forceMove(drop_location())
+		inserted_modify_id = null
 
 //Check if you can't open a new position for a certain job
 /obj/machinery/computer/card/proc/job_blacklisted(jobtitle)
@@ -130,9 +128,50 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			return -1
 	return 0
 
+/obj/machinery/computer/card/proc/id_insert(mob/user, obj/item/card/id/I, target)
+	if(istype(I))
+		if(target)
+			to_chat(user, "<span class='warning'>There's already an ID card in the console!</span>")
+			return FALSE
+		if(!user.transferItemToLoc(I, src))
+			return FALSE
+		user.visible_message("<span class='notice'>[user] inserts an ID card into the console.</span>", \
+							"<span class='notice'>You insert the ID card into the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		updateUsrDialog()
+		return TRUE
+
+/obj/machinery/computer/card/proc/id_eject(mob/user, obj/target)
+	if(!target)
+		to_chat(user, "<span class='warning'>There's no ID card in the console!</span>")
+		return FALSE
+	else
+		target.forceMove(drop_location())
+		if(!issilicon(user) && Adjacent(user))
+			user.put_in_hands(target)
+		user.visible_message("<span class='notice'>[user] gets an ID card from the console.</span>", \
+							"<span class='notice'>You get the ID card from the console.</span>")
+		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+		updateUsrDialog()
+		return TRUE
+
+/obj/machinery/computer/card/AltClick(mob/user)
+	..()
+	if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
+		return
+	if(inserted_modify_id)
+		if(id_eject(user, inserted_modify_id))
+			inserted_modify_id = null
+			authenticated = FALSE
+			return
+	if(inserted_scan_id)
+		if(id_eject(user, inserted_scan_id))
+			inserted_scan_id = null
+			authenticated = FALSE
+			return
+
 /obj/machinery/computer/card/ui_interact(mob/user)
 	. = ..()
-
 	var/dat
 	if(!SSticker)
 		return
@@ -147,15 +186,15 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		dat = "<a href='?src=[REF(src)];choice=return'>Return</a>"
 		dat += " || Confirm Identity: "
 		var/S
-		if(scan)
-			S = html_encode(scan.name)
+		if(inserted_scan_id)
+			S = html_encode(inserted_scan_id.name)
 		else
 			S = "--------"
-		dat += "<a href='?src=[REF(src)];choice=scan'>[S]</a>"
+		dat += "<a href='?src=[REF(src)];choice=inserted_scan_id'>[S]</a>"
 		dat += "<table>"
 		dat += "<tr><td style='width:25%'><b>Job</b></td><td style='width:25%'><b>Slots</b></td><td style='width:25%'><b>Open job</b></td><td style='width:25%'><b>Close job</b><td style='width:25%'><b>Prioritize</b></td></td></tr>"
 		var/ID
-		if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
+		if(inserted_scan_id && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept)
 			ID = 1
 		else
 			ID = 0
@@ -221,33 +260,33 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		var/target_name
 		var/target_owner
 		var/target_rank
-		if(modify)
-			target_name = html_encode(modify.name)
+		if(inserted_modify_id)
+			target_name = html_encode(inserted_modify_id.name)
 		else
 			target_name = "--------"
-		if(modify && modify.registered_name)
-			target_owner = html_encode(modify.registered_name)
+		if(inserted_modify_id && inserted_modify_id.registered_name)
+			target_owner = html_encode(inserted_modify_id.registered_name)
 		else
 			target_owner = "--------"
-		if(modify && modify.assignment)
-			target_rank = html_encode(modify.assignment)
+		if(inserted_modify_id && inserted_modify_id.assignment)
+			target_rank = html_encode(inserted_modify_id.assignment)
 		else
 			target_rank = "Unassigned"
 
 		var/scan_name
-		if(scan)
-			scan_name = html_encode(scan.name)
+		if(inserted_scan_id)
+			scan_name = html_encode(inserted_scan_id.name)
 		else
 			scan_name = "--------"
 
 		if(!authenticated)
 			header += "<br><i>Please insert the cards into the slots</i><br>"
-			header += "Target: <a href='?src=[REF(src)];choice=modify'>[target_name]</a><br>"
-			header += "Confirm Identity: <a href='?src=[REF(src)];choice=scan'>[scan_name]</a><br>"
+			header += "Target: <a href='?src=[REF(src)];choice=inserted_modify_id'>[target_name]</a><br>"
+			header += "Confirm Identity: <a href='?src=[REF(src)];choice=inserted_scan_id'>[scan_name]</a><br>"
 		else
 			header += "<div align='center'><br>"
-			header += "<a href='?src=[REF(src)];choice=modify'>Remove [target_name]</a> || "
-			header += "<a href='?src=[REF(src)];choice=scan'>Remove [scan_name]</a> <br> "
+			header += "<a href='?src=[REF(src)];choice=inserted_modify_id'>Remove [target_name]</a> || "
+			header += "<a href='?src=[REF(src)];choice=inserted_scan_id'>Remove [scan_name]</a> <br> "
 			header += "<a href='?src=[REF(src)];choice=mode;mode_target=1'>Access Crew Manifest</a> <br> "
 			header += "<a href='?src=[REF(src)];choice=logout'>Log Out</a></div>"
 
@@ -262,7 +301,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 		var/body
 
-		if (authenticated && modify)
+		if (authenticated && inserted_modify_id)
 
 			var/carddesc = text("")
 			var/jobs = text("")
@@ -303,7 +342,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			if(istype(src, /obj/machinery/computer/card/centcom))
 				accesses += "<h5>Central Command:</h5>"
 				for(var/A in get_all_centcom_access())
-					if(A in modify.access)
+					if(A in inserted_modify_id.access)
 						accesses += "<a href='?src=[REF(src)];choice=access;access_target=[A];allowed=0'><font color=\"red\">[replacetext(get_centcom_access_desc(A), " ", "&nbsp")]</font></a> "
 					else
 						accesses += "<a href='?src=[REF(src)];choice=access;access_target=[A];allowed=1'>[replacetext(get_centcom_access_desc(A), " ", "&nbsp")]</a> "
@@ -321,7 +360,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 						continue
 					accesses += "<td style='width:14%' valign='top'>"
 					for(var/A in get_region_accesses(i))
-						if(A in modify.access)
+						if(A in inserted_modify_id.access)
 							accesses += "<a href='?src=[REF(src)];choice=access;access_target=[A];allowed=0'><font color=\"red\">[replacetext(get_access_desc(A), " ", "&nbsp")]</font></a> "
 						else
 							accesses += "<a href='?src=[REF(src)];choice=access;access_target=[A];allowed=1'>[replacetext(get_access_desc(A), " ", "&nbsp")]</a> "
@@ -353,52 +392,66 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 	usr.set_machine(src)
 	switch(href_list["choice"])
-		if ("modify")
-			eject_id_modify(usr)
-		if ("scan")
-			eject_id_scan(usr)
+		if ("inserted_modify_id")
+			if (inserted_modify_id)
+				if(id_eject(usr, inserted_modify_id))
+					inserted_modify_id = null
+			else
+				var/mob/M = usr
+				var/obj/item/card/id/I = M.get_idcard(TRUE)
+				if(id_insert(usr, I, inserted_modify_id))
+					inserted_modify_id = I
+		if ("inserted_scan_id")
+			if (inserted_scan_id)
+				if(id_eject(usr, inserted_scan_id))
+					inserted_scan_id = null
+			else
+				var/mob/M = usr
+				var/obj/item/card/id/I = M.get_idcard(TRUE)
+				if(id_insert(usr, I, inserted_scan_id))
+					inserted_scan_id = I
 		if ("auth")
-			if ((!( authenticated ) && (scan || issilicon(usr)) && (modify || mode)))
-				if (check_access(scan))
+			if ((!( authenticated ) && (inserted_scan_id || issilicon(usr)) && (inserted_modify_id || mode)))
+				if (check_access(inserted_scan_id))
 					region_access = list()
 					head_subordinates = list()
-					if(ACCESS_CHANGE_IDS in scan.access)
+					if(ACCESS_CHANGE_IDS in inserted_scan_id.access)
 						if(target_dept)
 							head_subordinates = get_all_jobs()
 							region_access |= target_dept
 							authenticated = 1
 						else
 							authenticated = 2
-						playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
+						playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
 
 					else
-						if((ACCESS_HOP in scan.access) && ((target_dept==1) || !target_dept))
+						if((ACCESS_HOP in inserted_scan_id.access) && ((target_dept==1) || !target_dept))
 							region_access |= 1
 							get_subordinates("Head of Personnel")
-						if((ACCESS_HOS in scan.access) && ((target_dept==2) || !target_dept))
+						if((ACCESS_HOS in inserted_scan_id.access) && ((target_dept==2) || !target_dept))
 							region_access |= 2
 							get_subordinates("Head of Security")
-						if((ACCESS_CMO in scan.access) && ((target_dept==3) || !target_dept))
+						if((ACCESS_CMO in inserted_scan_id.access) && ((target_dept==3) || !target_dept))
 							region_access |= 3
 							get_subordinates("Chief Medical Officer")
-						if((ACCESS_RD in scan.access) && ((target_dept==4) || !target_dept))
+						if((ACCESS_RD in inserted_scan_id.access) && ((target_dept==4) || !target_dept))
 							region_access |= 4
 							get_subordinates("Research Director")
-						if((ACCESS_CE in scan.access) && ((target_dept==5) || !target_dept))
+						if((ACCESS_CE in inserted_scan_id.access) && ((target_dept==5) || !target_dept))
 							region_access |= 5
 							get_subordinates("Chief Engineer")
-						if((ACCESS_QM in scan.access) && ((target_dept==6) || !target_dept))
+						if((ACCESS_QM in inserted_scan_id.access) && ((target_dept==6) || !target_dept))
 							region_access |= 6
 							get_subordinates("Quartermaster")
 						if(region_access)
 							authenticated = 1
-			else if ((!( authenticated ) && issilicon(usr)) && (!modify))
+			else if ((!( authenticated ) && issilicon(usr)) && (!inserted_modify_id))
 				to_chat(usr, "<span class='warning'>You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.</span>")
 		if ("logout")
 			region_access = null
 			head_subordinates = null
 			authenticated = 0
-			playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
 
 		if("access")
 			if(href_list["allowed"])
@@ -406,20 +459,20 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					var/access_type = text2num(href_list["access_target"])
 					var/access_allowed = text2num(href_list["allowed"])
 					if(access_type in (istype(src, /obj/machinery/computer/card/centcom)?get_all_centcom_access() : get_all_accesses()))
-						modify.access -= access_type
+						inserted_modify_id.access -= access_type
 						if(access_allowed == 1)
-							modify.access += access_type
-						playsound(src, "terminal_type", 50, 0)
+							inserted_modify_id.access += access_type
+						playsound(src, "terminal_type", 50, FALSE)
 		if ("assign")
 			if (authenticated == 2)
 				var/t1 = href_list["assign_target"]
 				if(t1 == "Custom")
-					var/newJob = reject_bad_text(input("Enter a custom job assignment.", "Assignment", modify ? modify.assignment : "Unassigned"), MAX_NAME_LEN)
+					var/newJob = reject_bad_text(input("Enter a custom job assignment.", "Assignment", inserted_modify_id ? inserted_modify_id.assignment : "Unassigned"), MAX_NAME_LEN)
 					if(newJob)
 						t1 = newJob
 
 				else if(t1 == "Unassigned")
-					modify.access -= get_all_accesses()
+					inserted_modify_id.access -= get_all_accesses()
 
 				else
 					var/datum/job/jobdatum
@@ -434,24 +487,24 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 						updateUsrDialog()
 						return
 
-					modify.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
-				if (modify)
-					modify.assignment = t1
-					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+					inserted_modify_id.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
+				if (inserted_modify_id)
+					inserted_modify_id.assignment = t1
+					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 		if ("demote")
-			if(modify.assignment in head_subordinates || modify.assignment == "Assistant")
-				modify.assignment = "Unassigned"
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			if(inserted_modify_id.assignment in head_subordinates || inserted_modify_id.assignment == "Assistant")
+				inserted_modify_id.assignment = "Unassigned"
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 			else
 				to_chat(usr, "<span class='error'>You are not authorized to demote this position.</span>")
 		if ("reg")
 			if (authenticated)
-				var/t2 = modify
-				if ((authenticated && modify == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
+				var/t2 = inserted_modify_id
+				if ((authenticated && inserted_modify_id == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
 					var/newName = reject_bad_name(href_list["reg"])
 					if(newName)
-						modify.registered_name = newName
-						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+						inserted_modify_id.registered_name = newName
+						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 					else
 						to_chat(usr, "<span class='error'>Invalid name entered.</span>")
 						updateUsrDialog()
@@ -462,11 +515,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		if("return")
 			//DISPLAY MAIN MENU
 			mode = 3;
-			playsound(src, "terminal_type", 25, 0)
+			playsound(src, "terminal_type", 25, FALSE)
 
 		if("make_job_available")
 			// MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
-			if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
+			if(inserted_scan_id && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept)
 				var/edit_job_target = href_list["job"]
 				var/datum/job/j = SSjob.GetJob(edit_job_target)
 				if(!j)
@@ -479,11 +532,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					GLOB.time_last_changed_position = world.time / 10
 				j.total_positions++
 				opened_positions[edit_job_target]++
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 
 		if("make_job_unavailable")
 			// MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
-			if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
+			if(inserted_scan_id && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept)
 				var/edit_job_target = href_list["job"]
 				var/datum/job/j = SSjob.GetJob(edit_job_target)
 				if(!j)
@@ -497,11 +550,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 					GLOB.time_last_changed_position = world.time / 10
 				j.total_positions--
 				opened_positions[edit_job_target]--
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 
 		if ("prioritize_job")
 			// TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
-			if(scan && (ACCESS_CHANGE_IDS in scan.access) && !target_dept)
+			if(inserted_scan_id && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept)
 				var/priority_target = href_list["job"]
 				var/datum/job/j = SSjob.GetJob(priority_target)
 				if(!j)
@@ -518,7 +571,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				else
 					SSjob.prioritized_jobs += j
 				to_chat(usr, "<span class='notice'>[j.title] has been successfully [priority ?  "prioritized" : "unprioritized"]. Potential employees will notice your request.</span>")
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 
 		if ("print")
 			if (!( printing ))
@@ -531,59 +584,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				P.info = t1
 				P.name = "paper- 'Crew Manifest'"
 				printing = null
-				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-	if (modify)
-		modify.update_label()
-	updateUsrDialog()
-
-/obj/machinery/computer/card/AltClick(mob/user)
-	if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
-		return
-	if(scan)
-		eject_id_scan(user)
-	if(modify)
-		eject_id_modify(user)
-
-/obj/machinery/computer/card/proc/eject_id_scan(mob/user)
-	if(scan)
-		scan.forceMove(drop_location())
-		if(!issilicon(user) && Adjacent(user))
-			user.put_in_hands(scan)
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-		scan = null
-	else //switching the ID with the one you're holding
-		if(issilicon(user) || !Adjacent(user))
-			return
-		var/obj/item/I = user.get_active_held_item()
-		if(istype(I, /obj/item/card/id))
-			if(!user.transferItemToLoc(I,src))
-				return
-			playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-			scan = I
-	authenticated = FALSE
-	updateUsrDialog()
-
-/obj/machinery/computer/card/proc/eject_id_modify(mob/user)
-	if(modify)
-		GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment)
-		modify.update_label()
-		modify.forceMove(drop_location())
-		if(!issilicon(user) && Adjacent(user))
-			user.put_in_hands(modify)
-		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-		modify = null
-		region_access = null
-		head_subordinates = null
-	else //switching the ID with the one you're holding
-		if(issilicon(user) || !Adjacent(user))
-			return
-		var/obj/item/I = user.get_active_held_item()
-		if(istype(I, /obj/item/card/id))
-			if (!user.transferItemToLoc(I,src))
-				return
-			playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
-			modify = I
-	authenticated = FALSE
+				playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
+	if (inserted_modify_id)
+		inserted_modify_id.update_label()
 	updateUsrDialog()
 
 /obj/machinery/computer/card/proc/get_subordinates(rank)

code/game/machinery/computer/gulag_teleporter.dm

@@ -1,163 +0,0 @@
-//computer that handle the points and teleports the prisoner
-/obj/machinery/computer/gulag_teleporter_computer
-	name = "labor camp teleporter console"
-	desc = "Used to send criminals to the Labor Camp."
-	icon_screen = "explosive"
-	icon_keyboard = "security_key"
-	req_access = list(ACCESS_ARMORY)
-	circuit = /obj/item/circuitboard/computer/gulag_teleporter_console
-	var/default_goal = 200
-	var/obj/item/card/id/prisoner/id = null
-	var/obj/machinery/gulag_teleporter/teleporter = null
-	var/obj/structure/gulag_beacon/beacon = null
-	var/mob/living/carbon/human/prisoner = null
-	var/datum/data/record/temporary_record = null
-
-	light_color = LIGHT_COLOR_RED
-
-/obj/machinery/computer/gulag_teleporter_computer/Initialize()
-	. = ..()
-	scan_machinery()
-
-/obj/machinery/computer/gulag_teleporter_computer/Destroy()
-	if(id)
-		id.forceMove(get_turf(src))
-	return ..()
-
-/obj/machinery/computer/gulag_teleporter_computer/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/card/id/prisoner))
-		if(!id)
-			if (!user.transferItemToLoc(W,src))
-				return
-			id = W
-			to_chat(user, "<span class='notice'>You insert [W].</span>")
-			return
-		else
-			to_chat(user, "<span class='notice'>There's an ID inserted already.</span>")
-	return ..()
-
-/obj/machinery/computer/gulag_teleporter_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "gulag_console", name, 455, 440, master_ui, state)
-		ui.open()
-
-/obj/machinery/computer/gulag_teleporter_computer/ui_data(mob/user)
-	var/list/data = list()
-
-	var/list/prisoner_list = list()
-	var/can_teleport = FALSE
-
-	if(teleporter && (teleporter.occupant && ishuman(teleporter.occupant)))
-		prisoner = teleporter.occupant
-		prisoner_list["name"] = prisoner.real_name
-		if(id)
-			can_teleport = TRUE
-		if(!isnull(GLOB.data_core.general))
-			for(var/r in GLOB.data_core.security)
-				var/datum/data/record/R = r
-				if(R.fields["name"] == prisoner_list["name"])
-					temporary_record = R
-					prisoner_list["crimstat"] = temporary_record.fields["criminal"]
-
-	data["prisoner"] = prisoner_list
-
-	if(teleporter)
-		data["teleporter"] = teleporter
-		data["teleporter_location"] = "([teleporter.x], [teleporter.y], [teleporter.z])"
-		data["teleporter_lock"] = teleporter.locked
-		data["teleporter_state_open"] = teleporter.state_open
-	if(beacon)
-		data["beacon"] = beacon
-		data["beacon_location"] = "([beacon.x], [beacon.y], [beacon.z])"
-	if(id)
-		data["id"] = id
-		data["id_name"] = id.registered_name
-		data["goal"] = id.goal
-	data["can_teleport"] = can_teleport
-
-	return data
-
-/obj/machinery/computer/gulag_teleporter_computer/ui_act(action, list/params)
-	if(..())
-		return
-	if(!allowed(usr))
-		to_chat(usr, "<span class='warning'>Access denied.</span>")
-		return
-	switch(action)
-		if("scan_teleporter")
-			teleporter = findteleporter()
-		if("scan_beacon")
-			beacon = findbeacon()
-		if("handle_id")
-			if(id)
-				usr.put_in_hands(id)
-				id = null
-			else
-				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id/prisoner)
-				if(I)
-					if(!usr.transferItemToLoc(I, src))
-						return
-					id = I
-		if("set_goal")
-			var/new_goal = input("Set the amount of points:", "Points", id.goal) as num|null
-			if(!isnum(new_goal))
-				return
-			if(!new_goal)
-				new_goal = default_goal
-			if (new_goal > 1000)
-				to_chat(usr, "The entered amount of points is too large. Points have instead been set to the maximum allowed amount.")
-			id.goal = CLAMP(new_goal, 0, 1000) //maximum 1000 points
-		if("toggle_open")
-			if(teleporter.locked)
-				to_chat(usr, "The teleporter is locked")
-				return
-			teleporter.toggle_open()
-		if("teleporter_lock")
-			if(teleporter.state_open)
-				to_chat(usr, "Close the teleporter before locking!")
-				return
-			teleporter.locked = !teleporter.locked
-		if("teleport")
-			if(!teleporter || !beacon)
-				return
-			addtimer(CALLBACK(src, .proc/teleport, usr), 5)
-
-/obj/machinery/computer/gulag_teleporter_computer/proc/scan_machinery()
-	teleporter = findteleporter()
-	beacon = findbeacon()
-
-/obj/machinery/computer/gulag_teleporter_computer/proc/findteleporter()
-	var/obj/machinery/gulag_teleporter/teleporterf = null
-
-	for(var/direction in GLOB.cardinals)
-		teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, direction))
-		if(teleporterf && teleporterf.is_operational())
-			return teleporterf
-
-/obj/machinery/computer/gulag_teleporter_computer/proc/findbeacon()
-	return locate(/obj/structure/gulag_beacon)
-
-/obj/machinery/computer/gulag_teleporter_computer/proc/teleport(mob/user)
-	if(!id) //incase the ID was removed after the transfer timer was set.
-		say("Warning: Unable to transfer prisoner without a valid Prisoner ID inserted!")
-		return
-	var/id_goal_not_set
-	if(!id.goal)
-		id_goal_not_set = TRUE
-		id.goal = default_goal
-		say("[id]'s ID card goal defaulting to [id.goal] points.")
-	log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][id.goal] points.")
-	teleporter.handle_prisoner(id, temporary_record)
-	playsound(src, 'sound/weapons/emitter.ogg', 50, 1)
-	prisoner.forceMove(get_turf(beacon))
-	prisoner.Knockdown(40) // small travel dizziness
-	to_chat(prisoner, "<span class='warning'>The teleportation makes you a little dizzy.</span>")
-	new /obj/effect/particle_effect/sparks(get_turf(prisoner))
-	playsound(src, "sparks", 50, 1)
-	if(teleporter.locked)
-		teleporter.locked = FALSE
-	teleporter.toggle_open()
-	id = null
-	temporary_record = null

code/game/machinery/computer/medical.dm

@@ -22,12 +22,6 @@
 /obj/machinery/computer/med_data/syndie
 	icon_keyboard = "syndie_key"
 
-/obj/machinery/computer/med_data/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/card/id))
-		id_insert_scan(user)
-	else
-		return ..()
-
 /obj/machinery/computer/med_data/ui_interact(mob/user)
 	. = ..()
 	if(isliving(user))

code/game/machinery/computer/security.dm

@@ -35,7 +35,8 @@
 //Someone needs to break down the dat += into chunks instead of long ass lines.
 /obj/machinery/computer/secure_data/ui_interact(mob/user)
 	. = ..()
-	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+	if(isliving(user))
+		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 	if(src.z > 6)
 		to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
 		return

code/game/machinery/cryopod.dm

@@ -370,16 +370,14 @@
 					O.find_target()
 					O.update_explanation_text()
 					if(!(O.target))
-						O.owner.objectives -= O
 						qdel(O)
 
-	if(mob_occupant.mind && mob_occupant.mind.assigned_role)
+	if(mob_occupant.mind)
 		//Handle job slot/tater cleanup.
-		var/job = mob_occupant.mind.assigned_role
-		SSjob.FreeRole(job)
-		if(mob_occupant.mind.objectives.len)
-			mob_occupant.mind.objectives.Cut()
-			mob_occupant.mind.special_role = null
+		if(mob_occupant.mind.assigned_role)
+			var/job = mob_occupant.mind.assigned_role
+			SSjob.FreeRole(job)
+		mob_occupant.mind.special_role = null
 
 	// Delete them from datacore.
 

code/game/machinery/doors/airlock_types.dm

@@ -249,10 +249,10 @@
 	return 0
 
 /obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params)
-	if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+	if(C.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
 		message_admins("Plasma airlock ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
 		log_game("Plasma airlock ignited by [key_name(user)] in [AREACOORD(src)]")
-		ignite(C.is_hot())
+		ignite(C.get_temperature())
 	else
 		return ..()
 
@@ -499,7 +499,7 @@
 			SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50))
 			flash_color(L, flash_color="#960000", flash_time=20)
 			L.Knockdown(40)
-			L.throw_at(throwtarget, 5, 1,src)
+			L.throw_at(throwtarget, 5, 1)
 		return 0
 
 /obj/machinery/door/airlock/cult/proc/conceal()

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

@@ -45,11 +45,11 @@
 			if(!reagents.total_volume) //scooped up all of it
 				qdel(src)
 				return
-	if(W.is_hot()) //todo: make heating a reagent holder proc
+	if(W.get_temperature()) //todo: make heating a reagent holder proc
 		if(istype(W, /obj/item/clothing/mask/cigarette))
 			return
 		else
-			var/hotness = W.is_hot()
+			var/hotness = W.get_temperature()
 			reagents.expose_temperature(hotness)
 			to_chat(user, "<span class='notice'>You heat [name] with [W]!</span>")
 	else

code/game/objects/items.dm

@@ -553,7 +553,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/throw_impact(atom/A, datum/thrownthing/throwingdatum)
 	if(A && !QDELETED(A))
 		SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, A, throwingdatum)
-		if(is_hot() && isliving(A))
+		if(get_temperature() && isliving(A))
 			var/mob/living/L = A
 			L.IgniteMob()
 		var/itempush = 1
@@ -620,10 +620,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	if(flags & ITEM_SLOT_NECK)
 		owner.update_inv_neck()
 
-/obj/item/proc/is_hot()
+/obj/item/proc/get_temperature()
 	return heat
 
-/obj/item/proc/is_sharp()
+/obj/item/proc/get_sharpness()
 	return sharpness
 
 /obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting)
@@ -650,7 +650,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		location.hotspot_expose(flame_heat, 1)
 
 /obj/item/proc/ignition_effect(atom/A, mob/user)
-	if(is_hot())
+	if(get_temperature())
 		. = "<span class='notice'>[user] lights [A] with [src].</span>"
 	else
 		. = ""

code/game/objects/items/RCD.dm

@@ -439,11 +439,11 @@ RLD
 
 /obj/item/construction/rcd/proc/rcd_create(atom/A, mob/user)
 	var/list/rcd_results = A.rcd_vals(user, src)
+	if(!rcd_results)
+		return FALSE
 	var/turf/the_turf = get_turf(A)
 	var/turf_coords = "[COORD(the_turf)]"
 	investigate_log("[user] is attempting to use [src] on [A] (loc [turf_coords] at [the_turf]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
-	if(!rcd_results)
-		return FALSE
 	if(do_after(user, rcd_results["delay"] * delay_mod, target = A))
 		if(checkResource(rcd_results["cost"], user))
 			var/atom/cached = A

code/game/objects/items/candle.dm

@@ -34,7 +34,7 @@
 		light() //honk
 	return ..()
 
-/obj/item/candle/is_hot()
+/obj/item/candle/get_temperature()
 	return lit * heat
 
 /obj/item/candle/proc/light(show_message)

code/game/objects/items/cigs_lighters.dm

@@ -90,7 +90,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(istype(mask_item, /obj/item/clothing/mask/cigarette))
 		return mask_item
 
-/obj/item/match/is_hot()
+/obj/item/match/get_temperature()
 	return lit * heat
 
 //////////////////
@@ -255,7 +255,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/cigarette/fire_act(exposed_temperature, exposed_volume)
 	light()
 
-/obj/item/clothing/mask/cigarette/is_hot()
+/obj/item/clothing/mask/cigarette/get_temperature()
 	return lit * heat
 
 // Cigarette brands.
@@ -530,7 +530,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	add_overlay(lighter_overlay)
 
 /obj/item/lighter/ignition_effect(atom/A, mob/user)
-	if(is_hot())
+	if(get_temperature())
 		. = "<span class='rose'>With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"
 
 /obj/item/lighter/proc/set_lit(new_lit)
@@ -605,7 +605,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/lighter/process()
 	open_flame()
 
-/obj/item/lighter/is_hot()
+/obj/item/lighter/get_temperature()
 	return lit * heat
 
 
@@ -654,7 +654,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	add_overlay(lighter_overlay)
 
 /obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user)
-	if(is_hot())
+	if(get_temperature())
 		. = "<span class='notice'>After some fiddling, [user] manages to light [A] with [src].</span>"
 
 

code/game/objects/items/devices/aicard.dm

@@ -17,6 +17,11 @@
 	desc = "A stylish upgrade (?) to the intelliCard."
 	icon_state = "aitater"
 
+/obj/item/aicard/aispook
+	name = "intelliLantern"
+	desc = "A spoOoOoky upgrade to the intelliCard."
+	icon_state = "aispook"
+
 /obj/item/aicard/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!</span>")
 	return BRUTELOSS
@@ -26,16 +31,18 @@
 	if(!proximity || !target)
 		return
 	if(AI) //AI is on the card, implies user wants to upload it.
-		target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
 		log_combat(user, AI, "carded", src)
+		target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
 	else //No AI on the card, therefore the user wants to download one.
 		target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
+		if(AI)
+			log_combat(user, AI, "carded", src)
 	update_icon() //Whatever happened, update the card's state (icon, name) to match.
 
 /obj/item/aicard/update_icon()
 	cut_overlays()
 	if(AI)
-		name = "[initial(name)]- [AI.name]"
+		name = "[initial(name)] - [AI.name]"
 		if(AI.stat == DEAD)
 			icon_state = "[initial(icon_state)]-404"
 		else

code/game/objects/items/devices/flashlight.dm

@@ -324,7 +324,7 @@
 		damtype = "fire"
 		START_PROCESSING(SSobj, src)
 
-/obj/item/flashlight/flare/is_hot()
+/obj/item/flashlight/flare/get_temperature()
 	return on * heat
 
 /obj/item/flashlight/flare/torch

code/game/objects/items/devices/paicard.dm

@@ -148,9 +148,11 @@
 			if(10)
 				src.add_overlay("pai-null")
 			if(11)
-				src.add_overlay(mutable_appearance('modular_citadel/icons/obj/aicards.dmi', "pai-exclamation")) // CITADEL EDIT
+				src.add_overlay("pai-exclamation")
 			if(12)
-				src.add_overlay(mutable_appearance('modular_citadel/icons/obj/aicards.dmi', "pai-question")) // CITADEL EDIT
+				src.add_overlay("pai-question")
+			if(13)
+				src.add_overlay("pai-sunglasses")
 
 /obj/item/paicard/proc/alertUpdate()
 	visible_message("<span class ='info'>[src] flashes a message across its screen, \"Additional personalities available for download.\"", "<span class='notice'>[src] bleeps electronically.</span>")

code/game/objects/items/devices/scanners.dm

@@ -338,17 +338,17 @@ SLIME SCANNER
 
 		if(report_organs)	//we either finish the list, or set it to be empty if no organs were reported in that category
 			if(!max_damage)
-				max_damage = "\t<span class='alert'>Non-Functional Organs: </span>"
+				max_damage = "\t<span class='alert'>Non-Functional Organs: </span>\n"
 			else
-				max_damage += "</span>"
+				max_damage += "</span>\n"
 			if(!major_damage)
-				major_damage = "\t<span class='info'>Severely Damaged Organs: </span>"
+				major_damage = "\t<span class='info'>Severely Damaged Organs: </span>\n"
 			else
-				major_damage += "</span>"
+				major_damage += "</span>\n"
 			if(!minor_damage)
-				minor_damage = "\t<span class='info'>Mildly Damaged Organs: </span>"
+				minor_damage = "\t<span class='info'>Mildly Damaged Organs: </span>\n"
 			else
-				minor_damage += "</span>"
+				minor_damage += "</span>\n"
 			msg += "[minor_damage]"
 			msg += "[major_damage]"
 			msg += "[max_damage]"
@@ -382,10 +382,11 @@ SLIME SCANNER
 		else if (S.mutantstomach != initial(S.mutantstomach))
 			mutant = TRUE
 
-		msg += "<span class='info'>Species: [H.dna.custom_species ? H.dna.custom_species : S.name] Base: [S.name]</span>\n"
+		msg += "\t<span class='info'>Reported Species: [H.dna.custom_species ? H.dna.custom_species : S.name]</span>\n" 
+		msg += "\t<span class='info'>Base Species: [S.name]</span>\n"
 		if(mutant)
-			msg += "<span class='info'>Subject has mutations present.</span>"
-	msg += "<span class='info'>Body temperature: [round(M.bodytemperature-T0C,0.1)] &deg;C ([round(M.bodytemperature*1.8-459.67,0.1)] &deg;F)</span>\n"
+			msg += "\t<span class='info'>Subject has mutations present.</span>\n"
+	msg += "\t<span class='info'>Body temperature: [round(M.bodytemperature-T0C,0.1)] &deg;C ([round(M.bodytemperature*1.8-459.67,0.1)] &deg;F)</span>\n"
 
 	// Time of death
 	if(M.tod && (M.stat == DEAD || ((HAS_TRAIT(M, TRAIT_FAKEDEATH)) && !advanced)))

code/game/objects/items/latexballoon.dm

@@ -52,5 +52,5 @@
 		var/obj/item/tank/T = W
 		blow(T, user)
 		return
-	if (W.is_sharp() || W.is_hot() || is_pointed(W))
+	if (W.get_sharpness() || W.get_temperature() || is_pointed(W))
 		burst()

code/game/objects/items/melee/energy.dm

@@ -28,7 +28,7 @@
 /obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
 	return FALSE
 
-/obj/item/melee/transforming/energy/is_sharp()
+/obj/item/melee/transforming/energy/get_sharpness()
 	return active * sharpness
 
 /obj/item/melee/transforming/energy/process()
@@ -46,7 +46,7 @@
 			STOP_PROCESSING(SSobj, src)
 			set_light(0)
 
-/obj/item/melee/transforming/energy/is_hot()
+/obj/item/melee/transforming/energy/get_temperature()
 	return active * heat
 
 /obj/item/melee/transforming/energy/ignition_effect(atom/A, mob/user)

code/game/objects/items/melee/transforming.dm

@@ -23,7 +23,7 @@
 	else
 		if(attack_verb_off.len)
 			attack_verb = attack_verb_off
-	if(is_sharp())
+	if(get_sharpness())
 		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
 
 /obj/item/melee/transforming/attack_self(mob/living/carbon/user)
@@ -65,7 +65,7 @@
 		icon_state = initial(icon_state)
 		w_class = initial(w_class)
 		total_mass = initial(total_mass)
-	if(is_sharp())
+	if(get_sharpness())
 		var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
 		BT.butchering_enabled = TRUE
 	else

code/game/objects/items/plushes.dm

@@ -117,7 +117,7 @@
 		to_chat(user, "<span class='notice'>You try to pet [src], but it has no stuffing. Aww...</span>")
 
 /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
-	if(I.is_sharp())
+	if(I.get_sharpness())
 		if(!grenade)
 			if(!stuffed)
 				to_chat(user, "<span class='warning'>You already murdered it!</span>")

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

@@ -128,7 +128,7 @@
 
 
 /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wirecutters) || I.is_sharp())
+	if(istype(I, /obj/item/wirecutters) || I.get_sharpness())
 		if(get_amount() < 2)
 			to_chat(user, "<span class='warning'>You need at least two gauzes to do this!</span>")
 			return

code/game/objects/items/stacks/sheets/leather.dm

@@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 //Step one - dehairing.
 
 /obj/item/stack/sheet/animalhide/attackby(obj/item/W, mob/user, params)
-	if(W.is_sharp())
+	if(W.get_sharpness())
 		playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
 		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
 		if(do_after(user, 50, target = src))

code/game/objects/items/stacks/sheets/mineral.dm

@@ -178,11 +178,11 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	. = ..()
 
 /obj/item/stack/sheet/mineral/plasma/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
 		var/turf/T = get_turf(src)
 		message_admins("Plasma sheets ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
 		log_game("Plasma sheets ignited by [key_name(user)] in [AREACOORD(T)]")
-		fire_act(W.is_hot())
+		fire_act(W.get_temperature())
 	else
 		return ..()
 

code/game/objects/items/storage/boxes.dm

@@ -855,7 +855,7 @@
 			if(SMILEY)
 				desc = "A paper sack with a crude smile etched onto the side."
 		return 0
-	else if(W.is_sharp())
+	else if(W.get_sharpness())
 		if(!contents.len)
 			if(item_state == "paperbag_None")
 				user.show_message("<span class='notice'>You cut eyeholes into [src].</span>", 1)

code/game/objects/items/storage/fancy.dm

@@ -309,9 +309,10 @@
 	if(fancy_open)
 		icon_state = "[initial(icon_state)]_open"
 
-		var/cigar_position = 1 //generate sprites for cigars in the box
+		var/cigar_position = 0 //to keep track of the pixel_x offset of each new overlay.
 		for(var/obj/item/clothing/mask/cigarette/cigar/smokes in contents)
-			var/mutable_appearance/cigar_overlay = mutable_appearance(icon, "[smokes.icon_off]_[cigar_position]")
+			var/mutable_appearance/cigar_overlay = mutable_appearance(icon, "[smokes.icon_off]")
+			cigar_overlay.pixel_x = 3 * cigar_position
 			add_overlay(cigar_overlay)
 			cigar_position++
 

code/game/objects/items/theft_tools.dm

@@ -49,6 +49,10 @@
 	lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi'
 	var/obj/item/nuke_core/core
+	var/nt =FALSE //For the lid
+
+/obj/item/nuke_core_container/nt
+	nt = TRUE
 
 /obj/item/nuke_core_container/Destroy()
 	QDEL_NULL(core)
@@ -67,10 +71,13 @@
 /obj/item/nuke_core_container/proc/seal()
 	if(istype(core))
 		STOP_PROCESSING(SSobj, core)
-		icon_state = "core_container_sealed"
 		playsound(src, 'sound/items/deconstruct.ogg', 60, 1)
 		if(ismob(loc))
 			to_chat(loc, "<span class='warning'>[src] is permanently sealed, [core]'s radiation is contained.</span>")
+		if(nt != TRUE)
+			icon_state = "core_container_sealed"
+		else
+			icon_state = "core_container_sealed_nt"
 
 /obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user)
 	if(istype(core))
@@ -92,6 +99,11 @@
 	toolspeed = 0.5
 	random_color = FALSE
 
+/obj/item/screwdriver/nuke/nt
+	desc = "A screwdriver with an ultra thin diamon tip."
+	toolspeed = 0.25
+	icon_state = "screwdriver_nt"
+
 /obj/item/paper/guides/antag/nuke_instructions
 	info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:<br>\
 	<ul>\
@@ -103,6 +115,18 @@
 	<li>???</li>\
 	</ul>"
 
+/obj/item/paper/guides/nt/nuke_instructions
+	info = "How to remove its plutonium core:<br>\
+	<ul>\
+	<li>Use a screwdriver with a very thin tip (provided) to unscrew the terminal's front panel</li>\
+	<li>Dislodge and remove the front panel with a crowbar</li>\
+	<li>Cut the inner metal plate with a welding tool</li>\
+	<li>Pry off the inner plate with a crowbar to expose the radioactive core</li>\
+	<li>Use the core container to remove the plutonium core; the container will take some time to seal</li>\
+	<li>Send core back to CC</li>\
+	</ul>"
+
+
 // STEALING SUPERMATTER
 
 /obj/item/paper/guides/antag/supermatter_sliver

code/game/objects/items/tools/weldingtool.dm

@@ -223,7 +223,7 @@
 	..()
 	to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
 
-/obj/item/weldingtool/is_hot()
+/obj/item/weldingtool/get_temperature()
 	return welding * heat
 
 //Returns whether or not the welding tool is currently on.

code/game/objects/items/toys.dm

@@ -79,7 +79,7 @@
 				to_chat(user, "<span class='notice'>You fill the balloon with the contents of [I].</span>")
 				I.reagents.trans_to(src, 10)
 				update_icon()
-	else if(I.is_sharp())
+	else if(I.get_sharpness())
 		balloon_burst()
 	else
 		return ..()

code/game/objects/structures/bedsheet_bin.dm

@@ -41,7 +41,7 @@ LINEN BINS
 	return
 
 /obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wirecutters) || I.is_sharp())
+	if(istype(I, /obj/item/wirecutters) || I.get_sharpness())
 		var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
 		transfer_fingerprints_to(C)
 		C.add_fingerprint(user)

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

@@ -10,7 +10,7 @@
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 	new /obj/item/clothing/head/hardhat/white(src)
-	new /obj/item/clothing/head/welding(src)
+	new /obj/item/clothing/head/hardhat/weldhat/white(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/tank/jetpack/suit(src)

code/game/objects/structures/false_walls.dm

@@ -236,7 +236,7 @@
 	canSmoothWith = list(/obj/structure/falsewall/plasma, /turf/closed/wall/mineral/plasma)
 
 /obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
-	if(W.is_hot() > 300)
+	if(W.get_temperature() > 300)
 		var/turf/T = get_turf(src)
 		message_admins("Plasma falsewall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
 		log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]")

code/game/objects/structures/mineral_doors.dm

@@ -193,7 +193,7 @@
 	return
 
 /obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user, params)
-	if(W.is_hot())
+	if(W.get_temperature())
 		var/turf/T = get_turf(src)
 		message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
 		log_game("Plasma mineral door ignited by [key_name(user)] in [AREACOORD(T)]")

code/game/objects/structures/statues.dm

@@ -127,11 +127,11 @@
 	..()
 
 /obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params)
-	if(W.is_hot() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite
+	if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite
 		var/turf/T = get_turf(src)
 		message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
 		log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]")
-		ignite(W.is_hot())
+		ignite(W.get_temperature())
 	else
 		return ..()
 

code/game/objects/structures/window.dm

@@ -731,8 +731,8 @@
 
 
 /obj/structure/window/paperframe/attackby(obj/item/W, mob/user)
-	if(W.is_hot())
-		fire_act(W.is_hot())
+	if(W.get_temperature())
+		fire_act(W.get_temperature())
 		return
 	if(user.a_intent == INTENT_HARM)
 		return ..()

code/game/turfs/simulated/floor/mineral_floor.dm

@@ -43,10 +43,10 @@
 		PlasmaBurn(exposed_temperature)
 
 /turf/open/floor/mineral/plasma/attackby(obj/item/W, mob/user, params)
-	if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
 		message_admins("Plasma flooring was ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
 		log_game("Plasma flooring was ignited by [key_name(user)] in [AREACOORD(src)]")
-		ignite(W.is_hot())
+		ignite(W.get_temperature())
 		return
 	..()
 

code/game/turfs/simulated/wall/mineral_walls.dm

@@ -94,10 +94,10 @@
 	canSmoothWith = list(/turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma)
 
 /turf/closed/wall/mineral/plasma/attackby(obj/item/W, mob/user, params)
-	if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
+	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
 		message_admins("Plasma wall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
 		log_game("Plasma wall ignited by [key_name(user)] in [AREACOORD(src)]")
-		ignite(W.is_hot())
+		ignite(W.get_temperature())
 		return
 	..()
 

code/modules/antagonists/_common/antag_datum.dm

@@ -96,7 +96,6 @@ GLOBAL_LIST_EMPTY(antagonists)
 		LAZYREMOVE(owner.antag_datums, src)
 		if(!silent && owner.current)
 			farewell()
-		owner.objectives -= objectives
 	var/datum/team/team = get_team()
 	if(team)
 		team.remove_member(owner)
@@ -132,14 +131,14 @@ GLOBAL_LIST_EMPTY(antagonists)
 	report += printplayer(owner)
 
 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		report += printobjectives(owner)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		report += printobjectives(objectives)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break
 
-	if(owner.objectives.len == 0 || objectives_complete)
+	if(objectives.len == 0 || objectives_complete)
 		report += "<span class='greentext big'>The [name] was successful!</span>"
 	else
 		report += "<span class='redtext big'>The [name] has failed!</span>"
@@ -216,25 +215,6 @@ GLOBAL_LIST_EMPTY(antagonists)
 		return
 	antag_memory = new_memo
 
-//This datum will autofill the name with special_role
-//Used as placeholder for minor antagonists, please create proper datums for these
-/datum/antagonist/auto_custom
-	show_in_antagpanel = FALSE
-	antagpanel_category = "Other"
-	show_name_in_check_antagonists = TRUE
-
-/datum/antagonist/auto_custom/on_gain()
-	..()
-	name = owner.special_role
-	//Add all objectives not already owned by other datums to this one.
-	var/list/already_registered_objectives = list()
-	for(var/datum/antagonist/A in owner.antag_datums)
-		if(A == src)
-			continue
-		else
-			already_registered_objectives |= A.objectives
-	objectives = owner.objectives - already_registered_objectives
-
 //This one is created by admin tools for custom objectives
 /datum/antagonist/custom
 	antagpanel_category = "Custom"

code/modules/antagonists/blob/blob.dm

@@ -30,7 +30,6 @@
 	var/datum/objective/blob_takeover/main = new
 	main.owner = owner
 	objectives += main
-	owner.objectives |= objectives
 
 /datum/antagonist/blob/apply_innate_effects(mob/living/mob_override)
 	if(!isovermind(owner.current))

code/modules/antagonists/blood_contract/blood_contract.dm

@@ -0,0 +1,33 @@
+
+/datum/antagonist/blood_contract
+	name = "Blood Contract Target"
+	show_in_roundend = FALSE
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/blood_contract/on_gain()
+	. = ..()
+	give_objective()
+	start_the_hunt()
+
+/datum/antagonist/blood_contract/proc/give_objective()
+	var/datum/objective/survive/survive = new
+	survive.owner = owner
+	objectives += survive
+
+/datum/antagonist/blood_contract/greet()
+	. = ..()
+	to_chat(owner, "<span class='userdanger'>You've been marked for death! Don't let the demons get you! KILL THEM ALL!</span>")
+
+/datum/antagonist/blood_contract/proc/start_the_hunt()
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+	H.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
+	var/obj/effect/mine/pickup/bloodbath/B = new(H)
+	INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine
+
+	for(var/mob/living/carbon/human/P in GLOB.player_list)
+		if(P == H)
+			continue
+		to_chat(P, "<span class='userdanger'>You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!</span>")
+		P.put_in_hands(new /obj/item/kitchen/knife/butcher(P), TRUE)

code/modules/antagonists/brainwashing/brainwashing.dm

@@ -9,7 +9,6 @@
 		for(var/O in directives)
 			var/datum/objective/brainwashing/objective = new(O)
 			B.objectives += objective
-			M.objectives += objective
 		B.greet()
 	else
 		B = new()
@@ -32,10 +31,6 @@
 	antagpanel_category = "Other"
 	show_name_in_check_antagonists = TRUE
 
-/datum/antagonist/brainwashed/on_gain()
-	owner.objectives |= objectives
-	. = ..()
-
 /datum/antagonist/brainwashed/greet()
 	to_chat(owner, "<span class='warning'>Your mind reels as it begins focusing on a single purpose...</span>")
 	to_chat(owner, "<big><span class='warning'><b>Follow the Directives, at any cost!</b></span></big>")

code/modules/antagonists/brother/brother.dm

@@ -20,7 +20,6 @@
 /datum/antagonist/brother/on_gain()
 	SSticker.mode.brothers += owner
 	objectives += team.objectives
-	owner.objectives += objectives
 	owner.special_role = special_role
 	finalize_brother()
 	return ..()

code/modules/antagonists/changeling/changeling.dm

@@ -459,8 +459,6 @@
 			objectives += identity_theft
 		escape_objective_possible = FALSE
 
-	owner.objectives |= objectives
-
 /datum/antagonist/changeling/proc/update_changeling_icons_added()
 	var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING]
 	hud.join_hud(owner.current)

code/modules/antagonists/changeling/powers/mutations.dm

@@ -334,7 +334,7 @@
 /obj/item/projectile/tentacle/proc/tentacle_stab(mob/living/carbon/human/H, mob/living/carbon/C)
 	if(H.Adjacent(C))
 		for(var/obj/item/I in H.held_items)
-			if(I.is_sharp())
+			if(I.get_sharpness())
 				C.visible_message("<span class='danger'>[H] impales [C] with [H.p_their()] [I.name]!</span>", "<span class='userdanger'>[H] impales you with [H.p_their()] [I.name]!</span>")
 				C.apply_damage(I.force, BRUTE, BODY_ZONE_CHEST)
 				H.do_item_attack_animation(C, used_item = I)

code/modules/antagonists/cult/cult.dm

@@ -35,7 +35,6 @@
 
 /datum/antagonist/cult/proc/add_objectives()
 	objectives |= cult_team.objectives
-	owner.objectives |= objectives
 
 /datum/antagonist/cult/Destroy()
 	QDEL_NULL(communion)

code/modules/antagonists/devil/devil.dm

@@ -549,7 +549,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	var/list/parts = list()
 	parts += printplayer(owner)
 	parts += printdevilinfo()
-	parts += printobjectives(owner)
+	parts += printobjectives(objectives)
 	return parts.Join("<br>")
 
 //A simple super light weight datum for the codex gigas.

code/modules/antagonists/devil/imp/imp.dm

@@ -57,3 +57,18 @@
 	visible_message("<span class='danger'>[src] screams in agony as it sublimates into a sulfurous smoke.</span>")
 	ghostize()
 	qdel(src)
+
+/datum/antagonist/imp
+	name = "Imp"
+	antagpanel_category = "Devil"
+	show_in_roundend = FALSE
+
+/datum/antagonist/imp/on_gain()
+	. = ..()
+	give_objectives()
+
+/datum/antagonist/imp/proc/give_objectives()
+	var/datum/objective/newobjective = new
+	newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
+	newobjective.owner = owner
+	objectives += newobjective

code/modules/antagonists/devil/true_devil/_true_devil.dm

@@ -147,13 +147,8 @@
 	if(ascended || user.mind.soulOwner == src.mind)
 		var/mob/living/simple_animal/imp/S = new(get_turf(loc))
 		user.transfer_ckey(S, FALSE)
-		S.mind.assigned_role = "Imp"
-		S.mind.special_role = "Imp"
-		var/datum/objective/newobjective = new
-		newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
-		S.mind.objectives += newobjective
-		to_chat(S, S.playstyle_string)
-		to_chat(S, "<B>Objective #[1]</B>: [newobjective.explanation_text]")
+		var/datum/antagonist/imp/A = new()
+		S.mind.add_antag_datum(A)
 	else
 		return ..()
 

code/modules/antagonists/disease/disease_datum.dm

@@ -10,12 +10,10 @@
 	var/datum/objective/O = new /datum/objective/disease_infect()
 	O.owner = owner
 	objectives += O
-	owner.objectives += O
 
 	O = new /datum/objective/disease_infect_centcom()
 	O.owner = owner
 	objectives += O
-	owner.objectives += O
 
 	. = ..()
 

code/modules/antagonists/ert/ert.dm

@@ -113,7 +113,6 @@
 /datum/antagonist/ert/proc/forge_objectives()
 	if(ert_team)
 		objectives |= ert_team.objectives
-	owner.objectives |= objectives
 
 /datum/antagonist/ert/proc/equipERT()
 	var/mob/living/carbon/human/H = owner.current

code/modules/antagonists/greentext/greentext.dm

@@ -8,7 +8,6 @@
 	O.completed = TRUE //YES!
 	O.owner = owner
 	objectives += O
-	owner.objectives += objectives
 
 /datum/antagonist/greentext/on_gain()
 	forge_objectives()

code/modules/antagonists/highlander/highlander.dm

@@ -24,8 +24,6 @@
 	hijack_objective.owner = owner
 	objectives += hijack_objective
 
-	owner.objectives |= objectives
-
 /datum/antagonist/highlander/on_gain()
 	forge_objectives()
 	owner.special_role = "highlander"

code/modules/antagonists/magic_servant/magic_servant.dm

@@ -0,0 +1,9 @@
+/datum/antagonist/magic_servant
+	name = "Magic Servant"
+	show_in_roundend = FALSE
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/magic_servant/proc/setup_master(mob/M)
+	var/datum/objective/O = new("Serve [M.real_name].")
+	O.owner = owner
+	objectives |= O

code/modules/antagonists/monkey/monkey.dm

@@ -63,7 +63,6 @@
 
 /datum/antagonist/monkey/proc/forge_objectives()
 	objectives |= monkey_team.objectives
-	owner.objectives |= objectives
 
 /datum/antagonist/monkey/admin_remove(mob/admin)
 	var/mob/living/carbon/monkey/M = owner.current

code/modules/antagonists/ninja/ninja.dm

@@ -96,7 +96,6 @@
 	var/datum/objective/O = new /datum/objective/survive()
 	O.owner = owner
 	objectives += O
-	owner.objectives |= objectives
 
 /proc/remove_ninja(mob/living/L)
 	if(!L || !L.mind)

code/modules/antagonists/nukeop/nukeop.dm

@@ -87,7 +87,7 @@
 
 /datum/antagonist/nukeop/proc/forge_objectives()
 	if(nuke_team)
-		owner.objectives |= nuke_team.objectives
+		objectives |= nuke_team.objectives
 
 /datum/antagonist/nukeop/proc/move_to_spawnpoint()
 	var/team_number = 1

code/modules/antagonists/official/official.dm

@@ -36,8 +36,6 @@
 		missionobj.completed = 1
 		mission = missionobj
 		objectives |= mission
-	owner.objectives |= objectives
-
 
 /datum/antagonist/official/on_gain()
 	forge_objectives()

code/modules/antagonists/overthrow/overthrow.dm

@@ -26,7 +26,6 @@
 // Sets objectives, equips all antags with the storage implant.
 /datum/antagonist/overthrow/on_gain()
 	objectives += team.objectives
-	owner.objectives += objectives
 	..()
 	owner.announce_objectives()
 	equip_overthrow()
@@ -34,7 +33,6 @@
 
 /datum/antagonist/overthrow/on_removal()
 	owner.special_role = null
-	owner.objectives -= objectives
 	..()
 
 // Creates the overthrow team, or sets it. The objectives are static for all the team members.

code/modules/antagonists/overthrow/overthrow_team.dm

@@ -35,7 +35,9 @@
 		objectives += heads_obj
 		for(var/i in members)
 			var/datum/mind/M = i
-			M.objectives += heads_obj
+			var/datum/antagonist/overthrow/O = M.has_antag_datum(/datum/antagonist/overthrow)
+			if(O)
+				O.objectives += heads_obj
 	heads_obj.find_targets()
 
 	addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)

code/modules/antagonists/pirate/pirate.dm

@@ -31,12 +31,7 @@
 
 /datum/antagonist/pirate/on_gain()
 	if(crew)
-		owner.objectives |= crew.objectives
-	. = ..()
-
-/datum/antagonist/pirate/on_removal()
-	if(crew)
-		owner.objectives -= crew.objectives
+		objectives |= crew.objectives
 	. = ..()
 
 /datum/team/pirate
@@ -53,7 +48,9 @@
 	getbooty.update_explanation_text()
 	objectives += getbooty
 	for(var/datum/mind/M in members)
-		M.objectives |= objectives
+		var/datum/antagonist/pirate/P = M.has_antag_datum(/datum/antagonist/pirate)
+		if(P)
+			P.objectives |= objectives
 
 
 /datum/objective/loot

code/modules/antagonists/revenant/revenant_antag.dm

@@ -14,8 +14,6 @@
 	objective2.owner = owner
 	objectives += objective2
 
-	owner.objectives |= objectives
-
 /datum/antagonist/revenant/on_gain()
 	forge_objectives()
 	. = ..()

code/modules/antagonists/revolution/revolution.dm

@@ -66,10 +66,10 @@
 	return rev_team
 
 /datum/antagonist/rev/proc/create_objectives()
-	owner.objectives |= rev_team.objectives
+	objectives |= rev_team.objectives
 
 /datum/antagonist/rev/proc/remove_objectives()
-	owner.objectives -= rev_team.objectives
+	objectives -= rev_team.objectives
 
 //Bump up to head_rev
 /datum/antagonist/rev/proc/promote()
@@ -265,7 +265,8 @@
 		new_target.update_explanation_text()
 		objectives += new_target
 	for(var/datum/mind/M in members)
-		M.objectives |= objectives
+		var/datum/antagonist/rev/R = M.has_antag_datum(/datum/antagonist/rev)
+		R.objectives |= objectives
 
 	addtimer(CALLBACK(src,.proc/update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
 

code/modules/antagonists/santa/santa.dm

@@ -0,0 +1,29 @@
+/datum/antagonist/santa
+	name = "Santa"
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/santa/on_gain()
+	. = ..()
+	give_equipment()
+	give_objective()
+
+/datum/antagonist/santa/greet()
+	. = ..()
+	to_chat(owner, "<span class='boldannounce'>You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag.</span>")
+
+/datum/antagonist/santa/proc/give_equipment()
+	var/mob/living/carbon/human/H = owner.current
+	if(istype(H))
+		H.equipOutfit(/datum/outfit/santa)
+
+	owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
+	var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new
+	telespell.clothes_req = 0 //santa robes aren't actually magical.
+	owner.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
+
+/datum/antagonist/santa/proc/give_objective()
+	var/datum/objective/santa_objective = new()
+	santa_objective.explanation_text = "Bring joy and presents to the station!"
+	santa_objective.completed = 1 //lets cut our santas some slack.
+	santa_objective.owner = owner
+	objectives |= santa_objective

code/modules/antagonists/slaughter/slaughter_antag.dm

@@ -26,8 +26,6 @@
 	new_objective2.explanation_text = "[objective_verb] everyone[summoner ? " else while you're at it":""]."
 	objectives += new_objective2
 
-	owner.objectives |= objectives
-
 /datum/antagonist/slaughter/laughter
 	name = "Laughter demon"
 	objective_verb = "Hug and Tickle"

code/modules/antagonists/survivalist/survivalist.dm

@@ -8,7 +8,6 @@
 	var/datum/objective/survive/survive = new
 	survive.owner = owner
 	objectives += survive
-	owner.objectives |= objectives
 
 /datum/antagonist/survivalist/on_gain()
 	owner.special_role = "survivalist"

code/modules/antagonists/traitor/IAA/internal_affairs.dm

@@ -78,15 +78,14 @@
 	scan_target = null
 	if(owner)
 		if(owner.mind)
-			if(owner.mind.objectives)
-				for(var/datum/objective/objective_ in owner.mind.objectives)
-					if(!is_internal_objective(objective_))
-						continue
-					var/datum/objective/assassinate/internal/objective = objective_
-					var/mob/current = objective.target.current
-					if(current&&current.stat!=DEAD)
-						scan_target = current
-					break
+			for(var/datum/objective/objective_ in owner.mind.get_all_objectives())
+				if(!is_internal_objective(objective_))
+					continue
+				var/datum/objective/assassinate/internal/objective = objective_
+				var/mob/current = objective.target.current
+				if(current&&current.stat!=DEAD)
+					scan_target = current
+				break
 
 /datum/status_effect/agent_pinpointer/tick()
 	if(!owner)
@@ -100,9 +99,9 @@
 	return (istype(O, /datum/objective/assassinate/internal)||istype(O, /datum/objective/destroy/internal))
 
 /datum/antagonist/traitor/proc/replace_escape_objective()
-	if(!owner||!owner.objectives)
+	if(!owner || !objectives.len)
 		return
-	for (var/objective_ in owner.objectives)
+	for (var/objective_ in objectives)
 		if(!(istype(objective_, /datum/objective/escape)||istype(objective_, /datum/objective/survive)))
 			continue
 		remove_objective(objective_)
@@ -112,9 +111,9 @@
 	add_objective(martyr_objective)
 
 /datum/antagonist/traitor/proc/reinstate_escape_objective()
-	if(!owner||!owner.objectives)
+	if(!owner||!objectives.len)
 		return
-	for (var/objective_ in owner.objectives)
+	for (var/objective_ in objectives)
 		if(!istype(objective_, /datum/objective/martyr))
 			continue
 		remove_objective(objective_)
@@ -131,7 +130,7 @@
 		return
 	to_chat(owner.current, "<span class='userdanger'> Target eliminated: [victim.name]</span>")
 	LAZYINITLIST(targets_stolen)
-	for(var/objective_ in victim.objectives)
+	for(var/objective_ in victim.get_all_objectives())
 		if(istype(objective_, /datum/objective/assassinate/internal))
 			var/datum/objective/assassinate/internal/objective = objective_
 			if(objective.target==owner)
@@ -159,7 +158,7 @@
 				var/status_text = objective.check_completion() ? "neutralised" : "active"
 				to_chat(owner.current, "<span class='userdanger'> New target added to database: [objective.target.name] ([status_text]) </span>")
 	last_man_standing = TRUE
-	for(var/objective_ in owner.objectives)
+	for(var/objective_ in objectives)
 		if(!is_internal_objective(objective_))
 			continue
 		var/datum/objective/assassinate/internal/objective = objective_
@@ -175,7 +174,7 @@
 
 /datum/antagonist/traitor/internal_affairs/proc/iaa_process()
 	if(owner&&owner.current&&owner.current.stat!=DEAD)
-		for(var/objective_ in owner.objectives)
+		for(var/objective_ in objectives)
 			if(!is_internal_objective(objective_))
 				continue
 			var/datum/objective/assassinate/internal/objective = objective_

code/modules/antagonists/traitor/datum_traitor.dm

@@ -55,12 +55,10 @@
 	owner.special_role = null
 	..()
 
-/datum/antagonist/traitor/proc/add_objective(var/datum/objective/O)
-	owner.objectives += O
+/datum/antagonist/traitor/proc/add_objective(datum/objective/O)
 	objectives += O
 
-/datum/antagonist/traitor/proc/remove_objective(var/datum/objective/O)
-	owner.objectives -= O
+/datum/antagonist/traitor/proc/remove_objective(datum/objective/O)
 	objectives -= O
 
 /datum/antagonist/traitor/proc/forge_traitor_objectives()
@@ -89,7 +87,7 @@
 		forge_single_objective()
 
 	if(is_hijacker && objective_count <= toa) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount
-		if (!(locate(/datum/objective/hijack) in owner.objectives))
+		if (!(locate(/datum/objective/hijack) in objectives))
 			var/datum/objective/hijack/hijack_objective = new
 			hijack_objective.owner = owner
 			add_objective(hijack_objective)
@@ -97,7 +95,7 @@
 
 
 	var/martyr_compatibility = 1 //You can't succeed in stealing if you're dead.
-	for(var/datum/objective/O in owner.objectives)
+	for(var/datum/objective/O in objectives)
 		if(!O.martyr_compatible)
 			martyr_compatibility = 0
 			break
@@ -109,7 +107,7 @@
 		return
 
 	else
-		if(!(locate(/datum/objective/escape) in owner.objectives))
+		if(!(locate(/datum/objective/escape) in objectives))
 			var/datum/objective/escape/escape_objective = new
 			escape_objective.owner = owner
 			add_objective(escape_objective)
@@ -159,7 +157,7 @@
 			kill_objective.find_target()
 			add_objective(kill_objective)
 	else
-		if(prob(15) && !(locate(/datum/objective/download) in owner.objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
+		if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
 			var/datum/objective/download/download_objective = new
 			download_objective.owner = owner
 			download_objective.gen_amount_goal()

code/modules/antagonists/valentines/heartbreaker.dm

@@ -9,7 +9,6 @@
 	var/datum/objective/martyr/normiesgetout = new
 	normiesgetout.owner = owner
 	objectives += normiesgetout
-	owner.objectives += objectives
 
 /datum/antagonist/heartbreaker/on_gain()
 	forge_objectives()

code/modules/antagonists/valentines/valentine.dm

@@ -12,7 +12,6 @@
 		protect_objective.human_check = FALSE
 	protect_objective.explanation_text = "Protect [date.name], your date."
 	objectives += protect_objective
-	owner.objectives += objectives
 
 /datum/antagonist/valentine/on_gain()
 	forge_objectives()
@@ -34,8 +33,8 @@
 //Squashed up a bit
 /datum/antagonist/valentine/roundend_report()
 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break
@@ -51,8 +50,8 @@
 
 /datum/antagonist/valentine/chem/roundend_report()
 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break

code/modules/antagonists/wishgranter/wishgranter.dm

@@ -8,7 +8,6 @@
 	var/datum/objective/hijack/hijack = new
 	hijack.owner = owner
 	objectives += hijack
-	owner.objectives |= objectives
 
 /datum/antagonist/wishgranter/on_gain()
 	owner.special_role = "Avatar of the Wish Granter"

code/modules/antagonists/wizard/equipment/artefact.dm

@@ -255,7 +255,7 @@
 
 /obj/item/voodoo/attackby(obj/item/I, mob/user, params)
 	if(target && cooldown < world.time)
-		if(I.is_hot())
+		if(I.get_temperature())
 			to_chat(target, "<span class='userdanger'>You suddenly feel very hot</span>")
 			target.adjust_bodytemperature(50)
 			GiveHint(target)

code/modules/antagonists/wizard/wizard.dm

@@ -57,19 +57,19 @@
 	if(!GLOB.wizardstart.len)
 		SSjob.SendToLateJoin(owner.current)
 		to_chat(owner, "HOT INSERTION, GO GO GO")
-	owner.current.forceMove(pick(GLOB.wizardstart))
+	else
+		owner.current.forceMove(pick(GLOB.wizardstart))
 
 /datum/antagonist/wizard/proc/create_objectives()
 	var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
+	new_objective.completed = TRUE //So they can greentext without admin intervention.
 	new_objective.owner = owner
 	objectives += new_objective
 
-	var/datum/objective/escape/escape_objective = new
-	escape_objective.owner = owner
-	objectives += escape_objective
-
-	for(var/datum/objective/O in objectives)
-		owner.objectives += O
+	if (!(locate(/datum/objective/escape) in objectives))
+		var/datum/objective/escape/escape_objective = new
+		escape_objective.owner = owner
+		objectives += escape_objective
 
 /datum/antagonist/wizard/on_removal()
 	unregister()
@@ -183,7 +183,6 @@
 	new_objective.owner = owner
 	new_objective.target = master
 	new_objective.explanation_text = "Protect [master.current.real_name], the wizard."
-	owner.objectives += new_objective
 	objectives += new_objective
 
 //Random event wizard
@@ -251,7 +250,6 @@
 /datum/antagonist/wizard/academy/create_objectives()
 	var/datum/objective/new_objective = new("Protect Wizard Academy from the intruders")
 	new_objective.owner = owner
-	owner.objectives += new_objective
 	objectives += new_objective
 
 //Solo wizard report

code/modules/awaymissions/corpse.dm

@@ -17,6 +17,7 @@
 	var/faction = null
 	var/permanent = FALSE	//If true, the spawner will not disappear upon running out of uses.
 	var/random = FALSE		//Don't set a name or gender, just go random
+	var/antagonist_type
 	var/objectives = null
 	var/uses = 1			//how many times can we spawn from it. set to -1 for infinite.
 	var/brute_damage = 0
@@ -111,9 +112,16 @@
 		if(show_flavour)
 			to_chat(M, "[flavour_text]")
 		var/datum/mind/MM = M.mind
+		var/datum/antagonist/A
+		if(antagonist_type)
+			A = MM.add_antag_datum(antagonist_type)
 		if(objectives)
+			if(!A)
+				A = MM.add_antag_datum(/datum/antagonist/custom)
 			for(var/objective in objectives)
-				MM.objectives += new/datum/objective(objective)
+				var/datum/objective/O = new/datum/objective(objective)
+				O.owner = MM
+				A.objectives += O
 		if(assignedrole)
 			M.mind.assigned_role = assignedrole
 		special(M, name)

code/modules/awaymissions/mission_code/Academy.dm

@@ -264,8 +264,9 @@
 			var/mob/living/carbon/human/H = new(drop_location())
 			H.equipOutfit(/datum/outfit/butler)
 			var/datum/mind/servant_mind = new /datum/mind()
-			var/datum/objective/O = new("Serve [user.real_name].")
-			servant_mind.objectives += O
+			var/datum/antagonist/magic_servant/A = new
+			servant_mind.add_antag_datum(A)
+			A.setup_master(user)
 			servant_mind.transfer_to(H)
 
 			var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H)

code/modules/cargo/exports/large_objects.dm

@@ -178,7 +178,7 @@
 	worth += gases[/datum/gas/bz]*4
 	worth += gases[/datum/gas/stimulum]*25
 	worth += gases[/datum/gas/hypernoblium]*1000
-	worth += gases[/datum/gas/miasma]*15
+	worth += gases[/datum/gas/miasma]*4
 	worth += gases[/datum/gas/tritium]*7
 	worth += gases[/datum/gas/pluoxium]*6
 	worth += gases[/datum/gas/nitryl]*30

code/modules/cargo/packs.dm

@@ -1,20 +1,20 @@
 /datum/supply_pack
 	var/name = "Crate"
 	var/group = ""
-	var/hidden = FALSE
-	var/contraband = FALSE
+	var/hidden = FALSE //Aka emag only
+	var/contraband = FALSE //Hacking the console with a multitool
 	var/cost = 700 // Minimum cost, or infinite points are possible.
-	var/access = FALSE
-	var/access_any = FALSE
-	var/list/contains = null
-	var/crate_name = "crate"
+	var/access = FALSE //What access does the Crate itself need?
+	var/access_any = FALSE //Do we care about access?
+	var/list/contains = null //What items are in the crate
+	var/crate_name = "crate" //The crate that comes with each order
 	var/desc = ""//no desc by default
-	var/crate_type = /obj/structure/closet/crate
+	var/crate_type = /obj/structure/closet/crate //what kind of crate - Locked crates needed for access locked crates
 	var/dangerous = FALSE // Should we message admins?
 	var/special = FALSE //Event/Station Goals/Admin enabled packs
 	var/special_enabled = FALSE
-	var/DropPodOnly = FALSE//only usable by the Bluespace Drop Pod via the express cargo console
-	var/admin_spawned = FALSE
+	var/DropPodOnly = FALSE //only usable by the Bluespace Drop Pod via the express cargo console
+	var/admin_spawned = FALSE //Can only an admin spawn this crate?
 
 /datum/supply_pack/proc/generate(atom/A)
 	var/obj/structure/closet/crate/C = new crate_type(A)

code/modules/cargo/packs/armory.dm

@@ -87,7 +87,7 @@
 /datum/supply_pack/security/armory/mindshield
 	name = "Mindshield Implants Crate"
 	desc = "Prevent against radical thoughts with three Mindshield implants. Requires Armory access to open."
-	cost = 3000 //Lowered untill cargo rework MK II is done
+	cost = 4000
 	contains = list(/obj/item/storage/lockbox/loyalty)
 	crate_name = "mindshield implant crate"
 

code/modules/cargo/packs/livestock.dm

@@ -112,13 +112,6 @@
 	contains = list(/mob/living/simple_animal/hostile/retaliate/goose)
 	crate_name = "goose crate"
 
-/datum/supply_pack/critter/monkey
-	name = "Monkey Cube Crate"
-	desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
-	cost = 2000
-	contains = list (/obj/item/storage/box/monkeycubes)
-	crate_name = "monkey cube crate"
-
 /datum/supply_pack/critter/pug
 	name = "Pug Crate"
 	desc = "Like a normal dog, but... squished. Comes with a nice collar!"

code/modules/cargo/packs/science.dm

@@ -10,6 +10,47 @@
 	group = "Science"
 	crate_type = /obj/structure/closet/crate/science
 
+/* For later
+/datum/supply_pack/science/monkey
+	name = "Ape Cube Crate"
+	desc = "Pss what a new test subject with supper strangth, speed, and love for bananas all at the same time? Say no more... Contains a single ape cube. Dont add water!"
+	contraband = TRUE
+	cost = 2500
+	contains = list (/obj/item/reagent_containers/food/snacks/monkeycube/ape)
+	crate_name = "ape cube crate"
+*/
+
+/datum/supply_pack/science/aliens
+	name = "Advanced Alien Alloy Crate Crate"
+	desc = "Hello brothers from the stars!!! Our fellow brethren have made contact at long last and gave us gifts man! They really did build the prymi- Connection Error- Bro we’ll send you a sheet of advanced alien alloy."
+	cost = 15000
+	contraband = TRUE
+	DropPodOnly = TRUE
+	contains = list(/obj/item/stack/sheet/mineral/abductor)
+	crate_name = "alien bro alloy crate"
+
+/datum/supply_pack/science/beakers
+	name = "Chemistry Beackers Crate"
+	desc = "Glassware for any chemistry lab! Contains four small beakers, three large, two plastic, and one metamaterial. As well as three droppers and two pairs of latex gloves."
+	cost = 1500
+	contains = list(/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/plastic,
+					/obj/item/reagent_containers/glass/beaker/plastic,
+					/obj/item/reagent_containers/glass/beaker/meta,
+					/obj/item/reagent_containers/glass/beaker/noreact,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/clothing/gloves/color/latex,
+					/obj/item/clothing/gloves/color/latex)
+	crate_name = "chemistry beaker crate"
+
 /datum/supply_pack/science/robotics/mecha_odysseus
 	name = "Circuit Crate (Odysseus)"
 	desc = "Ever wanted to build your own giant medical robot? Well, now you can! Contains the Odysseus main control board and Odysseus peripherals board. Requires Robotics access to open."
@@ -41,6 +82,33 @@
 					/obj/item/integrated_electronics/wirer)
 	crate_name = "circuitry starter pack crate"
 
+/datum/supply_pack/science/monkey
+	name = "Monkey Cube Crate"
+	desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
+	cost = 2000
+	contains = list (/obj/item/storage/box/monkeycubes)
+	crate_name = "monkey cube crate"
+
+/datum/supply_pack/science/nitrilegloves
+	name = "Nitrile Gloves Crate"
+	desc = "Handling toxic chemicals? Well worry not, keep your flesh intact with some nitrile made gloves! Contains three pairs of nitrile gloves."
+	cost = 1500
+	contains = list(/obj/item/clothing/gloves/color/latex/nitrile,
+					/obj/item/clothing/gloves/color/latex/nitrile,
+					/obj/item/clothing/gloves/color/latex/nitrile)
+	crate_name = "nitrile gloves crate"
+
+/datum/supply_pack/science/nuke_b_gone
+	name = "Nuke Defusal Kit"
+	desc = "Contains set of tools to defuse a nuke."
+	cost = 7500 //Usefull for traitors/nukies that fucked up
+	dangerous = TRUE
+	DropPodOnly = TRUE
+	contains = list(/obj/item/nuke_core_container/nt,
+					/obj/item/screwdriver/nuke/nt,
+					/obj/item/paper/guides/nt/nuke_instructions)
+	crate_name = "safe defusal kit storage"
+
 /datum/supply_pack/science/plasma
 	name = "Plasma Assembly Crate"
 	desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
@@ -61,6 +129,15 @@
 	crate_name = "plasma assembly crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 
+/datum/supply_pack/science/relic
+	name = "Relic Crate"
+	desc = "Ever want to play with old discounted toys? Look no more. Contains two relics."
+	cost = 1000
+	contraband = TRUE
+	contains = list(/obj/item/relic,
+					/obj/item/relic)
+	crate_name = "relic crate"
+
 /datum/supply_pack/science/robotics
 	name = "Robotics Assembly Crate"
 	desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains three proximity sensors, two high-powered cells, six flashes, and an electrical toolbox. Requires Robotics access to open."
@@ -88,10 +165,30 @@
 	crate_name = "shield generators crate"
 	crate_type = /obj/structure/closet/crate/secure/science
 
+/datum/supply_pack/science/slime
+	name = "Slime Core Crate"
+	desc = "Ran out of slimes? No problem, contains one gray slime core. Requires Xenobio access to open."
+	cost = 1000
+	access = ACCESS_XENOBIOLOGY
+	contains = list(/obj/item/slime_extract/grey)
+	crate_name = "slime core crate"
+	crate_type = /obj/structure/closet/crate/secure/science
+
+/datum/supply_pack/science/supermater
+	name = "Supermatter Extraction Tools Crate"
+	desc = "Contains a set of tools to extract a sliver of supermatter. Consult your CE today!"
+	cost = 7500 //Usefull for traitors that fucked up
+	hidden = TRUE
+	contains = list(/obj/item/nuke_core_container/supermatter,
+					/obj/item/scalpel/supermatter,
+					/obj/item/hemostat/supermatter,
+					/obj/item/paper/guides/antag/supermatter_sliver)
+	crate_name = "supermatter extraction kit crate"
+
 /datum/supply_pack/science/tablets
 	name = "Tablet Crate"
 	desc = "What's a computer? Contains five cargo tablets."
-	cost = 5000
+	cost = 3000
 	contains = list(/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,

code/modules/clothing/head/hardhat.dm

@@ -17,19 +17,26 @@
 
 	dog_fashion = /datum/dog_fashion/head
 
-/obj/item/clothing/head/hardhat/attack_self(mob/user)
-	on = !on
-	icon_state = "hardhat[on]_[item_color]"
-	item_state = "hardhat[on]_[item_color]"
-	user.update_inv_head()	//so our mob-overlays update
+/obj/item/clothing/head/hardhat/attack_self(mob/living/user)
+	toggle_helmet_light(user)
 
+/obj/item/clothing/head/hardhat/proc/toggle_helmet_light(mob/living/user)
+	on = !on
 	if(on)
 		turn_on(user)
 	else
 		turn_off(user)
+	update_icon()
+
+/obj/item/clothing/head/hardhat/update_icon()
+	icon_state = "hardhat[on]_[item_color]"
+	item_state = "hardhat[on]_[item_color]"
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		H.update_inv_head()
 	for(var/X in actions)
 		var/datum/action/A = X
-		A.UpdateButtonIcon()
+		A.UpdateButtonIcon(force = TRUE)
 
 /obj/item/clothing/head/hardhat/proc/turn_on(mob/user)
 	set_light(brightness_on, power_on)
@@ -86,3 +93,68 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
 	mutantrace_variation = MUTANTRACE_VARIATION
+
+/obj/item/clothing/head/hardhat/weldhat
+	name = "welding hard hat"
+	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield! The bulb seems a little smaller though."
+	brightness_on = 3 //Needs a little bit of tradeoff
+	dog_fashion = null
+	actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen)
+	flash_protect = 2
+	tint = 2
+	flags_inv = HIDEEYES | HIDEFACE
+	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
+	visor_flags_inv = HIDEEYES | HIDEFACE
+	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+
+/obj/item/clothing/head/hardhat/weldhat/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/clothing/head/hardhat/weldhat/attack_self(mob/living/user)
+	toggle_helmet_light(user)
+
+/obj/item/clothing/head/hardhat/weldhat/AltClick(mob/user)
+	if(user.canUseTopic(src, BE_CLOSE))
+		toggle_welding_screen(user)
+
+/obj/item/clothing/head/hardhat/weldhat/proc/toggle_welding_screen(mob/living/user)
+	if(weldingvisortoggle(user))
+		playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
+	update_icon()
+
+/obj/item/clothing/head/hardhat/weldhat/worn_overlays(isinhands)
+	. = ..()
+	if(!isinhands)
+		. += mutable_appearance('icons/mob/head.dmi', "weldhelmet")
+		if(!up)
+			. += mutable_appearance('icons/mob/head.dmi', "weldvisor")
+
+/obj/item/clothing/head/hardhat/weldhat/update_icon()
+	cut_overlays()
+	if(!up)
+		add_overlay("weldvisor")
+	..()
+
+/obj/item/clothing/head/hardhat/weldhat/orange
+	icon_state = "hardhat0_orange"
+	item_state = "hardhat0_orange"
+	item_color = "orange"
+
+/obj/item/clothing/head/hardhat/weldhat/white
+	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield!" //This bulb is not smaller
+	icon_state = "hardhat0_white"
+	item_state = "hardhat0_white"
+	brightness_on = 4 //Boss always takes the best stuff
+	item_color = "white"
+	clothing_flags = STOPSPRESSUREDAMAGE
+	heat_protection = HEAD
+	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+	cold_protection = HEAD
+	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+
+/obj/item/clothing/head/hardhat/weldhat/dblue
+	icon_state = "hardhat0_dblue"
+	item_state = "hardhat0_dblue"
+	item_color = "dblue"

code/modules/clothing/head/misc_special.dm

@@ -77,7 +77,7 @@
 	hitsound = 'sound/weapons/tap.ogg'
 	STOP_PROCESSING(SSobj, src)
 
-/obj/item/clothing/head/hardhat/cakehat/is_hot()
+/obj/item/clothing/head/hardhat/cakehat/get_temperature()
 	return on * heat
 /*
  * Ushanka

code/modules/crafting/recipes/recipes_misc.dm

@@ -4,7 +4,7 @@
 
 /datum/crafting_recipe/showercurtain
 	name = "Shower Curtains"
-	reqs = 	list(/obj/item/stack/sheet/cloth = 2, 
+	reqs = 	list(/obj/item/stack/sheet/cloth = 2,
 				 /obj/item/stack/sheet/plastic = 2,
 				 /obj/item/stack/rods = 1)
 	result = /obj/structure/curtain
@@ -197,14 +197,6 @@
 				/obj/item/bikehorn = 1)
 	category = CAT_MISC
 
-/datum/crafting_recipe/aitater
-	name = "intelliTater"
-	result = /obj/item/aicard/aitater
-	time = 30
-	reqs = list(/obj/item/aicard = 1,
-					/obj/item/reagent_containers/food/snacks/grown/potato = 1)
-	category = CAT_MISC
-
 /datum/crafting_recipe/mousetrap
 	name = "Mouse Trap"
 	result = /obj/item/assembly/mousetrap

code/modules/crafting/recipes/recipes_robot.dm

@@ -77,8 +77,22 @@
 	time = 40
 	category = CAT_ROBOT
 
-/datum/crafting_recipe/potatos
-	name = "Potat-OS"
-	reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1,  /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/aicard = 1 )
-	result = /obj/item/aicard/potato
+/datum/crafting_recipe/aitater
+	name = "intelliTater"
+	result = /obj/item/aicard/aitater
+	time = 30
+	tools = list(TOOL_WIRECUTTER)
+	reqs = list(/obj/item/aicard = 1,
+				/obj/item/reagent_containers/food/snacks/grown/potato = 1,
+				/obj/item/stack/cable_coil = 5)
+	category = CAT_ROBOT
+
+/datum/crafting_recipe/aispook
+	name = "intelliLantern"
+	result = /obj/item/aicard/aispook
+	time = 30
+	tools = list(TOOL_WIRECUTTER)
+	reqs = list(/obj/item/aicard = 1,
+					/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1,
+					/obj/item/stack/cable_coil = 5)
 	category = CAT_ROBOT