Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

code/game/atoms.dm

@@ -150,6 +150,7 @@
 	return 0
 
 /atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+	SendSignal(COMSIG_ATOM_HULK_ATTACK, user)
 	if(does_attack_animation)
 		user.changeNext_move(CLICK_CD_MELEE)
 		add_logs(user, src, "punched", "hulk powers")
@@ -222,10 +223,12 @@
 	return
 
 /atom/proc/emp_act(severity)
+	SendSignal(COMSIG_ATOM_EMP_ACT, severity)
 	if(istype(wires) && !(flags_2 & NO_EMP_WIRES_2))
 		wires.emp_pulse()
 
 /atom/proc/bullet_act(obj/item/projectile/P, def_zone)
+	SendSignal(COMSIG_ATOM_BULLET_ACT, P, def_zone)
 	. = P.on_hit(src, 0, def_zone)
 
 /atom/proc/in_contents_of(container)//can take class or object instance as argument
@@ -291,6 +294,7 @@
 				to_chat(user, "[total_volume] units of various reagents")
 		else
 			to_chat(user, "Nothing.")
+	SendSignal(COMSIG_PARENT_EXAMINE, user)
 
 /atom/proc/relaymove(mob/user)
 	if(buckle_message_cooldown <= world.time)
@@ -307,9 +311,11 @@
 	SendSignal(COMSIG_ATOM_EX_ACT, severity, target)
 
 /atom/proc/blob_act(obj/structure/blob/B)
+	SendSignal(COMSIG_ATOM_BLOB_ACT, B)
 	return
 
 /atom/proc/fire_act(exposed_temperature, exposed_volume)
+	SendSignal(COMSIG_ATOM_FIRE_ACT, exposed_temperature, exposed_volume)
 	return
 
 /atom/proc/hitby(atom/movable/AM, skipcatch, hitpush, blocked)
@@ -448,7 +454,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 		cur_y = y_arr.Find(src.z)
 		if(cur_y)
 			break
-//	to_chat(world, "X = [cur_x]; Y = [cur_y]")
 	if(cur_x && cur_y)
 		return list("x"=cur_x,"y"=cur_y)
 	else
@@ -473,21 +478,26 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 	SendSignal(COMSIG_ATOM_SING_PULL, S, current_size)
 
 /atom/proc/acid_act(acidpwr, acid_volume)
+	SendSignal(COMSIG_ATOM_ACID_ACT, acidpwr, acid_volume)
 	return
 
 /atom/proc/emag_act()
+	SendSignal(COMSIG_ATOM_EMAG_ACT)
 	return
 
 /atom/proc/narsie_act()
+	SendSignal(COMSIG_ATOM_NARSIE_ACT)
 	return
 
 /atom/proc/ratvar_act()
+	SendSignal(COMSIG_ATOM_RATVAR_ACT)
 	return
 
 /atom/proc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	return FALSE
 
 /atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+	SendSignal(COMSIG_ATOM_RCD_ACT, user, the_rcd, passed_mode)
 	return FALSE
 
 /atom/proc/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
@@ -627,3 +637,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 
 /atom/Entered(atom/movable/AM, atom/oldLoc)
 	SendSignal(COMSIG_ATOM_ENTERED, AM, oldLoc)
+
+/atom/proc/return_temperature()
+	return

code/game/atoms_movable.dm

@@ -1,4 +1,3 @@
-
 /atom/movable
 	layer = OBJ_LAYER
 	var/last_move = null
@@ -117,6 +116,7 @@
 
 //Called after a successful Move(). By this point, we've already moved
 /atom/movable/proc/Moved(atom/OldLoc, Dir)
+	SendSignal(COMSIG_MOVABLE_MOVED, OldLoc, Dir)
 	if (!inertia_moving)
 		inertia_next_move = world.time + inertia_move_delay
 		newtonian_move(Dir)
@@ -215,6 +215,7 @@
 //to differentiate it, naturally everyone forgot about this immediately and so some things
 //would bump twice, so now it's called Collide
 /atom/movable/proc/Collide(atom/A)
+	SendSignal(COMSIG_MOVABLE_COLLIDE, A)
 	if(A)
 		if(throwing)
 			throwing.hit_atom(A)
@@ -308,6 +309,7 @@
 
 /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum)
 	set waitfor = 0
+	SendSignal(COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum)
 	return hit_atom.hitby(src)
 
 /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked)
@@ -315,7 +317,8 @@
 		step(src, AM.dir)
 	..()
 
-/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
+/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback) //If this returns FALSE then callback will not be called.
+	. = FALSE
 	if (!target || (flags_1 & NODROP_1) || speed <= 0)
 		return
 
@@ -344,7 +347,9 @@
 			//then lets add it to speed
 			speed += user_momentum
 			if (speed <= 0)
-				return //no throw speed, the user was moving too fast.
+				return//no throw speed, the user was moving too fast.
+
+	. = TRUE // No failure conditions past this point.
 
 	var/datum/thrownthing/TT = new()
 	TT.thrownthing = src
@@ -692,4 +697,4 @@
 		return FALSE
 	if(anchored || throwing)
 		return FALSE
-	return TRUE
+	return TRUE

code/game/gamemodes/antag_spawner.dm

@@ -261,7 +261,7 @@
 
 /obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "")
 
-	var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
+	var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
 	var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
 	S.holder = holder
 	S.key = C.key

code/game/gamemodes/antag_spawner.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm	(rejected hunks)
-@@ -108,6 +108,7 @@
- 		new_objective.explanation_text = "Protect [usr.real_name], the wizard."
- 		M.mind.objectives += new_objective
- 	SSticker.mode.apprentices += M.mind
-+	M.mind.assigned_role = "Apprentice"
- 	M.mind.special_role = "apprentice"
- 	SSticker.mode.update_wiz_icons_added(M.mind)
- 	M << sound('sound/effects/magic.ogg')

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -229,13 +229,29 @@
 
 /mob/living/simple_animal/hostile/blob/blobbernaut/Life()
 	if(..())
+		var/list/blobs_in_area = range(2, src)
 		if(independent)
 			return // strong independent blobbernaut that don't need no blob
 		var/damagesources = 0
-		if(!(locate(/obj/structure/blob) in range(2, src)))
+		if(!(locate(/obj/structure/blob) in blobs_in_area))
 			damagesources++
 		if(!factory)
 			damagesources++
+		else
+			if(locate(/obj/structure/blob/core) in blobs_in_area)
+				adjustHealth(-maxHealth*0.1)
+				var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
+				if(overmind)
+					H.color = overmind.blob_reagent_datum.complementary_color
+				else
+					H.color = "#000000"
+			if(locate(/obj/structure/blob/node) in blobs_in_area)
+				adjustHealth(-maxHealth*0.05)
+				var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src))
+				if(overmind)
+					H.color = overmind.blob_reagent_datum.complementary_color
+				else
+					H.color = "#000000"
 		if(damagesources)
 			for(var/i in 1 to damagesources)
 				adjustHealth(maxHealth*0.025) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both

code/game/gamemodes/blob/overmind.dm

@@ -57,7 +57,7 @@
 		if(!placed)
 			if(manualplace_min_time && world.time >= manualplace_min_time)
 				to_chat(src, "<b><span class='big'><font color=\"#EE4000\">You may now place your blob core.</font></span></b>")
-				to_chat(src, "<span class='big'><font color=\"#EE4000\">You will automatically place your blob core in [round((autoplace_max_time - world.time)/600, 0.5)] minutes.</font></span>")
+				to_chat(src, "<span class='big'><font color=\"#EE4000\">You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].</font></span>")
 				manualplace_min_time = 0
 			if(autoplace_max_time && world.time >= autoplace_max_time)
 				place_blob_core(base_point_rate, 1)

code/game/gamemodes/blob/powers.dm

@@ -365,5 +365,5 @@
 	to_chat(src, "<b>Shortcuts:</b> Click = Expand Blob <b>|</b> Middle Mouse Click = Rally Spores <b>|</b> Ctrl Click = Create Shield Blob <b>|</b> Alt Click = Remove Blob")
 	to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.")
 	if(!placed && autoplace_max_time <= world.time)
-		to_chat(src, "<span class='big'><font color=\"#EE4000\">You will automatically place your blob core in [round((autoplace_max_time - world.time)/600, 0.5)] minutes.</font></span>")
+		to_chat(src, "<span class='big'><font color=\"#EE4000\">You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].</font></span>")
 		to_chat(src, "<span class='big'><font color=\"#EE4000\">You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.</font></span>")

code/game/gamemodes/brother/traitor_bro.dm

@@ -0,0 +1,140 @@
+/datum/objective_team/brother_team
+	name = "brotherhood" 
+	member_name = "blood brother" 
+	var/list/objectives = list()
+	var/meeting_area
+
+/datum/objective_team/brother_team/is_solo()
+	return FALSE
+
+/datum/objective_team/brother_team/proc/add_objective(datum/objective/O, needs_target = FALSE)
+	O.team = src
+	if(needs_target)
+		O.find_target()
+	O.update_explanation_text()
+	objectives += O
+
+/datum/objective_team/brother_team/proc/forge_brother_objectives()
+	objectives = list()
+	var/is_hijacker = prob(10)
+	for(var/i = 1 to max(1, config.brother_objectives_amount + (members.len > 2) - is_hijacker))
+		forge_single_objective()
+	if(is_hijacker)
+		if(!locate(/datum/objective/hijack) in objectives)
+			add_objective(new/datum/objective/hijack)
+	else if(!locate(/datum/objective/escape) in objectives)
+		add_objective(new/datum/objective/escape)
+
+/datum/objective_team/brother_team/proc/forge_single_objective()
+	if(prob(50))
+		if(LAZYLEN(active_ais()) && prob(100/GLOB.joined_player_list.len))
+			add_objective(new/datum/objective/destroy, TRUE)
+		else if(prob(30))
+			add_objective(new/datum/objective/maroon, TRUE)
+		else
+			add_objective(new/datum/objective/assassinate, TRUE)
+	else
+		add_objective(new/datum/objective/steal, TRUE)
+
+/datum/game_mode
+	var/list/datum/mind/brothers = list()
+	var/list/datum/objective_team/brother_team/brother_teams = list()
+
+/datum/game_mode/traitor/bros
+	name = "traitor+brothers"
+	config_tag = "traitorbro"
+	restricted_jobs = list("AI", "Cyborg")
+
+	announce_span = "danger"
+	announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\
+	<span class='danger'>Traitors</span>: Accomplish your objectives.\n\
+	<span class='danger'>Blood Brothers</span>: Accomplish your objectives.\n\
+	<span class='notice'>Crew</span>: Do not let the traitors or brothers succeed!"
+
+	var/list/datum/objective_team/brother_team/pre_brother_teams = list()
+	var/const/team_amount = 2 //hard limit on brother teams if scaling is turned off
+	var/const/min_team_size = 2
+
+	var/meeting_areas = list("The Bar", "Dorms", "Escape Dock", "Arrivals", "Holodeck", "Primary Tool Storage", "Recreation Area", "Chapel", "Library")
+
+/datum/game_mode/traitor/bros/pre_setup()
+	if(config.protect_roles_from_antagonist)
+		restricted_jobs += protected_jobs
+	if(config.protect_assistant_from_antagonist)
+		restricted_jobs += "Assistant"
+
+	var/list/datum/mind/possible_brothers = get_players_for_role(ROLE_BROTHER)
+
+	var/num_teams = team_amount
+	if(config.brother_scaling_coeff)
+		num_teams = max(1, round(num_players()/config.brother_scaling_coeff))
+
+	for(var/j = 1 to num_teams)
+		if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies) 
+			break
+		var/datum/objective_team/brother_team/team = new
+		var/team_size = prob(10) ? min(3, possible_brothers.len) : 2
+		for(var/k = 1 to team_size)
+			var/datum/mind/bro = pick(possible_brothers)
+			possible_brothers -= bro
+			antag_candidates -= bro
+			team.members += bro
+			bro.restricted_roles = restricted_jobs
+			log_game("[bro.key] (ckey) has been selected as a Brother")
+		pre_brother_teams += team
+	return ..()
+
+/datum/game_mode/traitor/bros/post_setup()
+	for(var/datum/objective_team/brother_team/team in pre_brother_teams)
+		team.meeting_area = pick(meeting_areas)
+		meeting_areas -= team.meeting_area
+		team.forge_brother_objectives()
+		for(var/datum/mind/M in team.members)
+			M.add_antag_datum(ANTAG_DATUM_BROTHER, team)
+			modePlayer += M
+	brother_teams += pre_brother_teams
+	return ..()
+
+/datum/game_mode/traitor/bros/generate_report()
+	return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Nanotrasen, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust."
+
+/datum/game_mode/proc/auto_declare_completion_brother()
+	if(!LAZYLEN(brother_teams))
+		return
+	var/text = "<br><font size=4><b>The blood brothers were:</b></font>"
+	var/teamnumber = 1
+	for(var/datum/objective_team/brother_team/team in brother_teams)
+		if(!team.members.len)
+			continue
+		text += "<br><font size=3><b>Team #[teamnumber++]</b></font>"
+		for(var/datum/mind/M in team.members)
+			text += printplayer(M)
+		var/win = TRUE
+		var/objective_count = 1
+		for(var/datum/objective/objective in team.objectives)
+			if(objective.check_completion())
+				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
+				SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
+			else
+				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+				SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
+				win = FALSE
+			objective_count++
+		if(win)
+			text += "<br><font color='green'><B>The blood brothers were successful!</B></font>"
+			SSblackbox.add_details("brother_success","SUCCESS")
+		else
+			text += "<br><font color='red'><B>The blood brothers have failed!</B></font>"
+			SSblackbox.add_details("brother_success","FAIL")
+		text += "<br>"
+	to_chat(world, text)
+
+/datum/game_mode/proc/update_brother_icons_added(datum/mind/brother_mind)
+	var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER]
+	brotherhud.join_hud(brother_mind.current)
+	set_antag_hud(brother_mind.current, "brother")
+
+/datum/game_mode/proc/update_brother_icons_removed(datum/mind/brother_mind)
+	var/datum/atom_hud/antag/brotherhud = GLOB.huds[ANTAG_HUD_BROTHER]
+	brotherhud.leave_hud(brother_mind.current)
+	set_antag_hud(brother_mind.current, null)

code/game/gamemodes/changeling/changeling.dm

@@ -340,6 +340,10 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
 			return
 	if(!target)
 		return
+	if(NO_DNA_COPY in target.dna.species.species_traits)
+		if(verbose)
+			to_chat(user, "<span class='warning'>[target] is not compatible with our biology.</span>")
+		return
 	if((target.disabilities & NOCLONE) || (target.disabilities & HUSK))
 		if(verbose)
 			to_chat(user, "<span class='warning'>DNA of [target] is ruined beyond usability!</span>")

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -207,7 +207,7 @@
 		time_duration = round(time_duration * (2 * efficiency), 1)
 		CO.active = TRUE //you'd be active in a second but you should update immediately
 	invoker.visible_message("<span class='warning'>The air in front of [invoker] ripples before suddenly tearing open!</span>", \
-	"<span class='brass'>With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [time_duration / 10] seconds and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].</span>")
+	"<span class='brass'>With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [DisplayTimeText(time_duration)] and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].</span>")
 	var/obj/effect/clockwork/spatial_gateway/S1 = new(issrcobelisk ? get_turf(src) : get_step(get_turf(invoker), invoker.dir))
 	var/obj/effect/clockwork/spatial_gateway/S2 = new(istargetobelisk ? get_turf(target) : get_step(get_turf(target), target.dir))
 

code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm

@@ -318,23 +318,10 @@
 		if(servants > SCRIPT_SERVANT_REQ)
 			servants -= SCRIPT_SERVANT_REQ
 			production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM)
-		var/production_text_addon = ""
 		if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM)
-			production_text_addon = ", which increases for each human or silicon Servant above <b>[SCRIPT_SERVANT_REQ]</b>"
-		production_time = production_time/600
-		var/list/production_text
-		if(round(production_time))
-			production_text = list("<b>[round(production_time)] minute\s")
-		if(production_time != round(production_time))
-			production_time -= round(production_time)
-			production_time *= 60
-			if(!LAZYLEN(production_text))
-				production_text = list("<b>[round(production_time, 1)] second\s")
-			else
-				production_text += " and [round(production_time, 1)] second\s"
-		production_text += "</b>"
-		production_text += production_text_addon
-		production_text = production_text.Join()
+			production_time = "<b>[DisplayTimeText(production_time)]</b>, which increases for each human or silicon Servant above <b>[SCRIPT_SERVANT_REQ]</b>"
+		else
+			production_time = "<b>[DisplayTimeText(production_time)]</b>"
 
 		textlist = list("<font color=#BE8700 size=3><b><center>[text2ratvar("Purge all untruths and honor Engine.")]</center></b></font><br>\
 		\
@@ -439,23 +426,10 @@
 			if(servants > SCRIPT_SERVANT_REQ)
 				servants -= SCRIPT_SERVANT_REQ
 				production_time += min(SLAB_SERVANT_SLOWDOWN * servants, SLAB_SLOWDOWN_MAXIMUM)
-			var/production_text_addon = ""
 			if(production_time != SLAB_PRODUCTION_TIME+SLAB_SLOWDOWN_MAXIMUM)
-				production_text_addon = ", which increases for each human or silicon Servant above <b>[SCRIPT_SERVANT_REQ]</b>"
-			production_time = production_time/600
-			var/list/production_text
-			if(round(production_time))
-				production_text = list("<b>[round(production_time)] minute\s")
-			if(production_time != round(production_time))
-				production_time -= round(production_time)
-				production_time *= 60
-				if(!LAZYLEN(production_text))
-					production_text = list("<b>[round(production_time, 1)] second\s")
-				else
-					production_text += " and [round(production_time, 1)] second\s"
-			production_text += "</b>"
-			production_text += production_text_addon
-			production_text = production_text.Join()
+				production_time = "<b>[DisplayTimeText(production_time)]</b>, which increases for each human or silicon Servant above <b>[SCRIPT_SERVANT_REQ]</b>"
+			else
+				production_time = "<b>[DisplayTimeText(production_time)]</b>"
 			dat += "<font color=#BE8700 size=3>Components & Their Uses</font><br><br>"
 			dat += "<b>Components</b> are your primary resource as a Servant. There are five types of component, with each one being used in different roles:<br><br>"
 			dat += "<font color=#6E001A>[get_component_icon(BELLIGERENT_EYE)]BE</font> Belligerent Eyes are aggressive and judgemental, and are used in offensive scripture;<br>"
@@ -466,7 +440,7 @@
 			dat += "Although this is a good rule of thumb, their effects become much more nuanced when used together. For instance, a turret might have both belligerent eyes and \
 			vanguard cogwheels as construction requirements, because it defends its allies by harming its enemies.<br><br>"
 			dat += "Components' primary use is fueling <b>scripture</b> (covered in its own section), and they can be created through various ways. This clockwork slab, for instance, \
-			will make a random component of every type - or a specific one, if you choose a target component from the interface - every <b>[production_text]</b>. This number will increase \
+			will make a random component of every type - or a specific one, if you choose a target component from the interface - every [production_time]. This number will increase \
 			as the amount of Servants in the covenant increase; additionally, slabs can only produce components when held by a Servant, and holding more than one slab will cause both \
 			of them to halt progress until one of them is removed from their person.<br><br>"
 			dat += "Your slab has an internal storage of components, but it isn't meant to be the main one. Instead, there's a <b>global storage</b> of components that can be \

code/game/gamemodes/clock_cult/clock_items/soul_vessel.dm

@@ -23,6 +23,7 @@
 	autoping = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	force_replace_ai_name = TRUE
+	overrides_aicore_laws = TRUE
 
 /obj/item/device/mmi/posibrain/soul_vessel/Initialize()
 	. = ..()

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -101,7 +101,7 @@
 		glow.linked = src
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity)
-	var/damage = max((obj_integrity * 0.70) / severity, 100) //requires multiple bombs to take down
+	var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down
 	take_damage(damage, BRUTE, "bomb", 0)
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/attackby(obj/item/I, mob/living/user, params) //add components directly to the ark

code/game/gamemodes/clock_cult/clock_structures/tinkerers_cache.dm

@@ -105,7 +105,7 @@
 	..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		if(linkedwall)
-			to_chat(user, "<span class='brass'>It is linked to a Clockwork Wall and will generate a component every <b>[round(get_production_time() * 0.1, 0.1)]</b> seconds!</span>")
+			to_chat(user, "<span class='brass'>It is linked to a Clockwork Wall and will generate a component every <b>[DisplayTimeText(get_production_time())]</b>!</span>")
 		else
 			to_chat(user, "<span class='alloy'>It is unlinked! Construct a Clockwork Wall nearby to generate components!</span>")
 		to_chat(user, "<b>Stored components:</b>")

code/game/gamemodes/cult/cult_comms.dm

@@ -96,7 +96,7 @@
 
 /proc/pollCultists(var/mob/living/Nominee) //Cult Master Poll
 	if(world.time < CULT_POLL_WAIT)
-		to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds.")
+		to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].")
 		return
 	GLOB.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
 	for(var/datum/mind/B in SSticker.mode.cult)
@@ -232,7 +232,7 @@
 		return FALSE
 	if(cooldown > world.time)
 		if(!CM.active)
-			to_chat(owner, "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>")
+			to_chat(owner, "<span class='cultlarge'><b>You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!</b></span>")
 		return FALSE
 	return ..()
 
@@ -324,7 +324,7 @@
 		return FALSE
 	if(cooldown > world.time)
 		if(!PM.active)
-			to_chat(owner, "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can pulse again!</b></span>")
+			to_chat(owner, "<span class='cultlarge'><b>You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!</b></span>")
 		return FALSE
 	return ..()
 

code/game/gamemodes/cult/cult_structures.dm

@@ -10,7 +10,7 @@
 	..()
 	to_chat(user, "<span class='notice'>\The [src] is [anchored ? "":"not "]secured to the floor.</span>")
 	if((iscultist(user) || isobserver(user)) && cooldowntime > world.time)
-		to_chat(user, "<span class='cultitalic'>The magic in [src] is too weak, [p_they()] will be ready to use again in [getETA()].</span>")
+		to_chat(user, "<span class='cultitalic'>The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>")
 
 /obj/structure/destructible/cult/examine_status(mob/user)
 	if(iscultist(user) || isobserver(user))
@@ -50,13 +50,6 @@
 		animate(src, color = previouscolor, time = 8)
 		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
 
-/obj/structure/destructible/cult/proc/getETA()
-	var/time = (cooldowntime - world.time)/600
-	var/eta = "[round(time, 1)] minutes"
-	if(time <= 1)
-		time = (cooldowntime - world.time)*0.1
-		eta = "[round(time, 1)] seconds"
-	return eta
 
 /obj/structure/destructible/cult/talisman
 	name = "altar"
@@ -72,7 +65,7 @@
 		to_chat(user, "<span class='cultitalic'>You need to anchor [src] to the floor with a tome first.</span>")
 		return
 	if(cooldowntime > world.time)
-		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [getETA()].</span>")
+		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>")
 		return
 	var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water")
 	var/pickedtype
@@ -105,7 +98,7 @@
 		to_chat(user, "<span class='cultitalic'>You need to anchor [src] to the floor with a tome first.</span>")
 		return
 	if(cooldowntime > world.time)
-		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [getETA()].</span>")
+		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>")
 		return
 	var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Nar-Sien Hardsuit")
 	var/pickedtype
@@ -212,7 +205,7 @@
 		to_chat(user, "<span class='cultitalic'>You need to anchor [src] to the floor with a tome first.</span>")
 		return
 	if(cooldowntime > world.time)
-		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [getETA()].</span>")
+		to_chat(user, "<span class='cultitalic'>The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>")
 		return
 	var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Walker Set")
 	var/list/pickedtype = list()

code/game/gamemodes/factions.dm

@@ -1 +0,0 @@
-//Todo

code/game/gamemodes/game_mode.dm

@@ -121,7 +121,7 @@
 	var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
 	var/list/datum/game_mode/usable_modes = list()
 	for(var/datum/game_mode/G in runnable_modes)
-		if(G.reroll_friendly && living_crew >= G.required_players)
+		if(G.reroll_friendly && living_crew.len >= G.required_players)
 			usable_modes += G
 		else
 			qdel(G)
@@ -160,7 +160,7 @@
 	if(config.protect_assistant_from_antagonist)
 		replacementmode.restricted_jobs += "Assistant"
 
-	message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit <A HREF='?_src_=holder;toggle_midround_antag=\ref[usr]'>stop the creation of antags</A> or <A HREF='?_src_=holder;end_round=\ref[usr]'>end the round now</A>.")
+	message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit <A HREF='?_src_=holder;[HrefToken()];toggle_midround_antag=\ref[usr]'>stop the creation of antags</A> or <A HREF='?_src_=holder;[HrefToken()];end_round=\ref[usr]'>end the round now</A>.")
 
 	. = 1
 	sleep(rand(600,1800))

code/game/gamemodes/gang/gang_datum.dm

@@ -331,16 +331,3 @@
 		adjust_influence(bawss, amount/bosses.len)
 		announce_to_mind(bawss, "<span class='notice'>[name] Gang: [amount/bosses.len] influence given from internal automatic restructuring.</span>")
 
-//Multiverse
-
-/datum/gang/multiverse
-	dom_attempts = 0
-	fighting_style = "multiverse"
-	is_deconvertible = FALSE
-
-/datum/gang/multiverse/New(loc, multiverse_override)
-	name = multiverse_override
-	ganghud = new()
-
-/datum/gang/multiverse/income()
-	return

code/game/gamemodes/malfunction/Malf_Modules.dm.rej

@@ -1,11 +0,0 @@
-diff a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm	(rejected hunks)
-@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
- 	owner_AI.nuking = TRUE
- 	owner_AI.doomsday_device = DOOM
- 	owner_AI.doomsday_device.start()
--	for(var/pinpointer in GLOB.pinpointer_list)
--		var/obj/item/weapon/pinpointer/P = pinpointer
-+	for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
- 		P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes
- 	qdel(src)
- 

code/game/gamemodes/meteor/meteors.dm

@@ -119,6 +119,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 
 /obj/effect/meteor/Destroy()
 	GLOB.meteor_list -= src
+	SSaugury.unregister_doom(src)
 	walk(src,0) //this cancels the walk_towards() proc
 	. = ..()
 
@@ -309,6 +310,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 
 /obj/effect/meteor/meaty/xeno/New()
 	meteordrop += subtypesof(/obj/item/organ/alien)
+	meteordrop -= /obj/item/organ/alien/eggsac
 	..()
 
 /obj/effect/meteor/meaty/xeno/ram_turf(turf/T)

code/game/gamemodes/miniantags/abduction/abduction.dm

@@ -1,5 +1,17 @@
+/datum/objective_team/abductor_team
+	member_name = "abductor" 
+	var/list/objectives = list()
+	var/team_number
+
+/datum/objective_team/abductor_team/is_solo()
+	return FALSE
+
+/datum/objective_team/abductor_team/proc/add_objective(datum/objective/O)
+	O.team = src
+	O.update_explanation_text()
+	objectives += O
+
 /datum/game_mode
-	var/abductor_teams = 0
 	var/list/datum/mind/abductors = list()
 	var/list/datum/mind/abductees = list()
 
@@ -12,12 +24,8 @@
 	required_players = 15
 	maximum_players = 50
 	var/max_teams = 4
-	abductor_teams = 1
-	var/list/datum/mind/scientists = list()
-	var/list/datum/mind/agents = list()
-	var/list/datum/objective/team_objectives = list()
-	var/list/team_names = list()
-	var/finished = 0
+	var/list/datum/objective_team/abductor_team/abductor_teams = list()
+	var/finished = FALSE
 
 /datum/game_mode/abduction/announce()
 	to_chat(world, "<B>The current game mode is - Abduction!</B>")
@@ -26,163 +34,78 @@
 	to_chat(world, "<b>Crew</b> - don't get abducted and stop the abductors.")
 
 /datum/game_mode/abduction/pre_setup()
-	abductor_teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff)))
-	var/possible_teams = max(1,round(antag_candidates.len / 2))
-	abductor_teams = min(abductor_teams,possible_teams)
+	var/num_teams = max(1, min(max_teams, round(num_players() / config.abductor_scaling_coeff)))
+	var/possible_teams = max(1, round(antag_candidates.len / 2))
+	num_teams = min(num_teams, possible_teams)
 
-	abductors.len = 2*abductor_teams
-	scientists.len = abductor_teams
-	agents.len = abductor_teams
-	team_objectives.len = abductor_teams
-	team_names.len = abductor_teams
+	for(var/i = 1 to num_teams)
+		if(!make_abductor_team())
+			return FALSE
+	return TRUE
 
-	for(var/i=1,i<=abductor_teams,i++)
-		if(!make_abductor_team(i))
-			return 0
+/datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist)
+	var/team_number = abductor_teams.len+1
 
-	return 1
+	var/datum/objective_team/abductor_team/team = new
+	team.team_number = team_number
+	team.name = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
+	team.add_objective(new/datum/objective/experiment)
 
-/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null)
-	//Team Name
-	team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
-	//Team Objective
-	var/datum/objective/experiment/team_objective = new
-	team_objective.team = team_number
-	team_objectives[team_number] = team_objective
-	//Team Members
+	if(antag_candidates.len < (!agent + !scientist))
+		return
 
-	if(!preset_agent || !preset_scientist)
-		if(antag_candidates.len <=2)
-			return 0
-
-	var/datum/mind/scientist
-	var/datum/mind/agent
-
-	if(!preset_scientist)
+	if(!scientist)
 		scientist = pick(antag_candidates)
-		antag_candidates -= scientist
-	else
-		scientist = preset_scientist
+	antag_candidates -= scientist
+	team.members |= scientist
+	scientist.assigned_role = "Abductor Scientist"
+	log_game("[scientist.key] (ckey) has been selected as [team.name] abductor scientist.")
 
-	if(!preset_agent)
+	if(!agent)
 		agent = pick(antag_candidates)
-		antag_candidates -= agent
-	else
-		agent = preset_agent
+	antag_candidates -= agent
+	team.members |= agent
+	agent.assigned_role = "Abductor Agent"
+	log_game("[agent.key] (ckey) has been selected as [team.name] abductor agent.")
 
-
-	scientist.assigned_role = "abductor scientist"
-	scientist.special_role = "abductor scientist"
-	log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.")
-
-	agent.assigned_role = "abductor agent"
-	agent.special_role = "abductor agent"
-	log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.")
-
-	abductors |= agent
-	abductors |= scientist
-	scientists[team_number] = scientist
-	agents[team_number] = agent
-	return 1
+	abductor_teams += team
+	return team
 
 /datum/game_mode/abduction/post_setup()
-	for(var/team_number=1,team_number<=abductor_teams,team_number++)
-		post_setup_team(team_number)
+	for(var/datum/objective_team/abductor_team/team in abductor_teams)
+		post_setup_team(team)
 	return ..()
 
 //Used for create antag buttons
-/datum/game_mode/abduction/proc/post_setup_team(team_number)
-	var/list/obj/effect/landmark/abductor/agent_landmarks = list()
-	var/list/obj/effect/landmark/abductor/scientist_landmarks = list()
-	agent_landmarks.len = max_teams
-	scientist_landmarks.len = max_teams
-	for(var/obj/effect/landmark/abductor/A in GLOB.landmarks_list)
-		if(istype(A, /obj/effect/landmark/abductor/agent))
-			agent_landmarks[text2num(A.team)] = A
-		else if(istype(A, /obj/effect/landmark/abductor/scientist))
-			scientist_landmarks[text2num(A.team)] = A
-
-	var/team_name = team_names[team_number]
-
-	var/datum/mind/agent
-	var/obj/effect/landmark/L
-	var/datum/mind/scientist
-	var/mob/living/carbon/human/H
-	var/datum/species/abductor/S
-
-	agent = agents[team_number]
-	H = agent.current
-	L = agent_landmarks[team_number]
-	H.forceMove(L.loc)
-	H.set_species(/datum/species/abductor)
-	S = H.dna.species
-	S.team = team_number
-	H.real_name = team_name + " Agent"
-	H.equipOutfit(/datum/outfit/abductor/agent)
-	greet_agent(agent,team_number)
-
-
-	scientist = scientists[team_number]
-	H = scientist.current
-	L = scientist_landmarks[team_number]
-	H.forceMove(L.loc)
-	H.set_species(/datum/species/abductor)
-	S = H.dna.species
-	S.scientist = TRUE
-	S.team = team_number
-	H.real_name = team_name + " Scientist"
-	H.equipOutfit(/datum/outfit/abductor/scientist)
-	greet_scientist(scientist,team_number)
-
-
-
-/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number)
-	abductor.objectives += team_objectives[team_number]
-	var/team_name = team_names[team_number]
-
-	to_chat(abductor.current, "<span class='notice'>You are an agent of [team_name]!</span>")
-	to_chat(abductor.current, "<span class='notice'>With the help of your teammate, kidnap and experiment on station crew members!</span>")
-	to_chat(abductor.current, "<span class='notice'>Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.</span>")
-
-	abductor.announce_objectives()
-
-/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number)
-	abductor.objectives += team_objectives[team_number]
-	var/team_name = team_names[team_number]
-
-	to_chat(abductor.current, "<span class='notice'>You are a scientist of [team_name]!</span>")
-	to_chat(abductor.current, "<span class='notice'>With the help of your teammate, kidnap and experiment on station crew members!</span>")
-	to_chat(abductor.current, "<span class='notice'>Use your tool and ship consoles to support the agent and retrieve human specimens.</span>")
-
-	abductor.announce_objectives()
-
-/datum/game_mode/abduction/proc/get_team_console(team_number)
-	for(var/obj/machinery/abductor/console/C in GLOB.machines)
-		if(C.team == team_number)
-			return C
+/datum/game_mode/abduction/proc/post_setup_team(datum/objective_team/abductor_team/team)
+	for(var/datum/mind/M in team.members)
+		if(M.assigned_role == "Abductor Scientist")
+			M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_SCIENTIST, team)
+		else
+			M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_AGENT, team)
 
 /datum/game_mode/abduction/check_finished()
 	if(!finished)
-		for(var/team_number=1,team_number<=abductor_teams,team_number++)
-			var/obj/machinery/abductor/console/con = get_team_console(team_number)
-			var/datum/objective/objective = team_objectives[team_number]
-			if (con.experiment.points >= objective.target_amount)
-				SSshuttle.emergency.request(null, set_coefficient = 0.5)
-				finished = 1
-				return ..()
+		for(var/datum/objective_team/abductor_team/team in abductor_teams)
+			for(var/datum/objective/O in team.objectives)
+				if(O.check_completion())
+					SSshuttle.emergency.request(null, set_coefficient = 0.5)
+					finished = TRUE
+					return ..()
 	return ..()
 
 /datum/game_mode/abduction/declare_completion()
-	for(var/team_number=1,team_number<=abductor_teams,team_number++)
-		var/obj/machinery/abductor/console/console = get_team_console(team_number)
-		var/datum/objective/objective = team_objectives[team_number]
-		var/team_name = team_names[team_number]
-		if(console.experiment.points >= objective.target_amount)
-			to_chat(world, "<span class='greenannounce'>[team_name] team fulfilled its mission!</span>")
+	for(var/datum/objective_team/abductor_team/team in abductor_teams)
+		var/won = TRUE
+		for(var/datum/objective/O in team.objectives)
+			if(!O.check_completion())
+				won = FALSE
+		if(won)
+			to_chat(world, "<span class='greenannounce'>[team.name] team fulfilled its mission!</span>")
 		else
-			to_chat(world, "<span class='boldannounce'>[team_name] team failed its mission.</span>")
+			to_chat(world, "<span class='boldannounce'>[team.name] team failed its mission.</span>")
 	..()
-	return 1
+	return TRUE
 
 /datum/game_mode/proc/auto_declare_completion_abduction()
 	var/text = ""
@@ -200,40 +123,28 @@
 	text += "<br>"
 	to_chat(world, text)
 
-//Landmarks
-// TODO: Split into separate landmarks for prettier ships
+// LANDMARKS
 /obj/effect/landmark/abductor
-	var/team = 1
+	var/team_number = 1
 
 /obj/effect/landmark/abductor/agent
 /obj/effect/landmark/abductor/scientist
 
-
 // OBJECTIVES
 /datum/objective/experiment
 	target_amount = 6
-	var/team
 
 /datum/objective/experiment/New()
 	explanation_text = "Experiment on [target_amount] humans."
 
 /datum/objective/experiment/check_completion()
-	var/ab_team = team
-	if(owner)
-		if(!owner.current || !ishuman(owner.current))
-			return 0
-		var/mob/living/carbon/human/H = owner.current
-		if(H.dna.species.id != "abductor")
-			return 0
-		var/datum/species/abductor/S = H.dna.species
-		ab_team = S.team
 	for(var/obj/machinery/abductor/experiment/E in GLOB.machines)
-		if(E.team == ab_team)
-			if(E.points >= target_amount)
-				return 1
-			else
-				return 0
-	return 0
+		if(!istype(team, /datum/objective_team/abductor_team))
+			return FALSE
+		var/datum/objective_team/abductor_team/T = team
+		if(E.team_number == T.team_number)
+			return E.points >= target_amount
+	return FALSE
 
 /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind)
 	var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR]

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -532,7 +532,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	flags_2 = BANG_PROTECT_2
 
 /obj/item/device/radio/headset/abductor/Initialize(mapload)
-	..()
+	. = ..()
 	make_syndie()
 
 /obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params)

code/game/gamemodes/miniantags/abduction/abduction_outfits.dm

@@ -5,20 +5,14 @@
 	back = /obj/item/storage/backpack
 	ears = /obj/item/device/radio/headset/abductor
 
-/datum/outfit/abductor/proc/get_team_console(team_number)
-	for(var/obj/machinery/abductor/console/C in GLOB.machines)
-		if(C.team == team_number)
-			return C
-
 /datum/outfit/abductor/proc/link_to_console(mob/living/carbon/human/H, team_number)
-	if(!team_number && isabductor(H))
-		var/datum/species/abductor/S = H.dna.species
-		team_number = S.team
-
+	var/datum/antagonist/abductor/A = H.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR)
+	if(!team_number && A)
+		team_number = A.team.team_number
 	if(!team_number)
 		team_number = 1
 
-	var/obj/machinery/abductor/console/console = get_team_console(team_number)
+	var/obj/machinery/abductor/console/console = get_abductor_console(team_number)
 	if(console)
 		var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H
 		if(V)

code/game/gamemodes/miniantags/abduction/machinery/camera.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/camera_advanced/abductor
 	name = "Human Observation Console"
-	var/team = 0
+	var/team_number = 0
 	networks = list("SS13","Abductor")
 	var/datum/action/innate/teleport_in/tele_in_action = new
 	var/datum/action/innate/teleport_out/tele_out_action = new

code/game/gamemodes/miniantags/abduction/machinery/console.dm

@@ -1,8 +1,13 @@
+/proc/get_abductor_console(team_number)
+	for(var/obj/machinery/abductor/console/C in GLOB.machines)
+		if(C.team_number == team_number)
+			return C
+
 //Common
 
 /obj/machinery/abductor
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/team = 0
+	var/team_number = 0
 
 //Console
 
@@ -139,21 +144,21 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/abductor/console/LateInitialize()
-	if(!team)
+	if(!team_number)
 		return
 
 	for(var/obj/machinery/abductor/pad/p in GLOB.machines)
-		if(p.team == team)
+		if(p.team_number == team_number)
 			pad = p
 			break
 
 	for(var/obj/machinery/abductor/experiment/e in GLOB.machines)
-		if(e.team == team)
+		if(e.team_number == team_number)
 			experiment = e
 			e.console = src
 
 	for(var/obj/machinery/computer/camera_advanced/abductor/c in GLOB.machines)
-		if(c.team == team)
+		if(c.team_number == team_number)
 			camera = c
 			c.console = src
 

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -13,7 +13,7 @@
 	var/flash = " - || - "
 	var/obj/machinery/abductor/console/console
 	var/message_cooldown = 0
-	var/breakout_time = 0.75
+	var/breakout_time = 450
 
 /obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user)
 	if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target))
@@ -50,9 +50,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
-		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a metallic creaking from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
 			return
 		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \

code/game/gamemodes/miniantags/slaughter/slaughterevent.dm

@@ -33,7 +33,7 @@
 		message_admins("No valid spawn locations found, aborting...")
 		return MAP_ERROR
 
-	var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs)))
+	var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs)))
 	var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
 	S.holder = holder
 	player_mind.transfer_to(S)

code/game/gamemodes/nuclear/nuclear.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm	(rejected hunks)
-@@ -325,7 +325,7 @@
- 	gloves = /obj/item/clothing/gloves/combat
- 	back = /obj/item/weapon/storage/backpack
- 	ears = /obj/item/device/radio/headset/syndicate/alt
--	l_pocket = /obj/item/weapon/pinpointer/syndicate
-+	l_pocket = /obj/item/weapon/pinpointer/nuke/syndicate
- 	id = /obj/item/weapon/card/id/syndicate
- 	belt = /obj/item/weapon/gun/ballistic/automatic/pistol
- 	backpack_contents = list(/obj/item/weapon/storage/box/syndie=1)

code/game/gamemodes/nuclear/nuclear_challenge.dm

@@ -19,7 +19,7 @@
 		return
 
 	declaring_war = TRUE
-	var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You have [-round((world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide", "Declare war?", "Yes", "No")
+	var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You have [DisplayTimeText(world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)] to decide", "Declare war?", "Yes", "No")
 	declaring_war = FALSE
 
 	if(!check_allowed(user))

code/game/gamemodes/nuclear/nuclearbomb.dm.rej

@@ -1,33 +0,0 @@
-diff a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm	(rejected hunks)
-@@ -362,9 +362,9 @@
- 	if(safety)
- 		if(timing)
- 			set_security_level(previous_level)
--			for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+			for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 				S.switch_mode_to(initial(S.mode))
--				S.nuke_warning = FALSE
-+				S.alert = FALSE
- 		timing = FALSE
- 		bomb_set = TRUE
- 		detonation_timer = null
-@@ -381,16 +381,16 @@
- 		bomb_set = TRUE
- 		set_security_level("delta")
- 		detonation_timer = world.time + (timer_set * 10)
--		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 			S.switch_mode_to(TRACK_INFILTRATOR)
- 		countdown.start()
- 	else
- 		bomb_set = FALSE
- 		detonation_timer = null
- 		set_security_level(previous_level)
--		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 			S.switch_mode_to(initial(S.mode))
--			S.nuke_warning = FALSE
-+			S.alert = FALSE
- 		countdown.stop()
- 	update_icon()
- 

code/game/gamemodes/nuclear/pinpointer.dm.rej

@@ -1,21 +0,0 @@
-diff a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm	(rejected hunks)
-@@ -30,7 +30,6 @@
- 						var/mob/living/L = loc
- 						to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")
- 
--
- /obj/item/pinpointer/nuke/scan_for_target()
- 	target = null
- 	switch(mode)
-@@ -58,10 +57,10 @@
- 	mode = new_mode
- 	scan_for_target()
- 
--
- /obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
- 	name = "syndicate pinpointer"
- 	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
-+	icon_state = "pinpointer_syndicate"
- 
- /obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
- 	name = "cyborg syndicate pinpointer"

code/game/gamemodes/objective.dm

@@ -1,6 +1,8 @@
 /datum/objective
-	var/datum/mind/owner = null			//Who owns the objective.
+	var/datum/mind/owner				//The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code.
+	var/datum/objective_team/team       //An alternative to 'owner': a team. Use this when writing new code.
 	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.
 	var/target_amount = 0				//If they are focused on a particular number. Steal objectives have their own counter.
 	var/completed = 0					//currently only used for custom objectives.
@@ -10,19 +12,48 @@
 	if(text)
 		explanation_text = text
 
+/datum/objective/proc/get_owners() // Combine owner and team into a single list.
+	. = (team && team.members) ? team.members.Copy() : list()
+	if(owner)
+		. += owner
+
+/datum/objective/proc/considered_alive(var/datum/mind/M)
+	if(M && M.current)
+		var/mob/living/carbon/human/H
+		if(ishuman(M.current))
+			H = M.current
+		return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != "memezombies")
+	return FALSE
+
+/datum/objective/proc/considered_escaped(datum/mind/M)
+	if(!considered_alive(M))
+		return FALSE
+	if(SSticker.force_ending || SSticker.mode.station_was_nuked) // Just let them win.
+		return TRUE
+	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
+		return FALSE
+	var/turf/location = get_turf(M.current)
+	if(!location || istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails if they are in the shuttle brig
+		return FALSE
+	return location.onCentCom() || location.onSyndieBase()
+
+/datum/objective/proc/considered_afk(datum/mind/M)
+	return !M || !M.current || !M.current.client || M.current.client.is_afk()
+
 /datum/objective/proc/check_completion()
 	return completed
 
 /datum/objective/proc/is_unique_objective(possible_target)
-	for(var/datum/objective/O in owner.objectives)
-		if(istype(O, type) && O.get_target() == possible_target)
-			return 0
-	return 1
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		for(var/datum/objective/O in M.objectives)
+			if(istype(O, type) && O.get_target() == possible_target)
+				return FALSE
+	return TRUE
 
 /datum/objective/proc/get_target()
 	return target
 
-
 /datum/objective/proc/get_crewmember_minds()
 	. = list()
 	for(var/V in GLOB.data_core.locked)
@@ -32,9 +63,10 @@
 			. += M.mind
 
 /datum/objective/proc/find_target()
+	var/list/datum/mind/owners = get_owners()
 	var/list/possible_targets = list()
 	for(var/datum/mind/possible_target in get_crewmember_minds())
-		if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target))
+		if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target))
 			possible_targets += possible_target
 	if(possible_targets.len > 0)
 		target = pick(possible_targets)
@@ -42,8 +74,9 @@
 	return target
 
 /datum/objective/proc/find_target_by_role(role, role_type=0, invert=0)//Option sets either to check assigned role or special role. Default to assigned., invert inverts the check, eg: "Don't choose a Ling"
+	var/list/datum/mind/owners = get_owners()
 	for(var/datum/mind/possible_target in get_crewmember_minds())
-		if((possible_target != owner) && ishuman(possible_target.current))
+		if(!(possible_target in owners) && ishuman(possible_target.current))
 			var/is_role = 0
 			if(role_type)
 				if(possible_target.special_role == role)
@@ -64,13 +97,15 @@
 	update_explanation_text()
 
 /datum/objective/proc/update_explanation_text()
-	//Default does nothing, override where needed
+	if(team_explanation_text && LAZYLEN(get_owners()) > 1)
+		explanation_text = team_explanation_text
 
 /datum/objective/proc/give_special_equipment(special_equipment)
-	if(owner && owner.current)
-		if(ishuman(owner.current))
-			var/mob/living/carbon/human/H = owner.current
-			var/list/slots = list ("backpack" = slot_in_backpack)
+	var/datum/mind/receiver = pick(get_owners())
+	if(receiver && receiver.current)
+		if(ishuman(receiver.current))
+			var/mob/living/carbon/human/H = receiver.current
+			var/list/slots = list("backpack" = slot_in_backpack)
 			for(var/eq_path in special_equipment)
 				var/obj/O = new eq_path
 				H.equip_in_one_of_slots(O, slots)
@@ -86,14 +121,7 @@
 	return target
 
 /datum/objective/assassinate/check_completion()
-	if(target && target.current)
-		var/mob/living/carbon/human/H
-		if(ishuman(target.current))
-			H = target.current
-		if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
-			return 1
-		return 0
-	return 1
+	return !target || !considered_alive(target)
 
 /datum/objective/assassinate/update_explanation_text()
 	..()
@@ -110,7 +138,6 @@
 	if(target && !target.current)
 		explanation_text = "Assassinate [target.name], who was obliterated"
 
-
 /datum/objective/mutiny
 	var/target_role_type=0
 	martyr_compatible = 1
@@ -122,14 +149,10 @@
 	return target
 
 /datum/objective/mutiny/check_completion()
-	if(target && target.current)
-		if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey)
-			return 1
-		var/turf/T = get_turf(target.current)
-		if(T && (!(T.z in GLOB.station_z_levels)) || (target.current.client && target.current.client.is_afk()))			//If they leave the station or go afk they count as dead for this
-			return 2
-		return 0
-	return 1
+	if(!target || !considered_alive(target) || considered_afk(target))
+		return TRUE
+	var/turf/T = get_turf(target.current)
+	return T && !(T.z in GLOB.station_z_levels)
 
 /datum/objective/mutiny/update_explanation_text()
 	..()
@@ -138,8 +161,6 @@
 	else
 		explanation_text = "Free Objective"
 
-
-
 /datum/objective/maroon
 	var/target_role_type=0
 	martyr_compatible = 1
@@ -151,15 +172,7 @@
 	return target
 
 /datum/objective/maroon/check_completion()
-	if(target && target.current)
-		var/mob/living/carbon/human/H
-		if(ishuman(target.current))
-			H = target.current
-		if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
-			return 1
-		if(target.current.onCentCom() || target.current.onSyndieBase())
-			return 0
-	return 1
+	return !target || !considered_alive(target) || (!target.current.onCentCom() && !target.current.onSyndieBase())
 
 /datum/objective/maroon/update_explanation_text()
 	if(target && target.current)
@@ -167,9 +180,7 @@
 	else
 		explanation_text = "Free Objective"
 
-
-
-/datum/objective/debrain//I want braaaainssss
+/datum/objective/debrain
 	var/target_role_type=0
 
 /datum/objective/debrain/find_target_by_role(role, role_type=0, invert=0)
@@ -180,17 +191,20 @@
 
 /datum/objective/debrain/check_completion()
 	if(!target)//If it's a free objective.
-		return 1
-	if( !owner.current || owner.current.stat==DEAD )//If you're otherwise dead.
-		return 0
-	if( !target.current || !isbrain(target.current) )
-		return 0
+		return TRUE
+
+	if(!target.current || !isbrain(target.current))
+		return FALSE
+
 	var/atom/A = target.current
-	while(A.loc)			//check to see if the brainmob is on our person
+	var/list/datum/mind/owners = get_owners()
+
+	while(A.loc) // Check to see if the brainmob is on our person
 		A = A.loc
-		if(A == owner.current)
-			return 1
-	return 0
+		for(var/datum/mind/M in owners)
+			if(M.current && M.current.stat != DEAD && A == M.current)
+				return TRUE
+	return FALSE
 
 /datum/objective/debrain/update_explanation_text()
 	..()
@@ -199,8 +213,6 @@
 	else
 		explanation_text = "Free Objective"
 
-
-
 /datum/objective/protect//The opposite of killing a dude.
 	var/target_role_type=0
 	martyr_compatible = 1
@@ -212,13 +224,7 @@
 	return target
 
 /datum/objective/protect/check_completion()
-	if(!target)			//If it's a free objective.
-		return 1
-	if(target.current)
-		if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current))
-			return 0
-		return 1
-	return 0
+	return !target || considered_alive(target)
 
 /datum/objective/protect/update_explanation_text()
 	..()
@@ -227,76 +233,32 @@
 	else
 		explanation_text = "Free Objective"
 
-
-
 /datum/objective/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.
 
-/datum/objective/hijack/check_completion()
-	if(!owner.current || owner.current.stat)
-		return 0
+/datum/objective/hijack/check_completion() // Requires all owners to escape.
 	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return 0
-	if(issilicon(owner.current))
-		return 0
-	if(!SSshuttle.emergency.shuttle_areas[get_area(owner.current)])
-		return 0
+		return FALSE
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!considered_alive(M) || !SSshuttle.emergency.shuttle_areas[get_area(M.current)])
+			return FALSE
 	return SSshuttle.emergency.is_hijacked()
 
-
-/datum/objective/hijackclone
-	explanation_text = "Hijack the emergency shuttle by ensuring only you (or your copies) escape."
-	martyr_compatible = 0
-
-/datum/objective/hijackclone/check_completion()
-	if(!owner.current)
-		return FALSE
-	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return FALSE
-
-	var/in_shuttle = FALSE
-	for(var/mob/living/player in GLOB.player_list) //Make sure nobody else is onboard
-		if(SSshuttle.emergency.shuttle_areas[get_area(player)])
-			if(player.mind && player.mind != owner)
-				if(player.stat != DEAD)
-					if(issilicon(player)) //Borgs are technically dead anyways
-						continue
-					if(isanimal(player)) //animals don't count
-						continue
-					if(isbrain(player)) //also technically dead
-						continue
-					var/location = get_turf(player.mind.current)
-					if(istype(location, /turf/open/floor/plasteel/shuttle/red))
-						continue
-					if(istype(location, /turf/open/floor/mineral/plastitanium/brig))
-						continue
-					if(player.real_name != owner.current.real_name)
-						return FALSE
-					else
-						in_shuttle = TRUE
-	return in_shuttle
-
 /datum/objective/block
 	explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
 	martyr_compatible = 1
 
 /datum/objective/block/check_completion()
-	if(!issilicon(owner.current))
-		return 0
 	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return 1
-
+		return TRUE
 	for(var/mob/living/player in GLOB.player_list)
-		if(issilicon(player))
-			continue
-		if(player.mind)
-			if(player.stat != DEAD)
-				if(get_area(player) in SSshuttle.emergency.shuttle_areas)
-					return 0
-
-	return 1
-
+		if(player.mind && player.stat != DEAD && !issilicon(player))
+			if(get_area(player) in SSshuttle.emergency.shuttle_areas)
+				return FALSE
+	return TRUE
 
 /datum/objective/purge
 	explanation_text = "Ensure no mutant humanoid species are present aboard the escape shuttle."
@@ -304,63 +266,41 @@
 
 /datum/objective/purge/check_completion()
 	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return 1
-
+		return TRUE
 	for(var/mob/living/player in GLOB.player_list)
 		if(get_area(player) in SSshuttle.emergency.shuttle_areas && player.mind && player.stat != DEAD && ishuman(player))
 			var/mob/living/carbon/human/H = player
 			if(H.dna.species.id != "human")
-				return 0
-
-	return 1
-
+				return FALSE
+	return TRUE
 
 /datum/objective/robot_army
 	explanation_text = "Have at least eight active cyborgs synced to you."
 	martyr_compatible = 0
 
 /datum/objective/robot_army/check_completion()
-	if(!isAI(owner.current))
-		return 0
-	var/mob/living/silicon/ai/A = owner.current
-
 	var/counter = 0
-
-	for(var/mob/living/silicon/robot/R in A.connected_robots)
-		if(R.stat != DEAD)
-			counter++
-
-	if(counter < 8)
-		return 0
-	return 1
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!M.current || !isAI(M.current))
+			continue
+		var/mob/living/silicon/ai/A = M.current
+		for(var/mob/living/silicon/robot/R in A.connected_robots)
+			if(R.stat != DEAD)
+				counter++
+	return counter >= 8
 
 /datum/objective/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."
 
 /datum/objective/escape/check_completion()
-	if(issilicon(owner.current))
-		return 0
-	if(isbrain(owner.current))
-		return 0
-	if(!owner.current || owner.current.stat == DEAD)
-		return 0
-	if(SSticker.force_ending) //This one isn't their fault, so lets just assume good faith
-		return 1
-	if(SSticker.mode.station_was_nuked) //If they escaped the blast somehow, let them win
-		return 1
-	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return 0
-	var/turf/location = get_turf(owner.current)
-	if(!location)
-		return 0
-
-	if(istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
-		return 0
-
-	if(location.onCentCom() || location.onSyndieBase())
-		return 1
-
-	return 0
+	// Require all owners escape safely.
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!considered_escaped(M))
+			return FALSE
+	return TRUE
 
 /datum/objective/escape/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
@@ -387,39 +327,44 @@
 		explanation_text = "Free Objective."
 
 /datum/objective/escape/escape_with_identity/check_completion()
-	if(!target_real_name)
-		return 1
-	if(!ishuman(owner.current))
-		return 0
-	var/mob/living/carbon/human/H = owner.current
-	if(..())
-		if(H.dna.real_name == target_real_name)
-			if(H.get_id_name()== target_real_name || target_missing_id)
-				return 1
-	return 0
-
+	if(!target || !target_real_name)
+		return TRUE
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!ishuman(M.current) || !considered_escaped(M))
+			continue
+		var/mob/living/carbon/human/H = M.current
+		if(H.dna.real_name == target_real_name && (H.get_id_name() == target_real_name || target_missing_id))
+			return TRUE
+	return FALSE
 
 /datum/objective/survive
 	explanation_text = "Stay alive until the end."
 
 /datum/objective/survive/check_completion()
-	if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current))
-		return 0		//Brains no longer win survive objectives. --NEO
-	if(!is_special_character(owner.current)) //This fails borg'd traitors
-		return 0
-	return 1
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!considered_alive(M))
+			return FALSE
+	return TRUE
 
+//Like survive, but works for silicons and zombies and such.
+/datum/objective/survive/exist/considered_alive(var/datum/mind/M)
+	if(M && M.current)
+		if(isliving(M.current))
+			var/mob/living/L = M.current
+			return L.stat != DEAD
+	return FALSE
 
 /datum/objective/martyr
 	explanation_text = "Die a glorious death."
 
 /datum/objective/martyr/check_completion()
-	if(!owner.current) //Gibbed, etc.
-		return 1
-	if(owner.current && owner.current.stat == DEAD) //You're dead! Yay!
-		return 1
-	return 0
-
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(considered_alive(M))
+			return FALSE
+	return TRUE
 
 /datum/objective/nuclear
 	explanation_text = "Destroy the station with a nuclear device."
@@ -427,8 +372,8 @@
 
 /datum/objective/nuclear/check_completion()
 	if(SSticker && SSticker.mode && SSticker.mode.station_was_nuked)
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 GLOBAL_LIST_EMPTY(possible_items)
 /datum/objective/steal
@@ -446,16 +391,21 @@ GLOBAL_LIST_EMPTY(possible_items)
 			new I
 
 /datum/objective/steal/find_target()
+	var/list/datum/mind/owners = get_owners()
 	var/approved_targets = list()
-	for(var/datum/objective_item/possible_item in GLOB.possible_items)
-		if(is_unique_objective(possible_item.targetitem) && !(owner.current.mind.assigned_role in possible_item.excludefromjob))
+	check_items:
+		for(var/datum/objective_item/possible_item in GLOB.possible_items)
+			if(!is_unique_objective(possible_item.targetitem))
+				continue
+			for(var/datum/mind/M in owners)
+				if(M.current.mind.assigned_role in possible_item.excludefromjob)
+					continue check_items
 			approved_targets += possible_item
 	return set_target(safepick(approved_targets))
 
 /datum/objective/steal/proc/set_target(datum/objective_item/item)
 	if(item)
 		targetinfo = item
-
 		steal_target = targetinfo.targetitem
 		explanation_text = "Steal [targetinfo.name]"
 		give_special_equipment(targetinfo.special_equipment)
@@ -483,23 +433,26 @@ GLOBAL_LIST_EMPTY(possible_items)
 	return steal_target
 
 /datum/objective/steal/check_completion()
+	var/list/datum/mind/owners = get_owners()
 	if(!steal_target)
-		return 1
-	if(!isliving(owner.current))
-		return 0
-	var/list/all_items = owner.current.GetAllContents()	//this should get things in cheesewheels, books, etc.
+		return TRUE
+	for(var/datum/mind/M in owners)
+		if(!isliving(M.current))
+			continue
 
-	for(var/obj/I in all_items) //Check for items
-		if(istype(I, steal_target))
-			if(!targetinfo) //If there's no targetinfo, then that means it was a custom objective. At this point, we know you have the item, so return 1.
-				return 1
-			else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled.
-				return 1
+		var/list/all_items = M.current.GetAllContents()	//this should get things in cheesewheels, books, etc.
 
-		if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least?
-			if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first!
-				return 1
-	return 0
+		for(var/obj/I in all_items) //Check for items
+			if(istype(I, steal_target))
+				if(!targetinfo) //If there's no targetinfo, then that means it was a custom objective. At this point, we know you have the item, so return 1.
+					return TRUE
+				else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled.
+					return TRUE
+
+			if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least?
+				if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first!
+					return TRUE
+	return FALSE
 
 
 GLOBAL_LIST_EMPTY(possible_items_special)
@@ -553,31 +506,22 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	explanation_text = "Download [target_amount] research level\s."
 	return target_amount
 
-/datum/objective/download/check_completion()//NINJACODE
-	if(!ishuman(owner.current))
-		return 0
-
-	var/mob/living/carbon/human/H = owner.current
-	if(!H || H.stat == DEAD)
-		return 0
-
-	if(!istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
-		return 0
-
-	var/obj/item/clothing/suit/space/space_ninja/SN = H.wear_suit
-	if(!SN.s_initialized)
-		return 0
-
-	var/current_amount
-	if(!SN.stored_research.len)
-		return 0
-	else
+/datum/objective/download/check_completion()//NINJACODE.
+	var/current_amount = 0
+	var/list/datum/mind/owners = get_owners()
+	for(var/datum/mind/M in owners)
+		if(!ishuman(owner.current))
+			continue
+		var/mob/living/carbon/human/H = owner.current
+		if(!H || H.stat == DEAD || !istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
+			continue
+		var/obj/item/clothing/suit/space/space_ninja/SN = H.wear_suit
+		if(!SN.s_initialized)
+			continue
 		for(var/datum/tech/current_data in SN.stored_research)
 			if(current_data.level)
 				current_amount += (current_data.level-1)
-	if(current_amount<target_amount)
-		return 0
-	return 1
+	return current_amount >= target_amount
 
 
 
@@ -614,10 +558,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 			captured_amount+=1
 			continue
 		captured_amount+=2
-	if(captured_amount<target_amount)
-		return 0
-	return 1
-
+	return captured_amount >= target_amount
 
 
 /datum/objective/absorb
@@ -625,13 +566,14 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
 	target_amount = rand (lowbound,highbound)
 	var/n_p = 1 //autowin
+	var/list/datum/mind/owners = get_owners()
 	if (SSticker.current_state == GAME_STATE_SETTING_UP)
 		for(var/mob/dead/new_player/P in GLOB.player_list)
-			if(P.client && P.ready == PLAYER_READY_TO_PLAY && P.mind!=owner)
+			if(P.client && P.ready == PLAYER_READY_TO_PLAY && !(P.mind in owners))
 				n_p ++
 	else if (SSticker.IsRoundInProgress())
 		for(var/mob/living/carbon/human/P in GLOB.player_list)
-			if(P.client && !(P.mind in SSticker.mode.changelings) && P.mind!=owner)
+			if(P.client && !(P.mind in SSticker.mode.changelings) && !(P.mind in owners))
 				n_p ++
 	target_amount = min(target_amount, n_p)
 
@@ -639,10 +581,13 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	return target_amount
 
 /datum/objective/absorb/check_completion()
-	if(owner && owner.changeling && owner.changeling.stored_profiles && (owner.changeling.absorbedcount >= target_amount))
-		return 1
-	else
-		return 0
+	var/list/datum/mind/owners = get_owners()
+	var/absorbedcount = 0
+	for(var/datum/mind/M in owners)
+		if(!owner || !owner.changeling || !owner.changeling.stored_profiles)
+			continue
+		absorbedcount += M.changeling.absorbedcount 
+	return absorbedcount >= target_amount
 
 
 
@@ -658,10 +603,8 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 
 /datum/objective/destroy/check_completion()
 	if(target && target.current)
-		if(target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
-			return 1
-		return 0
-	return 1
+		return target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey //Borgs/brains/AIs count as dead for traitor objectives.
+	return TRUE
 
 /datum/objective/destroy/update_explanation_text()
 	..()
@@ -690,18 +633,16 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	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/device/necromantic_stone)
 
 /datum/objective/steal_five_of_type/check_completion()
-	if(!isliving(owner.current))
-		return 0
+	var/list/datum/mind/owners = get_owners()
 	var/stolen_count = 0
-	var/list/all_items = owner.current.GetAllContents()	//this should get things in cheesewheels, books, etc.
-	for(var/obj/I in all_items) //Check for wanted items
-		if(is_type_in_typecache(I, wanted_items))
-			stolen_count++
-	if(stolen_count >= 5)
-		return 1
-	else
-		return 0
-	return 0
+	for(var/datum/mind/M in owners)
+		if(!isliving(M.current))
+			continue
+		var/list/all_items = M.current.GetAllContents()	//this should get things in cheesewheels, books, etc.
+		for(var/obj/I in all_items) //Check for wanted items
+			if(is_type_in_typecache(I, wanted_items))
+				stolen_count++
+	return stolen_count >= 5
 
 
 ////////////////////////////////

code/game/gamemodes/objective_items.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm	(rejected hunks)
-@@ -158,7 +158,7 @@
- 	difficulty = 10
- 
- //Old ninja objectives.
--/datum/objective_item/special/pinpointer
-+/datum/objective_item/special/pinpointer/nuke
- 	name = "the captain's pinpointer."
- 	targetitem = /obj/item/pinpointer
- 	difficulty = 10

code/game/gamemodes/objective_team.dm

@@ -0,0 +1,13 @@
+//A barebones antagonist team.
+/datum/objective_team
+	var/list/datum/mind/members = list()
+	var/name = "team"
+	var/member_name = "member"
+
+/datum/objective_team/New(starting_members)
+	. = ..()
+	if(starting_members)
+		members += starting_members
+
+/datum/objective_team/proc/is_solo()
+	return members.len == 1

code/game/gamemodes/revolution/revolution.dm

@@ -281,7 +281,7 @@
 //////////////////////////////////////////////////////////////////////////////
 //Deals with players being converted from the revolution (Not a rev anymore)//  // Modified to handle borged MMIs.  Accepts another var if the target is being borged at the time  -- Polymorph.
 //////////////////////////////////////////////////////////////////////////////
-/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged)
+/datum/game_mode/proc/remove_revolutionary(datum/mind/rev_mind , beingborged, deconverter)
 	var/remove_head = 0
 	if(beingborged && (rev_mind in head_revolutionaries))
 		head_revolutionaries -= rev_mind
@@ -290,17 +290,16 @@
 	if((rev_mind in revolutionaries) || remove_head)
 		revolutionaries -= rev_mind
 		rev_mind.special_role = null
-		rev_mind.current.log_message("<font color='red'>Has renounced the revolution!</font>", INDIVIDUAL_ATTACK_LOG)
+		log_attack("[rev_mind.current] (Key: [key_name(rev_mind.current)]) has been deconverted from the revolution by [deconverter] (Key: [key_name(deconverter)])!")
 
 		if(beingborged)
-			rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.",\
-				"<span class='danger'><FONT size = 3>The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]</FONT></span>")
+			rev_mind.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", \
+				"<span class='userdanger'><FONT size = 3>The frame's firmware detects and deletes your neural reprogramming! You remember nothing[remove_head ? "." : " but the name of the one who flashed you."]</FONT></span>")
 			message_admins("[ADMIN_LOOKUPFLW(rev_mind.current)] has been borged while being a [remove_head ? "leader" : " member"] of the revolution.")
-
 		else
+			rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!", \
+				"<span class='userdanger'><FONT size = 3>You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...</FONT></span>")
 			rev_mind.current.Unconscious(100)
-			rev_mind.current.visible_message("[rev_mind.current] looks like they just remembered their real allegiance!",\
-				"<span class='danger'><FONT size = 3>You have been brainwashed! You are no longer a revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...</FONT></span>")
 		update_rev_icons_removed(rev_mind)
 
 /////////////////////////////////////

code/game/gamemodes/traitor/traitor.dm

@@ -54,10 +54,7 @@
 		log_game("[traitor.key] (ckey) has been selected as a [traitor_name]")
 		antag_candidates.Remove(traitor)
 
-
-	if(pre_traitors.len < required_enemies)
-		return 0
-	return 1
+	return pre_traitors.len > 0
 
 
 /datum/game_mode/traitor/post_setup()

code/game/gamemodes/wizard/soulstone.dm

@@ -119,7 +119,7 @@
 ////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
 
 
-/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user).
+/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user)
 	switch(choice)
 		if("FORCE")
 			if(!iscarbon(target))		//TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
@@ -237,6 +237,7 @@
 	S.name = "Shade of [T.real_name]"
 	S.real_name = "Shade of [T.real_name]"
 	S.key = T.key
+	S.language_holder = U.language_holder.copy(S)
 	if(U)
 		S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation
 	if(U && iscultist(U))

code/game/machinery/ai_slipper.dm

@@ -43,7 +43,7 @@
 		to_chat(user, "<span class='danger'>[src] is out of foam and cannot be activated.</span>")
 		return
 	if(cooldown_time > world.time)
-		to_chat(user, "<span class='danger'>[src] cannot be activated for another <b>[round((world.time - cooldown_time) * 0.1)]</b> second\s.</span>")
+		to_chat(user, "<span class='danger'>[src] cannot be activated for <b>[DisplayTimeText(world.time - cooldown_time)]</b>.</span>")
 		return
 	new /obj/effect/particle_effect/foam(loc)
 	uses--

code/game/machinery/airlock_control.dm

@@ -20,28 +20,28 @@
 			close(1)
 
 		if("unlock")
-			locked = FALSE
+			locked = FALSE
 			update_icon()
 
 		if("lock")
-			locked = TRUE
+			locked = TRUE
 			update_icon()
 
 		if("secure_open")
-			locked = FALSE
+			locked = FALSE
 			update_icon()
 
 			sleep(2)
 			open(1)
 
-			locked = TRUE
+			locked = TRUE
 			update_icon()
 
 		if("secure_close")
-			locked = FALSE
+			locked = FALSE
 			close(1)
 
-			locked = TRUE
+			locked = TRUE
 			sleep(2)
 			update_icon()
 
@@ -88,7 +88,7 @@
 	name = "airlock sensor"
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
-	anchored = TRUE
+	anchored = TRUE
 	power_channel = ENVIRON
 
 	var/id_tag
@@ -97,8 +97,8 @@
 
 	var/datum/radio_frequency/radio_connection
 
-	var/on = TRUE
-	var/alert = FALSE
+	var/on = TRUE
+	var/alert = FALSE
 
 
 /obj/machinery/airlock_sensor/update_icon()
@@ -143,9 +143,9 @@
 	radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK)
 
 /obj/machinery/airlock_sensor/Initialize()
-	..()
+	. = ..()
 	set_frequency(frequency)
 
 /obj/machinery/airlock_sensor/Destroy()
-	SSradio.remove_object(src,frequency)
+	SSradio.remove_object(src,frequency)
 	return ..()

code/game/machinery/autolathe.dm

@@ -32,8 +32,6 @@
 	var/selected_category
 	var/screen = 1
 
-	var/datum/material_container/materials
-
 	var/list/categories = list(
 							"Tools",
 							"Electronics",
@@ -48,15 +46,15 @@
 							)
 
 /obj/machinery/autolathe/Initialize()
-	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS))
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS))
+	. = ..()
+
 	wires = new /datum/wires/autolathe(src)
 	files = new /datum/research/autolathe(src)
 	matching_designs = list()
-	return ..()
 
 /obj/machinery/autolathe/Destroy()
 	QDEL_NULL(wires)
-	QDEL_NULL(materials)
 	return ..()
 
 /obj/machinery/autolathe/interact(mob/user)
@@ -81,6 +79,7 @@
 	popup.open()
 
 /obj/machinery/autolathe/on_deconstruction()
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 
 /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params)
@@ -123,42 +122,26 @@
 		busy = FALSE
 		return 1
 
-	if(O.flags_2 & HOLOGRAM_2)
-		return 1
+	return ..()
 
-	var/material_amount = materials.get_item_material_amount(O)
-	if(!material_amount)
-		to_chat(user, "<span class='warning'>This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.</span>")
-		return 1
-	if(!materials.has_space(material_amount))
-		to_chat(user, "<span class='warning'>The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.</span>")
-		return 1
-	if(!user.temporarilyRemoveItemFromInventory(O))
-		to_chat(user, "<span class='warning'>\The [O] is stuck to you and cannot be placed into the autolathe.</span>")
-		return 1
-
-	busy = TRUE
-	var/inserted = materials.insert_item(O)
-	if(inserted)
-		if(istype(O, /obj/item/stack))
-			if (O.materials[MAT_METAL])
-				flick("autolathe_o",src)//plays metal insertion animation
-			if (O.materials[MAT_GLASS])
-				flick("autolathe_r",src)//plays glass insertion animation
-			to_chat(user, "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.</span>")
-			use_power(inserted*100)
-			if(!QDELETED(O))
-				user.put_in_active_hand(O)
+/obj/machinery/mecha_part_fabricator/ComponentActivated(datum/component/C)
+	..()
+	if(istype(C, /datum/component/material_container))
+		var/datum/component/material_container/M = C
+		if(!M.last_insert_success)
+			return
+		var/lit = M.last_inserted_type
+		if(ispath(lit, /obj/item/ore/bluespace_crystal))
+			use_power(max(500,M.last_amount_inserted/10))
 		else
-			to_chat(user, "<span class='notice'>You insert a material total of [inserted] to the autolathe.</span>")
-			use_power(max(500,inserted/10))
-			qdel(O)
-	else
-		user.put_in_active_hand(O)
-
-	busy = FALSE
-	updateUsrDialog()
-	return 1
+			var/obj/item/stack/S = lit
+			var/list/initmats = initial(S.materials)
+			if (initmats[MAT_METAL])
+				flick("autolathe_o",src)//plays metal insertion animation
+			if (initmats[MAT_GLASS])
+				flick("autolathe_r",src)//plays glass insertion animation
+			use_power(M.last_amount_inserted*100)
+		updateUsrDialog()
 
 /obj/machinery/autolathe/Topic(href, href_list)
 	if(..())
@@ -193,6 +176,7 @@
 
 			var/power = max(2000, (metal_cost+glass_cost)*multiplier/5)
 
+			GET_COMPONENT(materials, /datum/component/material_container)
 			if((materials.amount(MAT_METAL) >= metal_cost*multiplier*coeff) && (materials.amount(MAT_GLASS) >= glass_cost*multiplier*coeff))
 				busy = TRUE
 				use_power(power)
@@ -246,6 +230,7 @@
 	var/T = 0
 	for(var/obj/item/stock_parts/matter_bin/MB in component_parts)
 		T += MB.rating*75000
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = T
 	T=1.2
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
@@ -294,6 +279,7 @@
 			dat += "<a href='?src=\ref[src];make=[D.id];multiplier=1'>[D.name]</a>"
 
 		if(ispath(D.build_path, /obj/item/stack))
+			GET_COMPONENT(materials, /datum/component/material_container)
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
 			if (max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
@@ -325,6 +311,7 @@
 			dat += "<a href='?src=\ref[src];make=[D.id];multiplier=1'>[D.name]</a>"
 
 		if(ispath(D.build_path, /obj/item/stack))
+			GET_COMPONENT(materials, /datum/component/material_container)
 			var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY)
 			if (max_multiplier>10 && !disabled)
 				dat += " <a href='?src=\ref[src];make=[D.id];multiplier=10'>x10</a>"
@@ -339,6 +326,7 @@
 	return dat
 
 /obj/machinery/autolathe/proc/materials_printout()
+	GET_COMPONENT(materials, /datum/component/material_container)
 	var/dat = "<b>Total amount:</b> [materials.total_amount] / [materials.max_amount] cm<sup>3</sup><br>"
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
@@ -351,6 +339,7 @@
 
 	var/coeff = (ispath(D.build_path, /obj/item/stack) ? 1 : prod_coeff)
 
+	GET_COMPONENT(materials, /datum/component/material_container)
 	if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] * coeff * amount)))
 		return 0
 	if(D.materials[MAT_GLASS] && (materials.amount(MAT_GLASS) < (D.materials[MAT_GLASS] * coeff * amount)))

code/game/machinery/camera/camera.dm

@@ -39,6 +39,8 @@
 	// Upgrades bitflag
 	var/upgrades = 0
 
+	var/internal_light = TRUE //Whether it can light up when an AI views it
+
 /obj/machinery/camera/Initialize(mapload)
 	. = ..()
 	assembly = new(src)

code/game/machinery/cloning.dm

@@ -218,6 +218,7 @@
 	if(!is_operational()) //Autoeject if power is lost
 		if(mob_occupant)
 			go_out()
+			mob_occupant.apply_vore_prefs()
 			connected_message("Clone Ejected: Loss of power.")
 
 	else if(mob_occupant && (mob_occupant.loc == src))
@@ -226,6 +227,7 @@
 			SPEAK("The cloning of [mob_occupant.real_name] has been \
 				aborted due to unrecoverable tissue failure.")
 			go_out()
+			mob_occupant.apply_vore_prefs()
 
 		else if(mob_occupant.cloneloss > (100 - heal_level))
 			mob_occupant.Unconscious(80)
@@ -270,6 +272,7 @@
 					BP.attach_limb(mob_occupant)
 
 			go_out()
+			mob_occupant.apply_vore_prefs()
 
 	else if (!mob_occupant || mob_occupant.loc != src)
 		occupant = null

code/game/machinery/computer/Operating.dm

@@ -4,17 +4,17 @@
 	icon_screen = "crew"
 	icon_keyboard = "med_key"
 	circuit = /obj/item/circuitboard/computer/operating
-	var/mob/living/carbon/human/patient
-	var/obj/structure/table/optable/table
+	var/mob/living/carbon/human/patient
+	var/obj/structure/table/optable/table
 
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/operating/Initialize()
-	..()
+	. = ..()
 	find_table()
 
 /obj/machinery/computer/operating/proc/find_table()
-	for(var/dir in GLOB.cardinals)
+	for(var/dir in GLOB.cardinals)
 		table = locate(/obj/structure/table/optable, get_step(src, dir))
 		if(table)
 			table.computer = src
@@ -63,4 +63,4 @@
 			var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
 			dat += "Next step: [capitalize(surgery_step.name)]<BR>"
 		dat += "</div>"
-	return dat
+	return dat

code/game/machinery/computer/_computer.dm

@@ -22,7 +22,7 @@
 	if(!QDELETED(C))
 		qdel(circuit)
 		circuit = C
-		C.forceMove(null)
+		C.loc = null
 
 /obj/machinery/computer/Destroy()
 	QDEL_NULL(circuit)

code/game/machinery/computer/atmos_control.dm

@@ -84,7 +84,7 @@
 	light_color = LIGHT_COLOR_CYAN
 
 /obj/machinery/computer/atmos_control/Initialize()
-	..()
+	. = ..()
 	set_frequency(frequency)
 
 /obj/machinery/computer/atmos_control/Destroy()
@@ -227,4 +227,4 @@
 	else if(output_tag == id_tag)
 		output_info = signal.data
 	else
-		..(signal)
+		..(signal)

code/game/machinery/computer/dna_console.dm

@@ -169,7 +169,7 @@
 		if("working")
 			temp_html += status
 			temp_html += "<h1>System Busy</h1>"
-			temp_html += "Working ... Please wait ([radduration] Seconds)"
+			temp_html += "Working ... Please wait ([DisplayTimeText(radduration)])"
 		if("buffer")
 			temp_html += status
 			temp_html += buttons

code/game/machinery/computer/message.dm

@@ -40,25 +40,25 @@
 		return ..()
 
 /obj/machinery/computer/message_monitor/emag_act(mob/user)
-	if(emagged)
-		return
-	if(!isnull(src.linkedServer))
-		emagged = TRUE
-		screen = 2
-		spark_system.set_up(5, 0, src)
-		src.spark_system.start()
-		var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey
-		MK.loc = src.loc
-		// Will help make emagging the console not so easy to get away with.
-		MK.info += "<br><br><font color='red'>�%@%(*$%&(�&?*(%&�/{}</font>"
-		var/time = 100 * length(src.linkedServer.decryptkey)
-		addtimer(CALLBACK(src, .proc/UnmagConsole), time)
-		message = rebootmsg
-	else
-		to_chat(user, "<span class='notice'>A no server error appears on the screen.</span>")
+	if(emagged)
+		return
+	if(!isnull(src.linkedServer))
+		emagged = TRUE
+		screen = 2
+		spark_system.set_up(5, 0, src)
+		src.spark_system.start()
+		var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey
+		MK.loc = src.loc
+		// Will help make emagging the console not so easy to get away with.
+		MK.info += "<br><br><font color='red'>�%@%(*$%&(�&?*(%&�/{}</font>"
+		var/time = 100 * length(src.linkedServer.decryptkey)
+		addtimer(CALLBACK(src, .proc/UnmagConsole), time)
+		message = rebootmsg
+	else
+		to_chat(user, "<span class='notice'>A no server error appears on the screen.</span>")
 
 /obj/machinery/computer/message_monitor/Initialize()
-	..()
+	. = ..()
 	//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
 	if(!linkedServer)
 		if(GLOB.message_servers && GLOB.message_servers.len > 0)
@@ -236,7 +236,7 @@
 	src.screen = 0 // Return the screen back to normal
 
 /obj/machinery/computer/message_monitor/proc/UnmagConsole()
-	emagged = FALSE
+	emagged = FALSE
 
 /obj/machinery/computer/message_monitor/proc/ResetMessage()
 	customsender 	= "System Administrator"
@@ -309,7 +309,7 @@
 				message = noserver
 			else
 				if(auth)
-					var/dkey = trim(stripped_input(usr, "Please enter the decryption key."))
+					var/dkey = trim(stripped_input(usr, "Please enter the decryption key."))
 					if(dkey && dkey != "")
 						if(src.linkedServer.decryptkey == dkey)
 							var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):"))
@@ -414,11 +414,11 @@
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[src]'>[customsender]</a> ([customjob]):</b></i><br>[custommessage]<br>"
 							if (!customrecepient.silent)
 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
+								customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
 								if( customrecepient.loc && ishuman(customrecepient.loc) )
 									var/mob/living/carbon/human/H = customrecepient.loc
-									to_chat(H, "[icon2html(customrecepient, viewers(H))] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)")
-								log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
+									to_chat(H, "[icon2html(customrecepient, viewers(H))] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)")
+								log_talk(usr,"[key_name(usr)] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
 								customrecepient.cut_overlays()
 								customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
 						//Sender is faking as someone who exists
@@ -427,11 +427,11 @@
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[PDARec]'>[PDARec.owner]</a> ([customjob]):</b></i><br>[custommessage]<br>"
 							if (!customrecepient.silent)
 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
+								customrecepient.audible_message("[icon2html(customrecepient, viewers(customrecepient))] *[customrecepient.ttone]*", null, 3)
 								if( customrecepient.loc && ishuman(customrecepient.loc) )
 									var/mob/living/carbon/human/H = customrecepient.loc
-									to_chat(H, "[icon2html(customrecepient, H)] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)")
-								log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
+									to_chat(H, "[icon2html(customrecepient, H)] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)")
+								log_talk(usr,"[key_name(usr)] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]",LOGPDA)
 								customrecepient.cut_overlays()
 								customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
 						//Finally..
@@ -468,4 +468,4 @@
 					info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>Please keep this a secret and away from the clown.<br>If necessary, change the password to a more secure one."
 					info_links = info
 					add_overlay("paper_words")
-					break
+					break

code/game/machinery/computer/pod.dm

@@ -1,145 +1,143 @@
-/obj/machinery/computer/pod
-	name = "mass driver launch control"
-	desc = "A combined blastdoor and mass driver control unit."
-	var/obj/machinery/mass_driver/connected = null
-	var/title = "Mass Driver Controls"
-	var/id = 1
-	var/timing = 0
-	var/time = 30
-	var/range = 4
-
-
-/obj/machinery/computer/pod/Initialize()
-	..()
-	for(var/obj/machinery/mass_driver/M in range(range, src))
-		if(M.id == id)
-			connected = M
-
-
-/obj/machinery/computer/pod/proc/alarm()
-	if(stat & (NOPOWER|BROKEN))
-		return
-
-	if(!connected)
+/obj/machinery/computer/pod
+	name = "mass driver launch control"
+	desc = "A combined blastdoor and mass driver control unit."
+	var/obj/machinery/mass_driver/connected = null
+	var/title = "Mass Driver Controls"
+	var/id = 1
+	var/timing = 0
+	var/time = 30
+	var/range = 4
+
+
+/obj/machinery/computer/pod/Initialize()
+	. = ..()
+	for(var/obj/machinery/mass_driver/M in range(range, src))
+		if(M.id == id)
+			connected = M
+
+
+/obj/machinery/computer/pod/proc/alarm()
+	if(stat & (NOPOWER|BROKEN))
+		return
+
+	if(!connected)
 		say("Cannot locate mass driver connector. Cancelling firing sequence!")
-		return
-
-	for(var/obj/machinery/door/poddoor/M in range(range, src))
-		if(M.id == id)
-			M.open()
-
-	sleep(20)
-	for(var/obj/machinery/mass_driver/M in range(range, src))
-		if(M.id == id)
-			M.power = connected.power
-			M.drive()
-
-	sleep(50)
-	for(var/obj/machinery/door/poddoor/M in range(range, src))
-		if(M.id == id)
-			M.close()
-
-/obj/machinery/computer/pod/attack_hand(mob/user)
-	if(..())
-		return
-
-	var/dat = ""
-	user.set_machine(src)
-	if(connected)
-		var/d2
-		if(timing)	//door controls do not need timers.
-			d2 = "<A href='?src=\ref[src];time=0'>Stop Time Launch</A>"
-		else
-			d2 = "<A href='?src=\ref[src];time=1'>Initiate Time Launch</A>"
-		var/second = time % 60
-		var/minute = (time - second) / 60
-		dat += "<HR>\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>"
-		var/temp = ""
-		var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 )
-		for(var/t in L)
-			if(t == connected.power)
-				temp += "[t] "
-			else
-				temp += "<A href = '?src=\ref[src];power=[t]'>[t]</A> "
-		dat += "<HR>\nPower Level: [temp]<BR>\n<A href = '?src=\ref[src];alarm=1'>Firing Sequence</A><BR>\n<A href = '?src=\ref[src];drive=1'>Test Fire Driver</A><BR>\n<A href = '?src=\ref[src];door=1'>Toggle Outer Door</A><BR>"
-	else
-		dat += "<BR>\n<A href = '?src=\ref[src];door=1'>Toggle Outer Door</A><BR>"
-	dat += "<BR><BR><A href='?src=\ref[user];mach_close=computer'>Close</A>"
-	add_fingerprint(usr)
-	var/datum/browser/popup = new(user, "computer", title, 400, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open()
-
-
-/obj/machinery/computer/pod/process()
-	if(!..())
-		return
-	if(timing)
-		if(time > 0)
-			time = round(time) - 1
-		else
-			alarm()
-			time = 0
-			timing = 0
-		updateDialog()
-
-
-/obj/machinery/computer/pod/Topic(href, href_list)
-	if(..())
-		return
-	if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
-		usr.set_machine(src)
-		if(href_list["power"])
-			var/t = text2num(href_list["power"])
-			t = min(max(0.25, t), 16)
-			if(connected)
-				connected.power = t
-		if(href_list["alarm"])
-			alarm()
-		if(href_list["time"])
-			timing = text2num(href_list["time"])
-		if(href_list["tp"])
-			var/tp = text2num(href_list["tp"])
-			time += tp
-			time = min(max(round(time), 0), 120)
-		if(href_list["door"])
-			for(var/obj/machinery/door/poddoor/M in range(range, src))
-				if(M.id == id)
-					if(M.density)
-						M.open()
-					else
-						M.close()
-		if(href_list["drive"])
-			for(var/obj/machinery/mass_driver/M in range(range, src))
-				if(M.id == id)
-					M.power = connected.power
-					M.drive()
-		updateUsrDialog()
-
-
-/obj/machinery/computer/pod/old
-	name = "\improper DoorMex control console"
-	title = "Door Controls"
-	icon_state = "oldcomp"
-	icon_screen = "library"
-	icon_keyboard = null
-
-
-/obj/machinery/computer/pod/old/syndicate
-	name = "\improper ProComp Executive IIc"
-	desc = "The Syndicate operate on a tight budget. Operates external airlocks."
-	title = "External Airlock Controls"
+		return
+
+	for(var/obj/machinery/door/poddoor/M in range(range, src))
+		if(M.id == id)
+			M.open()
+
+	sleep(20)
+	for(var/obj/machinery/mass_driver/M in range(range, src))
+		if(M.id == id)
+			M.power = connected.power
+			M.drive()
+
+	sleep(50)
+	for(var/obj/machinery/door/poddoor/M in range(range, src))
+		if(M.id == id)
+			M.close()
+
+/obj/machinery/computer/pod/attack_hand(mob/user)
+	if(..())
+		return
+
+	var/dat = ""
+	user.set_machine(src)
+	if(connected)
+		var/d2
+		if(timing)	//door controls do not need timers.
+			d2 = "<A href='?src=\ref[src];time=0'>Stop Time Launch</A>"
+		else
+			d2 = "<A href='?src=\ref[src];time=1'>Initiate Time Launch</A>"
+		dat += "<HR>\nTimer System: [d2]\nTime Left: [DisplayTimeText(time)] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>"
+		var/temp = ""
+		var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 )
+		for(var/t in L)
+			if(t == connected.power)
+				temp += "[t] "
+			else
+				temp += "<A href = '?src=\ref[src];power=[t]'>[t]</A> "
+		dat += "<HR>\nPower Level: [temp]<BR>\n<A href = '?src=\ref[src];alarm=1'>Firing Sequence</A><BR>\n<A href = '?src=\ref[src];drive=1'>Test Fire Driver</A><BR>\n<A href = '?src=\ref[src];door=1'>Toggle Outer Door</A><BR>"
+	else
+		dat += "<BR>\n<A href = '?src=\ref[src];door=1'>Toggle Outer Door</A><BR>"
+	dat += "<BR><BR><A href='?src=\ref[user];mach_close=computer'>Close</A>"
+	add_fingerprint(usr)
+	var/datum/browser/popup = new(user, "computer", title, 400, 500)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+	popup.open()
+
+
+/obj/machinery/computer/pod/process()
+	if(!..())
+		return
+	if(timing)
+		if(time > 0)
+			time = round(time) - 1
+		else
+			alarm()
+			time = 0
+			timing = 0
+		updateDialog()
+
+
+/obj/machinery/computer/pod/Topic(href, href_list)
+	if(..())
+		return
+	if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
+		usr.set_machine(src)
+		if(href_list["power"])
+			var/t = text2num(href_list["power"])
+			t = min(max(0.25, t), 16)
+			if(connected)
+				connected.power = t
+		if(href_list["alarm"])
+			alarm()
+		if(href_list["time"])
+			timing = text2num(href_list["time"])
+		if(href_list["tp"])
+			var/tp = text2num(href_list["tp"])
+			time += tp
+			time = min(max(round(time), 0), 120)
+		if(href_list["door"])
+			for(var/obj/machinery/door/poddoor/M in range(range, src))
+				if(M.id == id)
+					if(M.density)
+						M.open()
+					else
+						M.close()
+		if(href_list["drive"])
+			for(var/obj/machinery/mass_driver/M in range(range, src))
+				if(M.id == id)
+					M.power = connected.power
+					M.drive()
+		updateUsrDialog()
+
+
+/obj/machinery/computer/pod/old
+	name = "\improper DoorMex control console"
+	title = "Door Controls"
+	icon_state = "oldcomp"
+	icon_screen = "library"
+	icon_keyboard = null
+
+
+/obj/machinery/computer/pod/old/syndicate
+	name = "\improper ProComp Executive IIc"
+	desc = "The Syndicate operate on a tight budget. Operates external airlocks."
+	title = "External Airlock Controls"
 	req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user)
-	if(!allowed(user))
-		to_chat(user, "<span class='notice'>Access denied.</span>")
-		return
-	else
-		..()
-
-
-/obj/machinery/computer/pod/old/swf
-	name = "\improper Magix System IV"
-	desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
+
+/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user)
+	if(!allowed(user))
+		to_chat(user, "<span class='notice'>Access denied.</span>")
+		return
+	else
+		..()
+
+
+/obj/machinery/computer/pod/old/swf
+	name = "\improper Magix System IV"
+	desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"

code/game/machinery/computer/telecrystalconsoles.dm

@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	var/obj/machinery/computer/telecrystals/boss/linkedboss = null
 
 /obj/machinery/computer/telecrystals/uplinker/Initialize()
-	..()
+	. = ..()
 
 	var/ID = pick_n_take(GLOB.possible_uplinker_IDs)
 	if(!ID)
@@ -220,4 +220,4 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	src.updateUsrDialog()
 	return
 
-#undef NUKESCALINGMODIFIER
+#undef NUKESCALINGMODIFIER

code/game/machinery/dance_machine.dm

@@ -96,7 +96,7 @@
 	dat += "</div><br>"
 	dat += "<A href='?src=\ref[src];action=select'> Select Track</A><br>"
 	dat += "Track Selected: [selection.song_name]<br>"
-	dat += "Track Length: [selection.song_length/10] seconds<br><br>"
+	dat += "Track Length: [DisplayTimeText(selection.song_length)]<br><br>"
 	dat += "<br>DJ's Soundboard:<b><br>"
 	dat +="<div class='statusDisplay'><div style='text-align:center'>"
 	dat += "<A href='?src=\ref[src];action=horn'>Air Horn</A>  "
@@ -122,7 +122,7 @@
 				return
 			if(!active)
 				if(stop > world.time)
-					to_chat(usr, "<span class='warning'>Error: The device is still resetting from the last activation, it will be ready again in [round((stop-world.time)/10)] seconds.</span>")
+					to_chat(usr, "<span class='warning'>Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].</span>")
 					playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1)
 					return
 				active = TRUE

code/game/machinery/dna_scanner.dm

@@ -15,7 +15,7 @@
 	var/scan_level
 	var/precision_coeff
 	var/message_cooldown
-	var/breakout_time = 2
+	var/breakout_time = 1200
 
 /obj/machinery/dna_scannernew/RefreshParts()
 	scan_level = 0
@@ -73,9 +73,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
-		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a metallic creaking from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
 			return
 		locked = FALSE

code/game/machinery/doors/airlock.dm

@@ -1011,7 +1011,7 @@
 			if(AIRLOCK_SECURITY_NONE)
 				if(istype(C, /obj/item/stack/sheet/metal))
 					var/obj/item/stack/sheet/metal/S = C
-					if(S.amount < 2)
+					if(S.get_amount() < 2)
 						to_chat(user, "<span class='warning'>You need at least 2 metal sheets to reinforce [src].</span>")
 						return
 					to_chat(user, "<span class='notice'>You start reinforcing [src]</span>")
@@ -1025,7 +1025,7 @@
 					return
 				else if(istype(C, /obj/item/stack/sheet/plasteel))
 					var/obj/item/stack/sheet/plasteel/S = C
-					if(S.amount < 2)
+					if(S.get_amount() < 2)
 						to_chat(user, "<span class='warning'>You need at least 2 plasteel sheets to reinforce [src].</span>")
 						return
 					to_chat(user, "<span class='notice'>You start reinforcing [src].</span>")
@@ -1347,19 +1347,19 @@
 		return TRUE
 	operating = TRUE
 	update_icon(AIRLOCK_OPENING, 1)
-	src.set_opacity(0)
-	sleep(5)
-	density = FALSE
-	sleep(9)
-	src.layer = OPEN_DOOR_LAYER
-	update_icon(AIRLOCK_OPEN, 1)
+	sleep(1)
 	set_opacity(0)
-	operating = FALSE
-	air_update_turf(1)
 	update_freelook_sight()
+	sleep(4)
+	density = FALSE
+	air_update_turf(1)
+	sleep(1)
+	layer = OPEN_DOOR_LAYER
+	update_icon(AIRLOCK_OPEN, 1)
+	operating = FALSE
 	if(delayed_close_requested)
 		delayed_close_requested = FALSE
-		addtimer(CALLBACK(src, .proc/close), 2)
+		addtimer(CALLBACK(src, .proc/close), 1)
 	return TRUE
 
 
@@ -1391,21 +1391,24 @@
 		return TRUE
 	operating = TRUE
 	update_icon(AIRLOCK_CLOSING, 1)
-	src.layer = CLOSED_DOOR_LAYER
+	layer = CLOSED_DOOR_LAYER
 	if(air_tight)
 		density = TRUE
-	sleep(5)
-	density = TRUE
+		air_update_turf(1)
+	sleep(1)
+	if(!air_tight)
+		density = TRUE
+		air_update_turf(1)
+	sleep(4)
 	if(!safe)
 		crush()
-	sleep(9)
-	update_icon(AIRLOCK_CLOSED, 1)
 	if(visible && !glass)
 		set_opacity(1)
+	update_freelook_sight()
+	sleep(1)
+	update_icon(AIRLOCK_CLOSED, 1)
 	operating = FALSE
 	delayed_close_requested = FALSE
-	air_update_turf(1)
-	update_freelook_sight()
 	if(safe)
 		CheckForMobs()
 	return TRUE

code/game/machinery/doors/firedoor.dm

@@ -434,6 +434,15 @@
 				constructionStep = CONSTRUCTION_GUTTED
 				update_icon()
 				return
+			if(istype(C, /obj/item/device/electroadaptive_pseudocircuit))
+				var/obj/item/device/electroadaptive_pseudocircuit/P = C
+				if(!P.adapt_circuit(user, 30))
+					return
+				user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+				"<span class='notice'>You adapt a firelock circuit and slot it into the assembly.</span>")
+				constructionStep = CONSTRUCTION_GUTTED
+				update_icon()
+				return
 	return ..()
 
 /obj/structure/firelock_frame/heavy

code/game/machinery/droneDispenser.dm

@@ -22,7 +22,6 @@
 	var/icon_recharging = "recharge"
 	var/icon_creating = "make"
 
-	var/datum/material_container/materials
 	var/list/using_materials
 	var/starting_amount = 0
 	var/metal_cost = 1000
@@ -55,14 +54,10 @@
 
 /obj/machinery/droneDispenser/Initialize()
 	. = ..()
-	materials = new(src, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT*MAX_STACK_SIZE*2)
+	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE)
 	materials.insert_amount(starting_amount)
 	using_materials = list(MAT_METAL=metal_cost, MAT_GLASS=glass_cost)
 
-/obj/machinery/droneDispenser/Destroy()
-	QDEL_NULL(materials)
-	return ..()
-
 /obj/machinery/droneDispenser/preloaded
 	starting_amount = 5000
 
@@ -81,7 +76,7 @@
 		exterminator drones when supplied with metal and glass. \
 		Disgusting. This one seems ominous."
 	dispense_type = /obj/item/drone_shell/syndrone/badass
-	end_create_message = "dispenses a ominous suspicious drone shell."
+	end_create_message = "dispenses an ominous suspicious drone shell."
 
 // I don't need your forgiveness, this is awesome.
 /obj/machinery/droneDispenser/snowflake
@@ -148,10 +143,6 @@
 	..()
 	if((mode == DRONE_RECHARGING) && !stat && recharging_text)
 		to_chat(user, "<span class='warning'>[recharging_text]</span>")
-	if(metal_cost)
-		to_chat(user, "<span class='notice'>It has [materials.amount(MAT_METAL)] units of metal stored.</span>")
-	if(glass_cost)
-		to_chat(user, "<span class='notice'>It has [materials.amount(MAT_GLASS)] units of glass stored.</span>")
 
 /obj/machinery/droneDispenser/power_change()
 	..()
@@ -166,6 +157,7 @@
 	if((stat & (NOPOWER|BROKEN)) || !anchored)
 		return
 
+	GET_COMPONENT(materials, /datum/component/material_container)
 	if(!materials.has_materials(using_materials))
 		return // We require more minerals
 
@@ -232,25 +224,8 @@
 		icon_state = icon_on
 
 /obj/machinery/droneDispenser/attackby(obj/item/O, mob/living/user)
-	if(istype(O, /obj/item/stack))
-		if(!O.materials[MAT_METAL] && !O.materials[MAT_GLASS])
-			return ..()
-		if(!metal_cost && !glass_cost)
-			to_chat(user, "<span class='warning'>There isn't a place to insert [O]!</span>")
-			return
-		var/obj/item/stack/sheets = O
-		if(!user.canUnEquip(sheets))
-			to_chat(user, "<span class='warning'>[O] is stuck to your hand, you can't get it off!</span>")
-			return
-
-		var/used = materials.insert_stack(sheets, sheets.amount)
-
-		if(used)
-			to_chat(user, "<span class='notice'>You insert [used] sheet[used > 1 ? "s" : ""] into [src].</span>")
-		else
-			to_chat(user, "<span class='warning'>The [src] isn't accepting the [sheets].</span>")
-
-	else if(istype(O, /obj/item/crowbar))
+	if(istype(O, /obj/item/crowbar))
+		GET_COMPONENT(materials, /datum/component/material_container)
 		materials.retrieve_all()
 		playsound(loc, O.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You retrieve the materials from [src].</span>")

code/game/machinery/firealarm.dm

@@ -220,6 +220,16 @@
 					update_icon()
 					return
 
+				else if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
+					var/obj/item/device/electroadaptive_pseudocircuit/P = W
+					if(!P.adapt_circuit(user, 15))
+						return
+					user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
+					"<span class='notice'>You adapt a fire alarm circuit and slot it into the assembly.</span>")
+					buildstage = 1
+					update_icon()
+					return
+
 				else if(istype(W, /obj/item/wrench))
 					user.visible_message("[user] removes the fire alarm assembly from the wall.", \
 										 "<span class='notice'>You remove the fire alarm assembly from the wall.</span>")

code/game/machinery/gulag_teleporter.dm

@@ -20,7 +20,7 @@ The console is located at computer/gulag_teleporter.dm
 	circuit = /obj/item/circuitboard/machine/gulag_teleporter
 	var/locked = FALSE
 	var/message_cooldown
-	var/breakout_time = 1
+	var/breakout_time = 600
 	var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner
 	var/shoes_type = /obj/item/clothing/shoes/sneakers/orange
 	var/obj/machinery/gulag_item_reclaimer/linked_reclaimer
@@ -104,9 +104,9 @@ The console is located at computer/gulag_teleporter.dm
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
-		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a metallic creaking from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
 			return
 		locked = FALSE

code/game/machinery/magnet.dm

@@ -215,7 +215,7 @@
 
 
 /obj/machinery/magnetic_controller/Initialize()
-	..()
+	. = ..()
 	if(autolink)
 		for(var/obj/machinery/magnetic_module/M in GLOB.machines)
 			if(M.freq == frequency && M.code == code)
@@ -391,4 +391,4 @@
 		if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore
 			rpath += copytext(path, i, i+1) // else, add to list
 
-		// there doesn't HAVE to be separators but it makes paths syntatically visible
+		// there doesn't HAVE to be separators but it makes paths syntatically visible

code/game/machinery/overview.dm

@@ -31,8 +31,6 @@
 		imap += icon('icons/misc/imap.dmi', "blank")
 		imap += icon('icons/misc/imap.dmi', "blank")
 
-	//to_chat(world, "[icount] images in list")
-
 
 	for(var/wx = 1 ; wx <= world.maxx; wx++)
 
@@ -142,13 +140,10 @@
 			var/rx = ((wx*2+xoff)%32) + 1
 			var/ry = ((wy*2+yoff)%32) + 1
 
-			//to_chat(world, "trying [ix],[iy] : [ix+icx*iy]")
 			var/icon/I = imap[1+(ix + icx*iy)*2]
 			var/icon/I2 = imap[2+(ix + icx*iy)*2]
 
 
-			//to_chat(world, "icon: [icon2html(I, world)]")
-
 			I.DrawBox(colour, rx, ry, rx+1, ry+1)
 
 			I2.DrawBox(colour2, rx, ry, rx+1, ry+1)
@@ -164,8 +159,6 @@
 
 		H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
 
-		//to_chat(world, "[icon2html(I, world)] at [H.screen_loc]")
-
 		H.name = (i==0)?"maprefresh":"map"
 
 		var/icon/HI = new/icon
@@ -272,12 +265,8 @@
 			var/rx = ((wx*2+xoff)%32) + 1
 			var/ry = ((wy*2+yoff)%32) + 1
 
-			//to_chat(world, "trying [ix],[iy] : [ix+icx*iy]")
 			var/icon/I = imap[1+(ix + icx*iy)]
 
-
-			//to_chat(world, "icon: [icon2html(I, world)]")
-
 			I.DrawBox(colour, rx, ry, rx, ry)
 
 
@@ -291,8 +280,6 @@
 
 		H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
 
-		//to_chat(world, "[icon2html(I, world)] at [H.screen_loc]")
-
 		H.name = (i==0)?"maprefresh":"map"
 
 		var/icon/I = imap[i+1]

code/game/machinery/pipe/construction.dm

@@ -30,6 +30,7 @@ Buildable meters
 		PIPE_HE_MANIFOLD, \
 		PIPE_HE_4WAYMANIFOLD, \
 		PIPE_JUNCTION, \
+		PIPE_BLUESPACE, \
 		\
 		PIPE_CONNECTOR, \
 		PIPE_UVENT, \
@@ -90,6 +91,7 @@ GLOBAL_LIST_INIT(pipeID2State, list(
 	"[PIPE_HE_MANIFOLD]"	 = "he_manifold", \
 	"[PIPE_HE_4WAYMANIFOLD]" = "he_manifold4w", \
 	"[PIPE_JUNCTION]"		 = "junction", \
+	"[PIPE_BLUESPACE]"		 = "bluespace", \
 	\
 	"[PIPE_CONNECTOR]"		 = "connector", \
 	"[PIPE_UVENT]"			 = "uvent", \
@@ -118,6 +120,7 @@ GLOBAL_LIST_INIT(pipeID2State, list(
 		"[PIPE_HE_MANIFOLD]"	= "h/e manifold", \
 		"[PIPE_HE_4WAYMANIFOLD]"= "h/e 4-way manifold", \
 		"[PIPE_JUNCTION]" 		= "junction", \
+		"[PIPE_BLUESPACE]" 		= "bluespace pipe", \
 		\
 		"[PIPE_CONNECTOR]" 		= "connector", \
 		"[PIPE_UVENT]" 			= "vent", \

code/game/machinery/pipe/pipe_dispenser.dm

@@ -13,13 +13,14 @@
 	if(..())
 		return 1
 	var/dat = {"
-<b>Regular pipes:</b><BR>
+<b>Pipes:</b><BR>
 <A href='?src=\ref[src];make=[PIPE_SIMPLE];dir=1'>Pipe</A><BR>
 <A href='?src=\ref[src];make=[PIPE_SIMPLE];dir=5'>Bent Pipe</A><BR>
 <A href='?src=\ref[src];make=[PIPE_MANIFOLD];dir=1'>Manifold</A><BR>
 <A href='?src=\ref[src];make=[PIPE_4WAYMANIFOLD];dir=1'>4-Way Manifold</A><BR>
 <A href='?src=\ref[src];make=[PIPE_MVALVE];dir=1'>Manual Valve</A><BR>
 <A href='?src=\ref[src];make=[PIPE_DVALVE];dir=1'>Digital Valve</A><BR>
+<A href='?src=\ref[src];make=[PIPE_BLUESPACE];dir=1'>Bluespace Pipe</A><BR>
 <b>Devices:</b><BR>
 <A href='?src=\ref[src];make=[PIPE_CONNECTOR];dir=1'>Connector</A><BR>
 <A href='?src=\ref[src];make=[PIPE_UVENT];dir=1'>Vent</A><BR>

code/game/machinery/porta_turret/portable_turret.dm

@@ -570,8 +570,8 @@
 /obj/machinery/porta_turret/syndicate/pod
 	integrity_failure = 20
 	max_integrity = 40
-	stun_projectile = /obj/item/projectile/bullet/weakbullet3
-	lethal_projectile = /obj/item/projectile/bullet/weakbullet3
+	stun_projectile = /obj/item/projectile/bullet/syndicate_turret
+	lethal_projectile = /obj/item/projectile/bullet/syndicate_turret
 
 /obj/machinery/porta_turret/ai
 	faction = "silicon"

code/game/machinery/quantum_pad.dm

@@ -79,7 +79,7 @@
 			return
 
 	if(world.time < last_teleport + teleport_cooldown)
-		to_chat(user, "<span class='warning'>[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.</span>")
+		to_chat(user, "<span class='warning'>[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].</span>")
 		return
 
 	if(teleporting)

code/game/machinery/recycler.dm

@@ -14,15 +14,14 @@
 	var/blood = 0
 	var/eat_dir = WEST
 	var/amount_produced = 50
-	var/datum/material_container/materials
 	var/crush_damage = 1000
 	var/eat_victim_items = TRUE
 	var/item_recycle_sound = 'sound/items/welder.ogg'
 
 /obj/machinery/recycler/Initialize()
-	materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM))
+	. = ..()
 	update_icon()
-	return ..()
 
 /obj/machinery/recycler/RefreshParts()
 	var/amt_made = 0
@@ -32,6 +31,7 @@
 	mat_mod *= 50000
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		amt_made = 12.5 * M.rating //% of materials salvaged
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = mat_mod
 	amount_produced = min(50, amt_made) + 50
 
@@ -126,6 +126,7 @@
 /obj/machinery/recycler/proc/recycle_item(obj/item/I)
 	I.loc = src.loc
 
+	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(I)
 	if(!material_amount)
 		qdel(I)

code/game/machinery/suit_storage_unit.dm

@@ -27,7 +27,7 @@
 	var/uv_super = FALSE
 	var/uv_cycles = 6
 	var/message_cooldown
-	var/breakout_time = 0.5
+	var/breakout_time = 300
 
 /obj/machinery/suit_storage_unit/standard_unit
 	suit_type = /obj/item/clothing/suit/space/eva
@@ -267,9 +267,9 @@
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	user.visible_message("<span class='notice'>You see [user] kicking against the doors of [src]!</span>", \
-		"<span class='notice'>You start kicking against the doors... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='notice'>You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
 		"<span class='italics'>You hear a thump from [src].</span>")
-	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src )
 			return
 		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \

code/game/machinery/vending.dm

@@ -706,7 +706,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
     ..()
     var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
     new T(get_turf(src))
-    qdel(src)
+    return INITIALIZE_HINT_QDEL
 
 /obj/machinery/vending/snack/blue
 	icon_state = "snackblue"
@@ -758,7 +758,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
     . = ..()
     var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
     new T(get_turf(src))
-    qdel(src)
+    return INITIALIZE_HINT_QDEL
 
 /obj/machinery/vending/cola/blue
 	icon_state = "Cola_Machine"
@@ -1142,7 +1142,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 /obj/machinery/vending/toyliberationstation
 	name = "\improper Syndicate Donksoft Toy Vendor"
-	desc = "A ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!"
+	desc = "An ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!"
 	icon_state = "syndi"
 	req_access_txt = "1"
 	product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!"
@@ -1156,7 +1156,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 					/obj/item/toy/foamblade = 10,
 					/obj/item/toy/syndicateballoon = 10,
 					/obj/item/clothing/suit/syndicatefake = 5,
-					/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just a assistant
+					/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just an assistant
 	contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10,   //Congrats, you unlocked the +18 setting!
 						/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10,
 						/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10,
@@ -1195,4 +1195,4 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE
-#undef COIN_CHARGE
+#undef COIN_CHARGE

code/game/mecha/equipment/weapons/weapons.dm

@@ -251,7 +251,7 @@
 	icon_state = "mecha_carbine"
 	origin_tech = "materials=4;combat=4"
 	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/incendiary/shell
+	projectile = /obj/item/projectile/bullet/incendiary/fnx99
 	projectiles = 24
 	projectile_energy_cost = 15
 
@@ -271,7 +271,7 @@
 	icon_state = "mecha_scatter"
 	origin_tech = "combat=4"
 	equip_cooldown = 20
-	projectile = /obj/item/projectile/bullet/midbullet
+	projectile = /obj/item/projectile/bullet/scattershot
 	projectiles = 40
 	projectile_energy_cost = 25
 	projectiles_per_shot = 4
@@ -283,7 +283,7 @@
 	icon_state = "mecha_uac2"
 	origin_tech = "combat=4"
 	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/weakbullet3
+	projectile = /obj/item/projectile/bullet/lmg
 	projectiles = 300
 	projectile_energy_cost = 20
 	projectiles_per_shot = 3

code/game/mecha/mech_fabricator.dm

@@ -12,7 +12,6 @@
 	circuit = /obj/item/circuitboard/machine/mechfab
 	var/time_coeff = 1
 	var/component_coeff = 1
-	var/datum/material_container/materials
 	var/datum/research/files
 	var/sync = 0
 	var/part_set
@@ -36,9 +35,11 @@
 								)
 
 /obj/machinery/mecha_part_fabricator/Initialize()
+	AddComponent(/datum/component/material_container,
+	 list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
+		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
+	. = ..()
 	files = new /datum/research(src) //Setup the research data holder.
-	materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE))
-	return ..()
 
 /obj/machinery/mecha_part_fabricator/RefreshParts()
 	var/T = 0
@@ -46,6 +47,7 @@
 	//maximum stocking amount (default 300000, 600000 at T4)
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		T += M.rating
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.max_amount = (200000 + (T*50000))
 
 	//resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55)
@@ -113,6 +115,7 @@
 
 /obj/machinery/mecha_part_fabricator/proc/output_available_resources()
 	var/output
+	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/mat_id in materials.materials)
 		var/datum/material/M = materials.materials[mat_id]
 		output += "<span class=\"res_name\">[M.name]: </span>[M.amount] cm&sup3;"
@@ -133,6 +136,7 @@
 /obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D)
 	if(D.reagents_list.len) // No reagents storage - no reagent designs.
 		return 0
+	GET_COMPONENT(materials, /datum/component/material_container)
 	if(materials.has_materials(get_resources_w_coeff(D)))
 		return 1
 	return 0
@@ -142,6 +146,7 @@
 	desc = "It's building \a [initial(D.name)]."
 	var/list/res_coef = get_resources_w_coeff(D)
 
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.use_amount(res_coef)
 	add_overlay("fab-active")
 	use_power = ACTIVE_POWER_USE
@@ -398,15 +403,34 @@
 					break
 
 	if(href_list["remove_mat"] && href_list["material"])
+		GET_COMPONENT(materials, /datum/component/material_container)
 		materials.retrieve_sheets(text2num(href_list["remove_mat"]), href_list["material"])
 
 	updateUsrDialog()
 	return
 
 /obj/machinery/mecha_part_fabricator/on_deconstruction()
+	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	..()
 
+/obj/machinery/mecha_part_fabricator/ComponentActivated(datum/component/C)
+	..()
+	if(istype(C, /datum/component/material_container))
+		var/datum/component/material_container/M = C
+		if(!M.last_insert_success)
+			return
+		var/lit = M.last_inserted_type
+		var/stack_name
+		if(ispath(lit, /obj/item/ore/bluespace_crystal))
+			stack_name = "bluespace"
+		else
+			var/obj/item/stack/S = lit
+			stack_name = material2name(initial(S.materials)[1])
+		add_overlay("fab-load-[stack_name]")
+		addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10)
+		updateUsrDialog()
+
 /obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W))
 		return 1
@@ -417,55 +441,7 @@
 	if(default_deconstruction_crowbar(W))
 		return 1
 
-	if(istype(W, /obj/item/stack/sheet))
-
-		if(!is_insertion_ready(user))
-			return 1
-
-		var/material_amount = materials.get_item_material_amount(W)
-
-		if(!try_insert(user, W, material_amount))
-			return 1
-
-		var/inserted = materials.insert_item(W)
-		if(inserted)
-			to_chat(user, "<span class='notice'>You insert [inserted] sheet\s into [src].</span>")
-			if(W && W.materials.len)
-				if(!QDELETED(W))
-					user.put_in_active_hand(W)
-				var/mat_overlay = "fab-load-[material2name(W.materials[1])]"
-				add_overlay(mat_overlay)
-				sleep(10)
-				if(!QDELETED(src))
-					cut_overlay(mat_overlay) //No matter what the overlay shall still be deleted
-
-		updateUsrDialog()
-
-	else if(istype(W, /obj/item/ore/bluespace_crystal))
-
-		if(!is_insertion_ready(user))
-			return 1
-
-		var/material_amount = materials.get_item_material_amount(W)
-
-		if(!try_insert(user, W, material_amount))
-			return 1
-
-		var/inserted = materials.insert_item(W)
-		if(inserted)
-			to_chat(user, "<span class='notice'>You add [W] to the [src].</span>")
-			if(W && W.materials.len)
-				qdel(W)
-				var/mat_overlay = "fab-load-bluespace"
-				add_overlay(mat_overlay)
-				sleep(10)
-				if(!QDELETED(src))
-					cut_overlay(mat_overlay)
-
-		updateUsrDialog()
-
-	else
-		return ..()
+	return ..()
 
 /obj/machinery/mecha_part_fabricator/proc/material2name(ID)
 	return copytext(ID,2)
@@ -479,17 +455,3 @@
 		return FALSE
 
 	return TRUE
-
-
-/obj/machinery/mecha_part_fabricator/proc/try_insert(mob/user, obj/item/I, material_amount)
-	if(!material_amount)
-		to_chat(user, "<span class='warning'>This object does not contain sufficient amounts of materials to be accepted by [src].</span>")
-		return FALSE
-	if(!materials.has_space(material_amount))
-		to_chat(user, "<span class='warning'>\The [src] is full. Please remove some materials from [src] in order to insert more.</span>")
-		return FALSE
-	if(!user.temporarilyRemoveItemFromInventory(I))
-		to_chat(user, "<span class='warning'>\The [I] is stuck to you and cannot be placed into [src].</span>")
-		return FALSE
-
-	return TRUE

code/game/mecha/mecha.dm

@@ -289,7 +289,7 @@
 		if(internal_damage & MECHA_INT_TANK_BREACH) //remove some air from internal tank
 			if(internal_tank)
 				var/datum/gas_mixture/int_tank_air = internal_tank.return_air()
-				var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.10)
+				var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.1)
 				if(loc)
 					loc.assume_air(leaked_gas)
 					air_update_turf()
@@ -766,7 +766,7 @@
 		. = t_air.return_pressure()
 	return
 
-/obj/mecha/proc/return_temperature()
+/obj/mecha/return_temperature()
 	var/datum/gas_mixture/t_air = return_air()
 	if(t_air)
 		. = t_air.return_temperature()

code/game/mecha/mecha_parts.dm

@@ -1,404 +1,404 @@
-/////////////////////////
-////// Mecha Parts //////
-/////////////////////////
-
-/obj/item/mecha_parts
-	name = "mecha part"
-	icon = 'icons/mecha/mech_construct.dmi'
-	icon_state = "blank"
-	w_class = WEIGHT_CLASS_GIGANTIC
+/////////////////////////
+////// Mecha Parts //////
+/////////////////////////
+
+/obj/item/mecha_parts
+	name = "mecha part"
+	icon = 'icons/mecha/mech_construct.dmi'
+	icon_state = "blank"
+	w_class = WEIGHT_CLASS_GIGANTIC
 	flags_1 = CONDUCT_1
-	origin_tech = "programming=2;materials=2;engineering=2"
-
-/obj/item/mecha_parts/chassis
-	name="Mecha Chassis"
-	icon_state = "backbone"
-	var/datum/construction/construct
-
-/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
-	if(!construct || !construct.action(W, user))
-		return ..()
-
-/obj/item/mecha_parts/chassis/attack_hand()
-	return
-
-/////////// Ripley
-
-/obj/item/mecha_parts/chassis/ripley
-	name = "\improper Ripley chassis"
-
-/obj/item/mecha_parts/chassis/ripley/New()
-	..()
-	construct = new /datum/construction/mecha/ripley_chassis(src)
-
-/obj/item/mecha_parts/part/ripley_torso
-	name = "\improper Ripley torso"
-	desc = "A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
-	icon_state = "ripley_harness"
-	origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
-
-/obj/item/mecha_parts/part/ripley_left_arm
-	name = "\improper Ripley left arm"
-	desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
-	icon_state = "ripley_l_arm"
-
-/obj/item/mecha_parts/part/ripley_right_arm
-	name = "\improper Ripley right arm"
-	desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
-	icon_state = "ripley_r_arm"
-
-/obj/item/mecha_parts/part/ripley_left_leg
-	name = "\improper Ripley left leg"
-	desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
-	icon_state = "ripley_l_leg"
-
-/obj/item/mecha_parts/part/ripley_right_leg
-	name = "\improper Ripley right leg"
-	desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
-	icon_state = "ripley_r_leg"
-
-///////// Odysseus
-
-/obj/item/mecha_parts/chassis/odysseus
-	name = "\improper Odysseus chassis"
-
-/obj/item/mecha_parts/chassis/odysseus/New()
-	..()
-	construct = new /datum/construction/mecha/odysseus_chassis(src)
-
-/obj/item/mecha_parts/part/odysseus_head
-	name = "\improper Odysseus head"
-	desc = "An Odysseus head. Contains an integrated medical HUD scanner."
-	icon_state = "odysseus_head"
-
-/obj/item/mecha_parts/part/odysseus_torso
-	name = "\improper Odysseus torso"
-	desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
-	icon_state = "odysseus_torso"
-	origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
-
-/obj/item/mecha_parts/part/odysseus_left_arm
-	name = "\improper Odysseus left arm"
-	desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
-	icon_state = "odysseus_l_arm"
-
-/obj/item/mecha_parts/part/odysseus_right_arm
-	name = "\improper Odysseus right arm"
-	desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
-	icon_state = "odysseus_r_arm"
-
-/obj/item/mecha_parts/part/odysseus_left_leg
-	name = "\improper Odysseus left leg"
-	desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
-	icon_state = "odysseus_l_leg"
-
-/obj/item/mecha_parts/part/odysseus_right_leg
-	name = "\improper Odysseus right leg"
-	desc = "A Odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
-	icon_state = "odysseus_r_leg"
-
-///////// Gygax
-
-/obj/item/mecha_parts/chassis/gygax
-	name = "\improper Gygax chassis"
-
-/obj/item/mecha_parts/chassis/gygax/New()
-	..()
-	construct = new /datum/construction/mecha/gygax_chassis(src)
-
-/obj/item/mecha_parts/part/gygax_torso
-	name = "\improper Gygax torso"
-	desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
-	icon_state = "gygax_harness"
-	origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_head
-	name = "\improper Gygax head"
-	desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
-	icon_state = "gygax_head"
-	origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_left_arm
-	name = "\improper Gygax left arm"
-	desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
-	icon_state = "gygax_l_arm"
-	origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_right_arm
-	name = "\improper Gygax right arm"
-	desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
-	icon_state = "gygax_r_arm"
-	origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_left_leg
-	name = "\improper Gygax left leg"
-	desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
-	icon_state = "gygax_l_leg"
-	origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_right_leg
-	name = "\improper Gygax right leg"
-	desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
-	icon_state = "gygax_r_leg"
-	origin_tech = "programming=2;materials=4;engineering=3"
-
-/obj/item/mecha_parts/part/gygax_armor
-	gender = PLURAL
-	name = "\improper Gygax armor plates"
-	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
-	icon_state = "gygax_armor"
-	origin_tech = "materials=6;combat=4;engineering=4"
-
-
-//////////// Durand
-
-/obj/item/mecha_parts/chassis/durand
-	name = "\improper Durand chassis"
-
-/obj/item/mecha_parts/chassis/durand/New()
-	..()
-	construct = new /datum/construction/mecha/durand_chassis(src)
-
-/obj/item/mecha_parts/part/durand_torso
-	name = "\improper Durand torso"
-	desc = "A torso part of Durand. Contains power unit, processing core and life support systems within a robust protective frame."
-	icon_state = "durand_harness"
-	origin_tech = "programming=2;materials=3;biotech=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_head
-	name = "\improper Durand head"
-	desc = "A Durand head. Houses advanced surveillance and targeting sensors."
-	icon_state = "durand_head"
-	origin_tech = "programming=2;materials=3;magnets=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_left_arm
-	name = "\improper Durand left arm"
-	desc = "A Durand left arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
-	icon_state = "durand_l_arm"
-	origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_right_arm
-	name = "\improper Durand right arm"
-	desc = "A Durand right arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
-	icon_state = "durand_r_arm"
-	origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_left_leg
-	name = "\improper Durand left leg"
-	desc = "A Durand left leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
-	icon_state = "durand_l_leg"
-	origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_right_leg
-	name = "\improper Durand right leg"
-	desc = "A Durand right leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
-	icon_state = "durand_r_leg"
-	origin_tech = "programming=2;materials=3;engineering=3"
-
-/obj/item/mecha_parts/part/durand_armor
-	gender = PLURAL
-	name = "\improper Durand armor plates"
-	desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
-	icon_state = "durand_armor"
-	origin_tech = "materials=5;combat=4;engineering=4"
-
-////////// Firefighter
-
-/obj/item/mecha_parts/chassis/firefighter
-	name = "Firefighter chassis"
-
-/obj/item/mecha_parts/chassis/firefighter/New()
-	..()
-	construct = new /datum/construction/mecha/firefighter_chassis(src)
-
-
-////////// HONK
-
-/obj/item/mecha_parts/chassis/honker
-	name = "\improper H.O.N.K chassis"
-
-/obj/item/mecha_parts/chassis/honker/New()
-	..()
-	construct = new /datum/construction/mecha/honker_chassis(src)
-
-/obj/item/mecha_parts/part/honker_torso
-	name = "\improper H.O.N.K torso"
-	desc = "A torso part of H.O.N.K. Contains chuckle unit, bananium core and honk support systems."
-	icon_state = "honker_harness"
-
-/obj/item/mecha_parts/part/honker_head
-	name = "\improper H.O.N.K head"
-	desc = "A H.O.N.K head. Appears to lack a face plate."
-	icon_state = "honker_head"
-
-/obj/item/mecha_parts/part/honker_left_arm
-	name = "\improper H.O.N.K left arm"
-	desc = "A H.O.N.K left arm. With unique sockets that accept odd weaponry designed by clown scientists."
-	icon_state = "honker_l_arm"
-
-/obj/item/mecha_parts/part/honker_right_arm
-	name = "\improper H.O.N.K right arm"
-	desc = "A H.O.N.K right arm. With unique sockets that accept odd weaponry designed by clown scientists."
-	icon_state = "honker_r_arm"
-
-/obj/item/mecha_parts/part/honker_left_leg
-	name = "\improper H.O.N.K left leg"
-	desc = "A H.O.N.K left leg. The foot appears just large enough to fully accommodate a clown shoe."
-	icon_state = "honker_l_leg"
-
-/obj/item/mecha_parts/part/honker_right_leg
-	name = "\improper H.O.N.K right leg"
-	desc = "A H.O.N.K right leg. The foot appears just large enough to fully accommodate a clown shoe."
-	icon_state = "honker_r_leg"
-
-
-////////// Phazon
-
-/obj/item/mecha_parts/chassis/phazon
-	name = "\improper Phazon chassis"
-
-/obj/item/mecha_parts/chassis/phazon/New()
-	..()
-	construct = new /datum/construction/mecha/phazon_chassis(src)
-
-/obj/item/mecha_parts/part/phazon_torso
-	name="\improper Phazon torso"
-	desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle."
-	icon_state = "phazon_harness"
-	origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
-
-/obj/item/mecha_parts/part/phazon_head
-	name="\improper Phazon head"
-	desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing."
-	icon_state = "phazon_head"
-	origin_tech = "programming=3;materials=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_left_arm
-	name="\improper Phazon left arm"
-	desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
-	icon_state = "phazon_l_arm"
-	origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_right_arm
-	name="\improper Phazon right arm"
-	desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
-	icon_state = "phazon_r_arm"
-	origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_left_leg
-	name="\improper Phazon left leg"
-	desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
-	icon_state = "phazon_l_leg"
-	origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_right_leg
-	name="\improper Phazon right leg"
-	desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
-	icon_state = "phazon_r_leg"
-	origin_tech = "materials=3;bluespace=3;magnets=3"
-
-/obj/item/mecha_parts/part/phazon_armor
-	name="Phazon armor"
-	desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
-	icon_state = "phazon_armor"
-	origin_tech = "materials=4;bluespace=4;plasmatech=5"
-
-
-///////// Circuitboards
-
-/obj/item/circuitboard/mecha
-	name = "exosuit circuit board"
-	icon = 'icons/obj/module.dmi'
-	icon_state = "std_mod"
-	item_state = "electronic"
+	origin_tech = "programming=2;materials=2;engineering=2"
+
+/obj/item/mecha_parts/chassis
+	name="Mecha Chassis"
+	icon_state = "backbone"
+	var/datum/construction/construct
+
+/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
+	if(!construct || !construct.action(W, user))
+		return ..()
+
+/obj/item/mecha_parts/chassis/attack_hand()
+	return
+
+/////////// Ripley
+
+/obj/item/mecha_parts/chassis/ripley
+	name = "\improper Ripley chassis"
+
+/obj/item/mecha_parts/chassis/ripley/New()
+	..()
+	construct = new /datum/construction/mecha/ripley_chassis(src)
+
+/obj/item/mecha_parts/part/ripley_torso
+	name = "\improper Ripley torso"
+	desc = "A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
+	icon_state = "ripley_harness"
+	origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/ripley_left_arm
+	name = "\improper Ripley left arm"
+	desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
+	icon_state = "ripley_l_arm"
+
+/obj/item/mecha_parts/part/ripley_right_arm
+	name = "\improper Ripley right arm"
+	desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
+	icon_state = "ripley_r_arm"
+
+/obj/item/mecha_parts/part/ripley_left_leg
+	name = "\improper Ripley left leg"
+	desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
+	icon_state = "ripley_l_leg"
+
+/obj/item/mecha_parts/part/ripley_right_leg
+	name = "\improper Ripley right leg"
+	desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
+	icon_state = "ripley_r_leg"
+
+///////// Odysseus
+
+/obj/item/mecha_parts/chassis/odysseus
+	name = "\improper Odysseus chassis"
+
+/obj/item/mecha_parts/chassis/odysseus/New()
+	..()
+	construct = new /datum/construction/mecha/odysseus_chassis(src)
+
+/obj/item/mecha_parts/part/odysseus_head
+	name = "\improper Odysseus head"
+	desc = "An Odysseus head. Contains an integrated medical HUD scanner."
+	icon_state = "odysseus_head"
+
+/obj/item/mecha_parts/part/odysseus_torso
+	name = "\improper Odysseus torso"
+	desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper."
+	icon_state = "odysseus_torso"
+	origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/odysseus_left_arm
+	name = "\improper Odysseus left arm"
+	desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
+	icon_state = "odysseus_l_arm"
+
+/obj/item/mecha_parts/part/odysseus_right_arm
+	name = "\improper Odysseus right arm"
+	desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
+	icon_state = "odysseus_r_arm"
+
+/obj/item/mecha_parts/part/odysseus_left_leg
+	name = "\improper Odysseus left leg"
+	desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+	icon_state = "odysseus_l_leg"
+
+/obj/item/mecha_parts/part/odysseus_right_leg
+	name = "\improper Odysseus right leg"
+	desc = "An odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
+	icon_state = "odysseus_r_leg"
+
+///////// Gygax
+
+/obj/item/mecha_parts/chassis/gygax
+	name = "\improper Gygax chassis"
+
+/obj/item/mecha_parts/chassis/gygax/New()
+	..()
+	construct = new /datum/construction/mecha/gygax_chassis(src)
+
+/obj/item/mecha_parts/part/gygax_torso
+	name = "\improper Gygax torso"
+	desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
+	icon_state = "gygax_harness"
+	origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_head
+	name = "\improper Gygax head"
+	desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
+	icon_state = "gygax_head"
+	origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_left_arm
+	name = "\improper Gygax left arm"
+	desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "gygax_l_arm"
+	origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_right_arm
+	name = "\improper Gygax right arm"
+	desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
+	icon_state = "gygax_r_arm"
+	origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_left_leg
+	name = "\improper Gygax left leg"
+	desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "gygax_l_leg"
+	origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_right_leg
+	name = "\improper Gygax right leg"
+	desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
+	icon_state = "gygax_r_leg"
+	origin_tech = "programming=2;materials=4;engineering=3"
+
+/obj/item/mecha_parts/part/gygax_armor
+	gender = PLURAL
+	name = "\improper Gygax armor plates"
+	desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
+	icon_state = "gygax_armor"
+	origin_tech = "materials=6;combat=4;engineering=4"
+
+
+//////////// Durand
+
+/obj/item/mecha_parts/chassis/durand
+	name = "\improper Durand chassis"
+
+/obj/item/mecha_parts/chassis/durand/New()
+	..()
+	construct = new /datum/construction/mecha/durand_chassis(src)
+
+/obj/item/mecha_parts/part/durand_torso
+	name = "\improper Durand torso"
+	desc = "A torso part of Durand. Contains power unit, processing core and life support systems within a robust protective frame."
+	icon_state = "durand_harness"
+	origin_tech = "programming=2;materials=3;biotech=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_head
+	name = "\improper Durand head"
+	desc = "A Durand head. Houses advanced surveillance and targeting sensors."
+	icon_state = "durand_head"
+	origin_tech = "programming=2;materials=3;magnets=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_left_arm
+	name = "\improper Durand left arm"
+	desc = "A Durand left arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
+	icon_state = "durand_l_arm"
+	origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_right_arm
+	name = "\improper Durand right arm"
+	desc = "A Durand right arm. Data and power sockets are compatible with most exosuit tools and weapons. Packs a really mean punch as well."
+	icon_state = "durand_r_arm"
+	origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_left_leg
+	name = "\improper Durand left leg"
+	desc = "A Durand left leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
+	icon_state = "durand_l_leg"
+	origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_right_leg
+	name = "\improper Durand right leg"
+	desc = "A Durand right leg. Built particlarly sturdy to support the Durand's heavy weight and defensive needs."
+	icon_state = "durand_r_leg"
+	origin_tech = "programming=2;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/durand_armor
+	gender = PLURAL
+	name = "\improper Durand armor plates"
+	desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force."
+	icon_state = "durand_armor"
+	origin_tech = "materials=5;combat=4;engineering=4"
+
+////////// Firefighter
+
+/obj/item/mecha_parts/chassis/firefighter
+	name = "Firefighter chassis"
+
+/obj/item/mecha_parts/chassis/firefighter/New()
+	..()
+	construct = new /datum/construction/mecha/firefighter_chassis(src)
+
+
+////////// HONK
+
+/obj/item/mecha_parts/chassis/honker
+	name = "\improper H.O.N.K chassis"
+
+/obj/item/mecha_parts/chassis/honker/New()
+	..()
+	construct = new /datum/construction/mecha/honker_chassis(src)
+
+/obj/item/mecha_parts/part/honker_torso
+	name = "\improper H.O.N.K torso"
+	desc = "A torso part of H.O.N.K. Contains chuckle unit, bananium core and honk support systems."
+	icon_state = "honker_harness"
+
+/obj/item/mecha_parts/part/honker_head
+	name = "\improper H.O.N.K head"
+	desc = "A H.O.N.K head. Appears to lack a face plate."
+	icon_state = "honker_head"
+
+/obj/item/mecha_parts/part/honker_left_arm
+	name = "\improper H.O.N.K left arm"
+	desc = "A H.O.N.K left arm. With unique sockets that accept odd weaponry designed by clown scientists."
+	icon_state = "honker_l_arm"
+
+/obj/item/mecha_parts/part/honker_right_arm
+	name = "\improper H.O.N.K right arm"
+	desc = "A H.O.N.K right arm. With unique sockets that accept odd weaponry designed by clown scientists."
+	icon_state = "honker_r_arm"
+
+/obj/item/mecha_parts/part/honker_left_leg
+	name = "\improper H.O.N.K left leg"
+	desc = "A H.O.N.K left leg. The foot appears just large enough to fully accommodate a clown shoe."
+	icon_state = "honker_l_leg"
+
+/obj/item/mecha_parts/part/honker_right_leg
+	name = "\improper H.O.N.K right leg"
+	desc = "A H.O.N.K right leg. The foot appears just large enough to fully accommodate a clown shoe."
+	icon_state = "honker_r_leg"
+
+
+////////// Phazon
+
+/obj/item/mecha_parts/chassis/phazon
+	name = "\improper Phazon chassis"
+
+/obj/item/mecha_parts/chassis/phazon/New()
+	..()
+	construct = new /datum/construction/mecha/phazon_chassis(src)
+
+/obj/item/mecha_parts/part/phazon_torso
+	name="\improper Phazon torso"
+	desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle."
+	icon_state = "phazon_harness"
+	origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
+
+/obj/item/mecha_parts/part/phazon_head
+	name="\improper Phazon head"
+	desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing."
+	icon_state = "phazon_head"
+	origin_tech = "programming=3;materials=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_left_arm
+	name="\improper Phazon left arm"
+	desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
+	icon_state = "phazon_l_arm"
+	origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_right_arm
+	name="\improper Phazon right arm"
+	desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand."
+	icon_state = "phazon_r_arm"
+	origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_left_leg
+	name="\improper Phazon left leg"
+	desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
+	icon_state = "phazon_l_leg"
+	origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_right_leg
+	name="\improper Phazon right leg"
+	desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged."
+	icon_state = "phazon_r_leg"
+	origin_tech = "materials=3;bluespace=3;magnets=3"
+
+/obj/item/mecha_parts/part/phazon_armor
+	name="Phazon armor"
+	desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
+	icon_state = "phazon_armor"
+	origin_tech = "materials=4;bluespace=4;plasmatech=5"
+
+
+///////// Circuitboards
+
+/obj/item/circuitboard/mecha
+	name = "exosuit circuit board"
+	icon = 'icons/obj/module.dmi'
+	icon_state = "std_mod"
+	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	flags_1 = CONDUCT_1
-	force = 5
-	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 0
-	throw_speed = 3
-	throw_range = 7
-
-/obj/item/circuitboard/mecha/ripley
-	origin_tech = "programming=2"
-
-/obj/item/circuitboard/mecha/ripley/peripherals
-	name = "Ripley Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/ripley/main
-	name = "Ripley Central Control module (Exosuit Board)"
-	icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/gygax
-	origin_tech = "programming=4;combat=3;engineering=3"
-
-/obj/item/circuitboard/mecha/gygax/peripherals
-	name = "Gygax Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/gygax/targeting
-	name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
-	icon_state = "mcontroller"
-	origin_tech = "programming=4;combat=4"
-
-/obj/item/circuitboard/mecha/gygax/main
-	name = "Gygax Central Control module (Exosuit Board)"
-	icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/durand
-	origin_tech = "programming=4;combat=3;engineering=3"
-
-/obj/item/circuitboard/mecha/durand/peripherals
-	name = "Durand Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/durand/targeting
-	name = "Durand Weapon Control and Targeting module (Exosuit Board)"
-	icon_state = "mcontroller"
-	origin_tech = "programming=4;combat=4;engineering=3"
-
-/obj/item/circuitboard/mecha/durand/main
-	name = "Durand Central Control module (Exosuit Board)"
-	icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/honker
-	origin_tech = "programming=3;engineering=3"
-
-/obj/item/circuitboard/mecha/honker/peripherals
-	name = "H.O.N.K Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/honker/targeting
-	name = "H.O.N.K Weapon Control and Targeting module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/honker/main
-	name = "H.O.N.K Central Control module (Exosuit Board)"
-	icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/odysseus
-	origin_tech = "programming=3;biotech=3"
-
-/obj/item/circuitboard/mecha/odysseus/peripherals
-	name = "Odysseus Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/odysseus/main
-	name = "Odysseus Central Control module (Exosuit Board)"
-	icon_state = "mainboard"
-
-/obj/item/circuitboard/mecha/phazon
-	origin_tech = "programming=5;plasmatech=4"
-
-/obj/item/circuitboard/mecha/phazon/peripherals
-	name = "Phazon Peripherals Control module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/phazon/targeting
-	name = "Phazon Weapon Control and Targeting module (Exosuit Board)"
-	icon_state = "mcontroller"
-
-/obj/item/circuitboard/mecha/phazon/main
-	name = "Phazon Central Control module (Exosuit Board)"
+	force = 5
+	w_class = WEIGHT_CLASS_SMALL
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 7
+
+/obj/item/circuitboard/mecha/ripley
+	origin_tech = "programming=2"
+
+/obj/item/circuitboard/mecha/ripley/peripherals
+	name = "Ripley Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/ripley/main
+	name = "Ripley Central Control module (Exosuit Board)"
+	icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/gygax
+	origin_tech = "programming=4;combat=3;engineering=3"
+
+/obj/item/circuitboard/mecha/gygax/peripherals
+	name = "Gygax Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/gygax/targeting
+	name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
+	icon_state = "mcontroller"
+	origin_tech = "programming=4;combat=4"
+
+/obj/item/circuitboard/mecha/gygax/main
+	name = "Gygax Central Control module (Exosuit Board)"
+	icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/durand
+	origin_tech = "programming=4;combat=3;engineering=3"
+
+/obj/item/circuitboard/mecha/durand/peripherals
+	name = "Durand Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/durand/targeting
+	name = "Durand Weapon Control and Targeting module (Exosuit Board)"
+	icon_state = "mcontroller"
+	origin_tech = "programming=4;combat=4;engineering=3"
+
+/obj/item/circuitboard/mecha/durand/main
+	name = "Durand Central Control module (Exosuit Board)"
+	icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/honker
+	origin_tech = "programming=3;engineering=3"
+
+/obj/item/circuitboard/mecha/honker/peripherals
+	name = "H.O.N.K Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/honker/targeting
+	name = "H.O.N.K Weapon Control and Targeting module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/honker/main
+	name = "H.O.N.K Central Control module (Exosuit Board)"
+	icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/odysseus
+	origin_tech = "programming=3;biotech=3"
+
+/obj/item/circuitboard/mecha/odysseus/peripherals
+	name = "Odysseus Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/odysseus/main
+	name = "Odysseus Central Control module (Exosuit Board)"
+	icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/phazon
+	origin_tech = "programming=5;plasmatech=4"
+
+/obj/item/circuitboard/mecha/phazon/peripherals
+	name = "Phazon Peripherals Control module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/phazon/targeting
+	name = "Phazon Weapon Control and Targeting module (Exosuit Board)"
+	icon_state = "mcontroller"
+
+/obj/item/circuitboard/mecha/phazon/main
+	name = "Phazon Central Control module (Exosuit Board)"

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -283,13 +283,13 @@
 		var/area/A = get_area(location)
 
 		var/where = "[A.name] | [location.x], [location.y]"
-		var/whereLink = "<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
+		var/whereLink = "<A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
 
 		if(carry.my_atom.fingerprintslast)
 			var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
 			var/more = ""
 			if(M)
-				more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) "
+				more = "(<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</A>) "
 			message_admins("Smoke: ([whereLink])[contained]. Key: [carry.my_atom.fingerprintslast][more].", 0, 1)
 			log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
 		else

code/game/objects/effects/landmarks.dm

@@ -160,7 +160,7 @@
 /obj/effect/landmark/start/wizard/Initialize(mapload)
 	..()
 	GLOB.wizardstart += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/start/new_player
 	name = "New Player"
@@ -173,7 +173,7 @@
 
 /obj/effect/landmark/start/new_player/Initialize(mapload)
 	..()
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 
 
@@ -183,7 +183,7 @@
 /obj/effect/landmark/latejoin/Initialize(mapload)
 	..()
 	SSjob.latejoin_trackers += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 // carp.
 /obj/effect/landmark/carpspawn
@@ -229,7 +229,7 @@
 /obj/effect/landmark/xeno_spawn/Initialize(mapload)
 	..()
 	GLOB.xeno_spawn += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 // blobs.
 /obj/effect/landmark/blobstart
@@ -238,7 +238,7 @@
 /obj/effect/landmark/blobstart/Initialize(mapload)
 	..()
 	GLOB.blobstart += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/secequipment
 	name = "secequipment"
@@ -246,7 +246,7 @@
 /obj/effect/landmark/secequipment/Initialize(mapload)
 	..()
 	GLOB.secequipment += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/prisonwarp
 	name = "prisonwarp"
@@ -254,15 +254,15 @@
 /obj/effect/landmark/prisonwarp/Initialize(mapload)
 	..()
 	GLOB.prisonwarp += loc
-	qdel(src)
-
+	return INITIALIZE_HINT_QDEL
+	
 /obj/effect/landmark/ert_spawn
 	name = "Emergencyresponseteam"
 
 /obj/effect/landmark/ert_spawn/Initialize(mapload)
 	..()
 	GLOB.emergencyresponseteamspawn += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/holding_facility
 	name = "Holding Facility"
@@ -270,7 +270,7 @@
 /obj/effect/landmark/holding_facility/Initialize(mapload)
 	..()
 	GLOB.holdingfacility += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/observe
 	name = "tdomeobserve"
@@ -278,7 +278,7 @@
 /obj/effect/landmark/thunderdome/observe/Initialize(mapload)
 	..()
 	GLOB.tdomeobserve += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/one
 	name = "tdome1"
@@ -286,7 +286,7 @@
 /obj/effect/landmark/thunderdome/one/Initialize(mapload)
 	..()
 	GLOB.tdome1	+= loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/two
 	name = "tdome2"
@@ -294,7 +294,7 @@
 /obj/effect/landmark/thunderdome/two/Initialize(mapload)
 	..()
 	GLOB.tdome2 += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/admin
 	name = "tdomeadmin"
@@ -302,7 +302,7 @@
 /obj/effect/landmark/thunderdome/admin/Initialize(mapload)
 	..()
 	GLOB.tdomeadmin += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 //generic event spawns
 /obj/effect/landmark/event_spawn
@@ -330,4 +330,4 @@
 /obj/effect/landmark/ruin/Destroy()
 	GLOB.ruin_landmarks -= src
 	ruin_template = null
-	. = ..()
+	. = ..()

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

@@ -12,7 +12,7 @@
 		var/turf/T = get_turf(src)
 		for(var/path in items)
 			new path(T)
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/bundle/costume/chicken
 	name = "chicken costume spawner"

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

@@ -18,7 +18,7 @@
 			if(lootspawn)
 				new lootspawn(T)
 			lootcount--
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/lootdrop/armory_contraband
 	name = "armory contraband gun spawner"
@@ -89,7 +89,7 @@
 
 /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload)
 	loot = GLOB.maintenance_loot
-	..()
+	. = ..()
 
 /obj/effect/spawner/lootdrop/crate_spawner
 	name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF!
@@ -130,7 +130,7 @@
 	loot = list()
 	for(var/path in subtypesof(/obj/effect/spawner/bundle/costume))
 		loot[path] = TRUE
-	..()
+	. = ..()
 
 // Minor lootdrops follow
 
@@ -162,4 +162,4 @@
 	name = "25% cyborg mask spawner"
 	loot = list(
 		/obj/item/clothing/mask/gas/cyborg = 25,
-		"" = 75)
+		"" = 75)

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

@@ -9,7 +9,7 @@ again.
 	var/list/spawn_list
 
 /obj/effect/spawner/structure/Initialize()
-	..()
+	. = ..()
 	if(spawn_list && spawn_list.len)
 		for(var/I in spawn_list)
 			new I(get_turf(src))
@@ -22,145 +22,130 @@ again.
 	icon = 'icons/obj/structures_spawners.dmi'
 	icon_state = "window_spawner"
 	name = "window spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/fulltile)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile)
+	dir = SOUTH
 
 /obj/effect/spawner/structure/window/hollow
 	name = "hollow window spawner"
 	icon_state = "hwindow_spawner_full"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/corner
-	icon_state = "hwindow_spawner_corner_se"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/corner/northeast
-	icon_state = "hwindow_spawner_corner_ne"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/corner/northwest
-	icon_state = "hwindow_spawner_corner_nw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/corner/southwest
-	icon_state = "hwindow_spawner_corner_sw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
 
 /obj/effect/spawner/structure/window/hollow/end
-	icon_state = "hwindow_spawner_end_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+	icon_state = "hwindow_spawner_end"
 
-/obj/effect/spawner/structure/window/hollow/end/north
-	icon_state = "hwindow_spawner_end_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/end/east
-	icon_state = "hwindow_spawner_end_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/end/west
-	icon_state = "hwindow_spawner_end_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/end/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+	. = ..()
 
 /obj/effect/spawner/structure/window/hollow/middle
-	icon_state = "hwindow_spawner_ns"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north)
+	icon_state = "hwindow_spawner_middle"
 
-/obj/effect/spawner/structure/window/hollow/middle/vertical
-	icon_state = "hwindow_spawner_ew"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/middle/Initialize()
+	switch(dir)
+		if(NORTH,SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north)
+		if(EAST,WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west)
+	. = ..()
 
-/obj/effect/spawner/structure/window/hollow/one_side
-	icon_state = "hwindow_spawner_single_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window)
-
-/obj/effect/spawner/structure/window/hollow/one_side/north
-	icon_state = "hwindow_spawner_single_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/one_side/east
-	icon_state = "hwindow_spawner_single_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/one_side/west
-	icon_state = "hwindow_spawner_single_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/spawner/west)
+/obj/effect/spawner/structure/window/hollow/directional
+	icon_state = "hwindow_spawner_directional"
 
+/obj/effect/spawner/structure/window/hollow/directional/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north)
+		if(NORTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east)
+		if(SOUTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window)
+		if(SOUTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west)
+		if(NORTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west)
+	. = ..()
 
 //reinforced
 
 /obj/effect/spawner/structure/window/reinforced
 	name = "reinforced window spawner"
 	icon_state = "rwindow_spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile)
 
 /obj/effect/spawner/structure/window/hollow/reinforced
 	name = "hollow reinforced window spawner"
 	icon_state = "hrwindow_spawner_full"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner
-	icon_state = "hrwindow_spawner_corner_se"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/northeast
-	icon_state = "hrwindow_spawner_corner_ne"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/northwest
-	icon_state = "hrwindow_spawner_corner_nw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/corner/southwest
-	icon_state = "hrwindow_spawner_corner_sw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
 
 /obj/effect/spawner/structure/window/hollow/reinforced/end
-	icon_state = "hrwindow_spawner_end_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+	icon_state = "hrwindow_spawner_end"
 
-/obj/effect/spawner/structure/window/hollow/reinforced/end/north
-	icon_state = "hrwindow_spawner_end_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/end/east
-	icon_state = "hrwindow_spawner_end_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/end/west
-	icon_state = "hrwindow_spawner_end_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+	. = ..()
 
 /obj/effect/spawner/structure/window/hollow/reinforced/middle
-	icon_state = "hrwindow_spawner_ns"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north)
+	icon_state = "hrwindow_spawner_middle"
 
-/obj/effect/spawner/structure/window/hollow/reinforced/middle/vertical
-	icon_state = "hrwindow_spawner_ew"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize()
+	switch(dir)
+		if(NORTH,SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north)
+		if(EAST,WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west)
+	. = ..()
 
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side
-	icon_state = "hrwindow_spawner_single_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/north
-	icon_state = "hrwindow_spawner_single_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/east
-	icon_state = "hrwindow_spawner_single_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/reinforced/one_side/west
-	icon_state = "hrwindow_spawner_single_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/reinforced/directional
+	icon_state = "hrwindow_spawner_directional"
 
+/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north)
+		if(NORTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east)
+		if(SOUTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced)
+		if(SOUTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west)
+		if(NORTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west)
+	. = ..()
 
 //tinted
 
 /obj/effect/spawner/structure/window/reinforced/tinted
 	name = "tinted reinforced window spawner"
 	icon_state = "twindow_spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile)
 
 
 //shuttle window
@@ -168,7 +153,7 @@ again.
 /obj/effect/spawner/structure/window/shuttle
 	name = "reinforced tinted window spawner"
 	icon_state = "swindow_spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/shuttle)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle)
 
 
 //plasma windows
@@ -176,134 +161,119 @@ again.
 /obj/effect/spawner/structure/window/plasma
 	name = "plasma window spawner"
 	icon_state = "pwindow_spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/fulltile)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/fulltile)
 
 /obj/effect/spawner/structure/window/hollow/plasma
 	name = "hollow plasma window spawner"
 	icon_state = "phwindow_spawner_full"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner
-	icon_state = "phwindow_spawner_corner_se"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/northeast
-	icon_state = "phwindow_spawner_corner_ne"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/northwest
-	icon_state = "phwindow_spawner_corner_nw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/corner/southwest
-	icon_state = "phwindow_spawner_corner_sw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
 
 /obj/effect/spawner/structure/window/hollow/plasma/end
-	icon_state = "phwindow_spawner_end_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+	icon_state = "phwindow_spawner_end"
 
-/obj/effect/spawner/structure/window/hollow/plasma/end/north
-	icon_state = "phwindow_spawner_end_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/end/east
-	icon_state = "phwindow_spawner_end_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/end/west
-	icon_state = "phwindow_spawner_end_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+	. = ..()
 
 /obj/effect/spawner/structure/window/hollow/plasma/middle
-	icon_state = "phwindow_spawner_ns"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north)
+	icon_state = "phwindow_spawner_middle"
 
-/obj/effect/spawner/structure/window/hollow/plasma/middle/vertical
-	icon_state = "phwindow_spawner_ew"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize()
+	switch(dir)
+		if(NORTH,SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north)
+		if(EAST,WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west)
+	. = ..()
 
-/obj/effect/spawner/structure/window/hollow/plasma/one_side
-	icon_state = "phwindow_spawner_single_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/north
-	icon_state = "phwindow_spawner_single_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/east
-	icon_state = "phwindow_spawner_single_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/one_side/west
-	icon_state = "phwindow_spawner_single_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/directional
+	icon_state = "phwindow_spawner_directional"
 
+/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north)
+		if(NORTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east)
+		if(SOUTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma)
+		if(SOUTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west)
+		if(NORTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west)
+	. = ..()
 
 //plasma reinforced
 
 /obj/effect/spawner/structure/window/plasma/reinforced
 	name = "reinforced plasma window spawner"
 	icon_state = "prwindow_spawner"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile)
 
 /obj/effect/spawner/structure/window/hollow/plasma/reinforced
-	name = "hollow reinforced plasma window spawner"
+	name = "hollow plasma window spawner"
 	icon_state = "phrwindow_spawner_full"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner
-	icon_state = "phrwindow_spawner_corner_se"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northeast
-	icon_state = "phrwindow_spawner_corner_ne"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/northwest
-	icon_state = "phrwindow_spawner_corner_nw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/corner/southwest
-	icon_state = "phrwindow_spawner_corner_sw"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west)
+	spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
 
 /obj/effect/spawner/structure/window/hollow/plasma/reinforced/end
-	icon_state = "phrwindow_spawner_end_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+	icon_state = "phrwindow_spawner_end"
 
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/north
-	icon_state = "phrwindow_spawner_end_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/east
-	icon_state = "phrwindow_spawner_end_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/west
-	icon_state = "phrwindow_spawner_end_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+	. = ..()
 
 /obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle
-	icon_state = "phrwindow_spawner_ns"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
+	icon_state = "phrwindow_spawner_middle"
 
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/vertical
-	icon_state = "phrwindow_spawner_ew"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize()
+	switch(dir)
+		if(NORTH,SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north)
+		if(EAST,WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west)
+	. = ..()
 
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side
-	icon_state = "phrwindow_spawner_single_s"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional
+	icon_state = "phrwindow_spawner_directional"
 
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/north
-	icon_state = "phrwindow_spawner_single_n"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/east
-	icon_state = "phrwindow_spawner_single_e"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east)
-
-/obj/effect/spawner/structure/window/hollow/plasma/reinforced/one_side/west
-	icon_state = "phrwindow_spawner_single_w"
-	spawn_list = 	list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west)
+/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize()
+	switch(dir)
+		if(NORTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north)
+		if(NORTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east)
+		if(EAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/east)
+		if(SOUTHEAST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/east)
+		if(SOUTH)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced)
+		if(SOUTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/west)
+		if(WEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/west)
+		if(NORTHWEST)
+			spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/west)
+	. = ..()

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

@@ -17,4 +17,4 @@
 	log_game("An alien egg has been delivered to [A] at [COORD(T)]")
 	var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
 	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time))
-	qdel(src)
+	return INITIALIZE_HINT_QDEL

code/game/objects/effects/spiders.dm

@@ -91,6 +91,10 @@
 	var/poison_per_bite = 5
 	var/list/faction = list("spiders")
 
+/obj/structure/spider/spiderling/Destroy()
+	new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src))
+	. = ..()
+
 /obj/structure/spider/spiderling/Initialize()
 	pixel_x = rand(6,-6)
 	pixel_y = rand(6,-6)
@@ -103,6 +107,15 @@
 /obj/structure/spider/spiderling/nurse
 	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse
 
+/obj/structure/spider/spiderling/midwife
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife
+
+/obj/structure/spider/spiderling/viper
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
+
+/obj/structure/spider/spiderling/tarantula
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/tarantula
+
 /obj/structure/spider/spiderling/Collide(atom/user)
 	if(istype(user, /obj/structure/table))
 		src.loc = user.loc
@@ -171,7 +184,10 @@
 		amount_grown += rand(0,2)
 		if(amount_grown >= 100)
 			if(!grow_as)
-				grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse)
+				if(prob(3))
+					grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula, /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife)
+				else
+					grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse)
 			var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc)
 			S.poison_per_bite = poison_per_bite
 			S.poison_type = poison_type
@@ -194,12 +210,12 @@
 	. = ..()
 
 /obj/structure/spider/cocoon/container_resist(mob/living/user)
-	var/breakout_time = 1
+	var/breakout_time = 600
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
-	to_chat(user, "<span class='notice'>You struggle against the tight bonds... (This will take about [breakout_time] minutes.)</span>")
+	to_chat(user, "<span class='notice'>You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)</span>")
 	visible_message("You see something struggling and writhing in \the [src]!")
-	if(do_after(user,(breakout_time*60*10), target = src))
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src)
 			return
 		qdel(src)

code/game/objects/items.dm

@@ -61,6 +61,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/equip_delay_other = 20 //In deciseconds, how long an item takes to put on another person
 	var/strip_delay = 40 //In deciseconds, how long an item takes to remove from another person
 	var/breakouttime = 0
+	var/being_removed = FALSE
 	var/list/materials
 	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
 	var/needs_permit = 0			//Used by security bots to determine if this item is safe for public use.
@@ -218,9 +219,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/proc/speechModification(message)		//For speech modification by mask slot items.
 	return message
 
-/obj/item/attack_self(mob/user)
-	interact(user)
-
 /obj/item/interact(mob/user)
 	add_fingerprint(user)
 	if(hidden_uplink && hidden_uplink.active)

code/game/objects/items/RCD.dm

@@ -31,7 +31,7 @@ obj/item/construction
 	var/no_ammo_message = "<span class='warning'>The \'Low Ammo\' light on the device blinks yellow.</span>"
 
 /obj/item/construction/Initialize()
-	..()
+	. = ..()
 	desc = "A [src]. It currently holds [matter]/[max_matter] matter-units."
 	spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(5, 0, src)
@@ -144,7 +144,7 @@ obj/item/construction
 	set category = "Object"
 	set src in usr // What does this do?
 
-	var window_type_name
+	var/window_type_name
 
 	if (window_type == /obj/structure/window/fulltile)
 		window_type = /obj/structure/window/reinforced/fulltile
@@ -240,11 +240,11 @@ obj/item/construction
 	set category = "Object"
 	set src in usr
 
-	var airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass")
+	var/airlockcat = input(usr, "Select whether the airlock is solid or glass.") in list("Solid", "Glass")
 	switch(airlockcat)
 		if("Solid")
 			if(advanced_airlock_setting == 1)
-				var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security")
+				var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security")
 				switch(airlockpaint)
 					if("Default")
 						airlock_type = /obj/machinery/door/airlock
@@ -275,7 +275,7 @@ obj/item/construction
 
 		if("Glass")
 			if(advanced_airlock_setting == 1)
-				var airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining")
+				var/airlockpaint = input(usr, "Select the paintjob of the airlock.") in list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining")
 				switch(airlockpaint)
 					if("Default")
 						airlock_type = /obj/machinery/door/airlock/glass

code/game/objects/items/RPD.dm

@@ -79,13 +79,14 @@ GLOBAL_LIST_INIT(disposalpipeID2State, list(
 
 //find these defines in code\game\machinery\pipe\consruction.dm
 GLOBAL_LIST_INIT(RPD_recipes, list(
-	"Regular Pipes" = list(
+	"Pipes" = list(
 		"Pipe"           = new /datum/pipe_info(PIPE_SIMPLE,			1, PIPE_BENDABLE),
 		//"Bent Pipe"      = new /datum/pipe_info(PIPE_SIMPLE,	 		5, PIPE_BENT),
 		"Manifold"       = new /datum/pipe_info(PIPE_MANIFOLD, 			1, PIPE_TRINARY),
 		"Manual Valve"   = new /datum/pipe_info(PIPE_MVALVE, 			1, PIPE_BINARY),
 		"Digital Valve"  = new /datum/pipe_info(PIPE_DVALVE,			1, PIPE_BINARY),
 		"4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD,		1, PIPE_QUAD),
+		"Bluespace Pipe" = new /datum/pipe_info(PIPE_BLUESPACE,			1, PIPE_UNARY),
 	),
 	"Devices"=list(
 		"Connector"      = new /datum/pipe_info(PIPE_CONNECTOR,			1, PIPE_UNARY),

code/game/objects/items/cards_ids.dm

@@ -160,7 +160,7 @@ update_label("John Doe", "Clowny")
 	var/anyone = FALSE //Can anyone forge the ID or just syndicate?
 
 /obj/item/card/id/syndicate/Initialize()
-	..()
+	. = ..()
 	var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
 	chameleon_action.chameleon_type = /obj/item/card/id
 	chameleon_action.chameleon_name = "ID Card"
@@ -180,14 +180,14 @@ update_label("John Doe", "Clowny")
 	if(isliving(user) && user.mind)
 		if(user.mind.special_role || anyone)
 			if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge")
-				var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26)
+				var/t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null),1,26)
 				if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/dead/new_player/prefrences.dm
 					if (t)
 						alert("Invalid name.")
 					return
 				registered_name = t
 
-				var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN)
+				var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")as text | null),1,MAX_MESSAGE_LEN)
 				if(!u)
 					registered_name = ""
 					return
@@ -220,7 +220,7 @@ update_label("John Doe", "Clowny")
 /obj/item/card/id/captains_spare/Initialize()
 	var/datum/job/captain/J = new/datum/job/captain
 	access = J.get_access()
-	..()
+	. = ..()
 
 /obj/item/card/id/centcom
 	name = "\improper CentCom ID"
@@ -231,7 +231,7 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/centcom/Initialize()
 	access = get_all_centcom_access()
-	..()
+	. = ..()
 
 /obj/item/card/id/ert
 	name = "\improper CentCom ID"
@@ -242,7 +242,7 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/ert/Initialize()
 	access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS
-	..()
+	. = ..()
 
 /obj/item/card/id/ert/Security
 	registered_name = "Security Response Officer"
@@ -250,7 +250,7 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/ert/Security/Initialize()
 	access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS
-	..()
+	. = ..()
 
 /obj/item/card/id/ert/Engineer
 	registered_name = "Engineer Response Officer"
@@ -258,7 +258,7 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/ert/Engineer/Initialize()
 	access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS
-	..()
+	. = ..()
 
 /obj/item/card/id/ert/Medical
 	registered_name = "Medical Response Officer"
@@ -266,7 +266,7 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/ert/Medical/Initialize()
 	access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS
-	..()
+	. = ..()
 
 /obj/item/card/id/prisoner
 	name = "prisoner ID card"

code/game/objects/items/charter.dm

@@ -59,7 +59,7 @@
 	to_chat(user, "Your name has been sent to your employers for approval.")
 	// Autoapproves after a certain time
 	response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
-	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;reject_custom_name=\ref[src]'>REJECT</A>) [ADMIN_CENTCOM_REPLY(user)]</span>")
+	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;[HrefToken(TRUE)];reject_custom_name=\ref[src]'>REJECT</A>) [ADMIN_CENTCOM_REPLY(user)]</span>")
 
 /obj/item/station_charter/proc/reject_proposed(user)
 	if(!user)

code/game/objects/items/clown_items.dm

@@ -107,39 +107,26 @@
 	throw_speed = 3
 	throw_range = 7
 	attack_verb = list("HONKED")
-	var/next_usable = 0
-	var/honksound = 'sound/items/bikehorn.ogg'
-	var/cooldowntime = 20
+
+/obj/item/bikehorn/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
 
 /obj/item/bikehorn/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] solemnly points the horn at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	playsound(src.loc, honksound, 50, 1)
+	playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
 	return (BRUTELOSS)
 
-/obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
-	if(!(next_usable > world.time))
-		playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg!
-	return ..()
-
-/obj/item/bikehorn/attack_self(mob/user)
-	if(!(next_usable > world.time))
-		next_usable = world.time + cooldowntime
-		playsound(src.loc, honksound, 50, 1)
-		src.add_fingerprint(user)
-
-/obj/item/bikehorn/Crossed(mob/living/L)
-	if(isliving(L))
-		playsound(loc, honksound, 50, 1, -1)
-	..()
-
 /obj/item/bikehorn/airhorn
 	name = "air horn"
 	desc = "Damn son, where'd you find this?"
 	icon_state = "air_horn"
-	honksound = 'sound/items/airhorn2.ogg'
-	cooldowntime = 50
 	origin_tech = "materials=4;engineering=4"
 
+/obj/item/bikehorn/airhorn/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('sound/items/airhorn2.ogg'=1), 50)
+
 /obj/item/bikehorn/golden
 	name = "golden bike horn"
 	desc = "Golden? Clearly, it's made with bananium! Honk!"
@@ -155,14 +142,13 @@
 	..()
 
 /obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user)
-	if(!(next_usable > world.time))
-		var/turf/T = get_turf(src)
-		for(M in ohearers(7, T))
-			if(ishuman(M) && M.can_hear())
-				var/mob/living/carbon/human/H = M
-				if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
-					continue
-			M.emote("flip")
+	var/turf/T = get_turf(src)
+	for(M in ohearers(7, T))
+		if(ishuman(M) && M.can_hear())
+			var/mob/living/carbon/human/H = M
+			if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
+				continue
+		M.emote("flip")
 
 /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter
 	name = "Canned Laughter"

code/game/objects/items/cosmetics.dm

@@ -1,186 +1,189 @@
-/obj/item/lipstick
-	gender = PLURAL
-	name = "red lipstick"
-	desc = "A generic brand of lipstick."
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "lipstick"
-	w_class = WEIGHT_CLASS_TINY
-	var/colour = "red"
-	var/open = FALSE
-
-
-/obj/item/lipstick/purple
-	name = "purple lipstick"
-	colour = "purple"
-
-/obj/item/lipstick/jade
-	//It's still called Jade, but theres no HTML color for jade, so we use lime.
-	name = "jade lipstick"
-	colour = "lime"
-
-/obj/item/lipstick/black
-	name = "black lipstick"
-	colour = "black"
-
-
-/obj/item/lipstick/random
-	name = "lipstick"
-
-/obj/item/lipstick/random/New()
-	..()
-	colour = pick("red","purple","lime","black","green","blue","white")
-	name = "[colour] lipstick"
-
-
-
-/obj/item/lipstick/attack_self(mob/user)
-	cut_overlays()
-	to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
-	open = !open
-	if(open)
-		var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color")
-		colored_overlay.color = colour
-		icon_state = "lipstick_uncap"
-		add_overlay(colored_overlay)
-	else
-		icon_state = "lipstick"
-
-/obj/item/lipstick/attack(mob/M, mob/user)
-	if(!open)
-		return
-
-	if(!ismob(M))
-		return
-
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.is_mouth_covered())
-			to_chat(user, "<span class='warning'>Remove [ H == user ? "your" : "their" ] mask!</span>")
-			return
-		if(H.lip_style)	//if they already have lipstick on
-			to_chat(user, "<span class='warning'>You need to wipe off the old lipstick first!</span>")
-			return
-		if(H == user)
-			user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
-								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
-			H.lip_style = "lipstick"
-			H.lip_color = colour
-			H.update_body()
-		else
-			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
-								 "<span class='notice'>You begin to apply \the [src] on [H]'s lips...</span>")
-			if(do_after(user, 20, target = H))
-				user.visible_message("[user] does [H]'s lips with \the [src].", \
-									 "<span class='notice'>You apply \the [src] on [H]'s lips.</span>")
-				H.lip_style = "lipstick"
-				H.lip_color = colour
-				H.update_body()
-	else
-		to_chat(user, "<span class='warning'>Where are the lips on that?</span>")
-
-//you can wipe off lipstick with paper!
-/obj/item/paper/attack(mob/M, mob/user)
-	if(user.zone_selected == "mouth")
-		if(!ismob(M))
-			return
-
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H == user)
-				to_chat(user, "<span class='notice'>You wipe off the lipstick with [src].</span>")
-				H.lip_style = null
-				H.update_body()
-			else
-				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
-								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick...</span>")
-				if(do_after(user, 10, target = H))
-					user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
-										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
-					H.lip_style = null
-					H.update_body()
-	else
-		..()
-
-
-/obj/item/razor
-	name = "electric razor"
-	desc = "The latest and greatest power razor born from the science of shaving."
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "razor"
-	flags_1 = CONDUCT_1
-	w_class = WEIGHT_CLASS_TINY
-
-
-/obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth")
-	if(location == "mouth")
-		H.facial_hair_style = "Shaved"
-	else
-		H.hair_style = "Skinhead"
-
-	H.update_hair()
-	playsound(loc, 'sound/items/welder2.ogg', 20, 1)
-
-
-/obj/item/razor/attack(mob/M, mob/user)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		var/location = user.zone_selected
-		if(location == "mouth")
-			if(!(FACEHAIR in H.dna.species.species_traits))
-				to_chat(user, "<span class='warning'>There is no facial hair to shave!</span>")
-				return
-			if(!get_location_accessible(H, location))
-				to_chat(user, "<span class='warning'>The mask is in the way!</span>")
-				return
-			if(H.facial_hair_style == "Shaved")
-				to_chat(user, "<span class='warning'>Already clean-shaven!</span>")
-				return
-
-			if(H == user) //shaving yourself
-				user.visible_message("[user] starts to shave their facial hair with [src].", \
-									 "<span class='notice'>You take a moment to shave your facial hair with [src]...</span>")
-				if(do_after(user, 50, target = H))
-					user.visible_message("[user] shaves his facial hair clean with [src].", \
-										 "<span class='notice'>You finish shaving with [src]. Fast and clean!</span>")
-					shave(H, location)
-			else
-				var/turf/H_loc = H.loc
-				user.visible_message("<span class='warning'>[user] tries to shave [H]'s facial hair with [src].</span>", \
-									 "<span class='notice'>You start shaving [H]'s facial hair...</span>")
-				if(do_after(user, 50, target = H))
-					if(H_loc == H.loc)
-						user.visible_message("<span class='warning'>[user] shaves off [H]'s facial hair with [src].</span>", \
-											 "<span class='notice'>You shave [H]'s facial hair clean off.</span>")
-						shave(H, location)
-
-		else if(location == "head")
-			if(!(HAIR in H.dna.species.species_traits))
-				to_chat(user, "<span class='warning'>There is no hair to shave!</span>")
-				return
-			if(!get_location_accessible(H, location))
-				to_chat(user, "<span class='warning'>The headgear is in the way!</span>")
-				return
-			if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead")
-				to_chat(user, "<span class='warning'>There is not enough hair left to shave!</span>")
-				return
-
-			if(H == user) //shaving yourself
-				user.visible_message("[user] starts to shave their head with [src].", \
-									 "<span class='notice'>You start to shave your head with [src]...</span>")
-				if(do_after(user, 5, target = H))
-					user.visible_message("[user] shaves his head with [src].", \
-										 "<span class='notice'>You finish shaving with [src].</span>")
-					shave(H, location)
-			else
-				var/turf/H_loc = H.loc
-				user.visible_message("<span class='warning'>[user] tries to shave [H]'s head with [src]!</span>", \
-									 "<span class='notice'>You start shaving [H]'s head...</span>")
-				if(do_after(user, 50, target = H))
-					if(H_loc == H.loc)
-						user.visible_message("<span class='warning'>[user] shaves [H]'s head bald with [src]!</span>", \
-											 "<span class='notice'>You shave [H]'s head bald.</span>")
-						shave(H, location)
-		else
-			..()
-	else
-		..()
+/obj/item/lipstick
+	gender = PLURAL
+	name = "red lipstick"
+	desc = "A generic brand of lipstick."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "lipstick"
+	w_class = WEIGHT_CLASS_TINY
+	var/colour = "red"
+	var/open = FALSE
+
+
+/obj/item/lipstick/purple
+	name = "purple lipstick"
+	colour = "purple"
+
+/obj/item/lipstick/jade
+	//It's still called Jade, but theres no HTML color for jade, so we use lime.
+	name = "jade lipstick"
+	colour = "lime"
+
+/obj/item/lipstick/black
+	name = "black lipstick"
+	colour = "black"
+
+
+/obj/item/lipstick/random
+	name = "lipstick"
+
+/obj/item/lipstick/random/New()
+	..()
+	colour = pick("red","purple","lime","black","green","blue","white")
+	name = "[colour] lipstick"
+
+
+
+/obj/item/lipstick/attack_self(mob/user)
+	cut_overlays()
+	to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
+	open = !open
+	if(open)
+		var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color")
+		colored_overlay.color = colour
+		icon_state = "lipstick_uncap"
+		add_overlay(colored_overlay)
+	else
+		icon_state = "lipstick"
+
+/obj/item/lipstick/attack(mob/M, mob/user)
+	if(!open)
+		return
+
+	if(!ismob(M))
+		return
+
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.is_mouth_covered())
+			to_chat(user, "<span class='warning'>Remove [ H == user ? "your" : "their" ] mask!</span>")
+			return
+		if(H.lip_style)	//if they already have lipstick on
+			to_chat(user, "<span class='warning'>You need to wipe off the old lipstick first!</span>")
+			return
+		if(H == user)
+			user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
+								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
+			H.lip_style = "lipstick"
+			H.lip_color = colour
+			H.update_body()
+		else
+			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
+								 "<span class='notice'>You begin to apply \the [src] on [H]'s lips...</span>")
+			if(do_after(user, 20, target = H))
+				user.visible_message("[user] does [H]'s lips with \the [src].", \
+									 "<span class='notice'>You apply \the [src] on [H]'s lips.</span>")
+				H.lip_style = "lipstick"
+				H.lip_color = colour
+				H.update_body()
+	else
+		to_chat(user, "<span class='warning'>Where are the lips on that?</span>")
+
+//you can wipe off lipstick with paper!
+/obj/item/paper/attack(mob/M, mob/user)
+	if(user.zone_selected == "mouth")
+		if(!ismob(M))
+			return
+
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(H == user)
+				to_chat(user, "<span class='notice'>You wipe off the lipstick with [src].</span>")
+				H.lip_style = null
+				H.update_body()
+			else
+				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
+								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick...</span>")
+				if(do_after(user, 10, target = H))
+					user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
+										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
+					H.lip_style = null
+					H.update_body()
+	else
+		..()
+
+
+/obj/item/razor
+	name = "electric razor"
+	desc = "The latest and greatest power razor born from the science of shaving."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "razor"
+	flags_1 = CONDUCT_1
+	w_class = WEIGHT_CLASS_TINY
+
+
+/obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth")
+	if(location == "mouth")
+		H.facial_hair_style = "Shaved"
+	else
+		H.hair_style = "Skinhead"
+
+	H.update_hair()
+	playsound(loc, 'sound/items/welder2.ogg', 20, 1)
+
+
+/obj/item/razor/attack(mob/M, mob/user)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/location = user.zone_selected
+		if((location in list("eyes", "mouth", "head")) && !H.get_bodypart("head"))
+			to_chat(user, "<span class='warning'>[H] doesn't have a head!</span>")
+			return
+		if(location == "mouth")
+			if(!(FACEHAIR in H.dna.species.species_traits))
+				to_chat(user, "<span class='warning'>There is no facial hair to shave!</span>")
+				return
+			if(!get_location_accessible(H, location))
+				to_chat(user, "<span class='warning'>The mask is in the way!</span>")
+				return
+			if(H.facial_hair_style == "Shaved")
+				to_chat(user, "<span class='warning'>Already clean-shaven!</span>")
+				return
+
+			if(H == user) //shaving yourself
+				user.visible_message("[user] starts to shave their facial hair with [src].", \
+									 "<span class='notice'>You take a moment to shave your facial hair with [src]...</span>")
+				if(do_after(user, 50, target = H))
+					user.visible_message("[user] shaves his facial hair clean with [src].", \
+										 "<span class='notice'>You finish shaving with [src]. Fast and clean!</span>")
+					shave(H, location)
+			else
+				var/turf/H_loc = H.loc
+				user.visible_message("<span class='warning'>[user] tries to shave [H]'s facial hair with [src].</span>", \
+									 "<span class='notice'>You start shaving [H]'s facial hair...</span>")
+				if(do_after(user, 50, target = H))
+					if(H_loc == H.loc)
+						user.visible_message("<span class='warning'>[user] shaves off [H]'s facial hair with [src].</span>", \
+											 "<span class='notice'>You shave [H]'s facial hair clean off.</span>")
+						shave(H, location)
+
+		else if(location == "head")
+			if(!(HAIR in H.dna.species.species_traits))
+				to_chat(user, "<span class='warning'>There is no hair to shave!</span>")
+				return
+			if(!get_location_accessible(H, location))
+				to_chat(user, "<span class='warning'>The headgear is in the way!</span>")
+				return
+			if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead")
+				to_chat(user, "<span class='warning'>There is not enough hair left to shave!</span>")
+				return
+
+			if(H == user) //shaving yourself
+				user.visible_message("[user] starts to shave their head with [src].", \
+									 "<span class='notice'>You start to shave your head with [src]...</span>")
+				if(do_after(user, 5, target = H))
+					user.visible_message("[user] shaves his head with [src].", \
+										 "<span class='notice'>You finish shaving with [src].</span>")
+					shave(H, location)
+			else
+				var/turf/H_loc = H.loc
+				user.visible_message("<span class='warning'>[user] tries to shave [H]'s head with [src]!</span>", \
+									 "<span class='notice'>You start shaving [H]'s head...</span>")
+				if(do_after(user, 50, target = H))
+					if(H_loc == H.loc)
+						user.visible_message("<span class='warning'>[user] shaves [H]'s head bald with [src]!</span>", \
+											 "<span class='notice'>You shave [H]'s head bald.</span>")
+						shave(H, location)
+		else
+			..()
+	else
+		..()

code/game/objects/items/dehy_carp.dm

@@ -4,13 +4,13 @@
  */
 
 //Child of carpplushie because this should do everything the toy does and more
-/obj/item/toy/carpplushie/dehy_carp
+/obj/item/toy/plush/carpplushie/dehy_carp
 	var/mob/owner = null	//Carp doesn't attack owner, set when using in hand
 	var/owned = 0	//Boolean, no owner to begin with
 	var/mobtype = /mob/living/simple_animal/hostile/carp //So admins can change what mob spawns via var fuckery
 
 //Attack self
-/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user)
+/obj/item/toy/plush/carpplushie/dehy_carp/attack_self(mob/user)
 	src.add_fingerprint(user)	//Anyone can add their fingerprints to it with this
 	if(!owned)
 		to_chat(user, "<span class='notice'>You pet [src]. You swear it looks up at you.</span>")
@@ -18,7 +18,7 @@
 		owned = 1
 	else return ..()
 
-/obj/item/toy/carpplushie/dehy_carp/proc/Swell()
+/obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell()
 	desc = "It's growing!"
 	visible_message("<span class='notice'>[src] swells up!</span>")
 

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

@@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 			P.show_recieved_message(msg,src)
 			if(!multiple)
 				show_to_ghosts(user,msg)
-				log_talk(user,"[user] (PDA: [name]) sent \"[message]\" to [P.name]",LOGPDA)
+				log_talk(user,"[key_name(user)] (PDA: [name]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA)
 		else
 			if(!multiple)
 				to_chat(user, "<span class='notice'>ERROR: Server isn't responding.</span>")
@@ -856,9 +856,6 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/list/plist = list()
 	var/list/namecounts = list()
 
-	if(user.stat == DEAD)
-		return //won't work if dead
-
 	if(src.aiPDA.toff)
 		to_chat(user, "Turn on your receiver in order to send messages.")
 		return
@@ -883,6 +880,10 @@ GLOBAL_LIST_EMPTY(PDAs)
 		if(add_photo=="Yes")
 			var/datum/picture/Pic = aicamera.selectpicture(aicamera)
 			src.aiPDA.photo = Pic.fields["img"]
+
+	if(incapacitated())
+		return
+
 	src.aiPDA.create_message(src, selected)
 
 
@@ -910,8 +911,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 		to_chat(usr, "You do not have a PDA. You should make an issue report about this.")
 
 /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user)
-	if(user.stat == DEAD)
-		return //won't work if dead
+	if(incapacitated())
+		return
 	if(!isnull(aiPDA))
 		var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>[aiPDA.tnote]</body></html>"
 		user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")

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

@@ -0,0 +1,65 @@
+//Used by engineering cyborgs in place of generic circuits.
+/obj/item/device/electroadaptive_pseudocircuit
+	name = "electroadaptive pseudocircuit"
+	desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "boris"
+	w_class = WEIGHT_CLASS_TINY
+	materials = list(MAT_METAL = 50, MAT_GLASS = 300)
+	origin_tech = "engineering=4"
+	var/recharging = FALSE
+	var/circuits = 5 //How many circuits the pseudocircuit has left
+	var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \
+	/obj/item/electronics/apc))//A typecache of circuits consumable for material
+
+/obj/item/device/electroadaptive_pseudocircuit/Initialize()
+	. = ..()
+	maptext = "[circuits]"
+
+/obj/item/device/electroadaptive_pseudocircuit/examine(mob/user)
+	..()
+	if(iscyborg(user))
+		to_chat(user, "<span class='notice'>It has material for <b>[circuits]</b> circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.</span>")
+		to_chat(user, "<span class='notice'>Serves as a substitute for <b>fire/air alarm</b>, <b>firelock</b>, and <b>APC</b> electronics.</span>")
+		to_chat(user, "<span class='notice'>It can also be used on an APC with no power cell to <b>fabricate a low-capacity cell</b> at a high power cost.</span>")
+
+/obj/item/device/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0)
+	if(QDELETED(R) || !istype(R))
+		return
+	if(!R.cell)
+		to_chat(R, "<span class='warning'>You need a power cell installed for that.</span>")
+		return
+	if(!R.cell.use(circuit_cost))
+		to_chat(R, "<span class='warning'>You don't have the power for that (you need [DisplayPower(circuit_cost)].)</span>")
+		return
+	if(recharging)
+		to_chat(R, "<span class='warning'>[src] needs some time to recharge first.</span>")
+		return
+	if(!circuits)
+		to_chat(R, "<span class='warning'>You need more material. Use [src] on existing simple circuits to break them down.</span>")
+		return
+	playsound(R, 'sound/items/rped.ogg', 50, TRUE)
+	recharging = TRUE
+	circuits--
+	maptext = "[circuits]"
+	icon_state = "[initial(icon_state)]_recharging"
+	var/recharge_time = min(600, circuit_cost * 5)  //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming
+	addtimer(CALLBACK(src, .proc/recharge), recharge_time)
+	return TRUE //The actual circuit magic itself is done on a per-object basis
+
+/obj/item/device/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity)
+	if(!proximity)
+		return
+	if(!is_type_in_typecache(target, recycleable_circuits))
+		return
+	circuits++
+	maptext = "[circuits]"
+	user.visible_message("<span class='notice'>User breaks down [target] with [src].</span>", \
+	"<span class='notice'>You recycle [target] into [src]. It now has material for <b>[circuits]</b> circuits.</span>")
+	playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE)
+	qdel(target)
+
+/obj/item/device/electroadaptive_pseudocircuit/proc/recharge()
+	playsound(src, 'sound/machines/chime.ogg', 25, TRUE)
+	recharging = FALSE
+	icon_state = initial(icon_state)

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

@@ -1,3 +1,4 @@
+GLOBAL_LIST_INIT(pipe_paint_colors, list("grey"=rgb(255,255,255), "red"=rgb(255,0,0), "blue"=rgb(0,0,255), "cyan"=rgb(0,256,249), "green"=rgb(30,255,0), "yellow"=rgb(255,198,0), "purple"=rgb(130,43,255)))
 
 /obj/item/device/pipe_painter
 	name = "pipe painter"
@@ -5,16 +6,7 @@
 	icon_state = "labeler1"
 	item_state = "flight"
 	flags_1 = NOBLUDGEON_1
-	var/list/modes = list(
-		"grey"		= rgb(255,255,255),
-		"red"			= rgb(255,0,0),
-		"blue"		= rgb(0,0,255),
-		"cyan"		= rgb(0,256,249),
-		"green"		= rgb(30,255,0),
-		"yellow"	= rgb(255,198,0),
-		"purple"	= rgb(130,43,255)
-	)
-	var/mode = "grey"
+	var/paint_color = "grey"
 
 	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
 
@@ -27,14 +19,13 @@
 		return
 
 	var/obj/machinery/atmospherics/pipe/P = A
-	P.add_atom_colour(modes[mode], FIXED_COLOUR_PRIORITY)
-	P.pipe_color = modes[mode]
-	user.visible_message("<span class='notice'>[user] paints \the [P] [mode].</span>","<span class='notice'>You paint \the [P] [mode].</span>")
-	P.update_node_icon() //updates the neighbors
+	if(P.paint(GLOB.pipe_paint_colors[paint_color]))
+		playsound(src, 'sound/machines/click.ogg', 50, 1)
+		user.visible_message("<span class='notice'>[user] paints \the [P] [paint_color].</span>","<span class='notice'>You paint \the [P] [paint_color].</span>")
 
 /obj/item/device/pipe_painter/attack_self(mob/user)
-	mode = input("Which colour do you want to use?","Pipe painter") in modes
+	paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors
 
-/obj/item/device/pipe_painter/examine()
+/obj/item/device/pipe_painter/examine(mob/user)
 	..()
-	to_chat(usr, "It is set to [mode].")
+	to_chat(user, "<span class='notice'>It is set to [paint_color].</span>")

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

@@ -138,7 +138,7 @@
 	if(power_drained > max_power * 0.98)
 		if (!admins_warned)
 			admins_warned = TRUE
-			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
+			message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
 		playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
 
 	if(power_drained >= max_power)

code/game/objects/items/devices/radio/electropack.dm

@@ -4,13 +4,13 @@
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "electropack0"
 	item_state = "electropack"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags_1 = CONDUCT_1
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
-	var/on = TRUE
+	var/on = TRUE
 	var/code = 2
 	var/frequency = 1449
 	var/shock_cooldown = 0
@@ -20,11 +20,11 @@
 	return (FIRELOSS)
 
 /obj/item/device/electropack/Initialize()
-	..()
+	. = ..()
 	SSradio.add_object(src, frequency, GLOB.RADIO_CHAT)
 
 /obj/item/device/electropack/Destroy()
-	SSradio.remove_object(src, frequency)
+	SSradio.remove_object(src, frequency)
 	return ..()
 
 /obj/item/device/electropack/attack_hand(mob/user)
@@ -52,8 +52,8 @@
 
 		user.put_in_hands(A)
 		A.add_fingerprint(user)
-		if(src.flags_1 & NODROP_1)
-			A.flags_1 |= NODROP_1
+		if(src.flags_1 & NODROP_1)
+			A.flags_1 |= NODROP_1
 	else
 		return ..()
 
@@ -108,7 +108,7 @@
 		spawn(100)
 			shock_cooldown = 0
 		var/mob/living/L = loc
-		step(L, pick(GLOB.cardinals))
+		step(L, pick(GLOB.cardinals))
 
 		to_chat(L, "<span class='danger'>You feel a sharp shock!</span>")
 		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
@@ -143,4 +143,4 @@ Code:
 </TT>"}
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
-	return
+	return

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

@@ -181,7 +181,7 @@ MASS SPECTROMETER
 		to_chat(user, "<span class='info'>Time of Death:</span> [M.tod]")
 		var/tdelta = round(world.time - M.timeofdeath)
 		if(tdelta < (DEFIB_TIME_LIMIT * 10))
-			to_chat(user, "<span class='danger'>Subject died [tdelta / 10] seconds ago, defibrillation may be possible!</span>")
+			to_chat(user, "<span class='danger'>Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!</span>")
 
 	for(var/thing in M.viruses)
 		var/datum/disease/D = thing

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

@@ -111,7 +111,6 @@ effective or pretty fucking useless.
 /obj/item/device/healthanalyzer/rad_laser/interact(mob/user)
 	user.set_machine(src)
 
-	var/cooldown = GetCooldown()
 	var/dat = "Irradiation: <A href='?src=\ref[src];rad=1'>[irradiate ? "On" : "Off"]</A><br>"
 	dat += "Stealth Mode (NOTE: Deactivates automatically while Irradiation is off): <A href='?src=\ref[src];stealthy=[TRUE]'>[stealth ? "On" : "Off"]</A><br>"
 	dat += "Scan Mode: <a href='?src=\ref[src];mode=1'>"
@@ -133,7 +132,7 @@ effective or pretty fucking useless.
 	<A href='?src=\ref[src];radwav=-5'>-</A><A href='?src=\ref[src];radwav=-1'>-</A>
 	[(wavelength+(intensity*4))]
 	<A href='?src=\ref[src];radwav=1'>+</A><A href='?src=\ref[src];radwav=5'>+</A><BR>
-	Laser Cooldown: [cooldown] Seconds<BR>
+	Laser Cooldown: [DisplayTimeText(GetCooldown())]<BR>
 	"}
 
 	var/datum/browser/popup = new(user, "radlaser", "Radioactive Microlaser Interface", 400, 240)

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

@@ -1,213 +1,213 @@
-/obj/item/device/transfer_valve
-	icon = 'icons/obj/assemblies.dmi'
-	name = "tank transfer valve"
-	icon_state = "valve_1"
-	item_state = "ttv"
+/obj/item/device/transfer_valve
+	icon = 'icons/obj/assemblies.dmi'
+	name = "tank transfer valve"
+	icon_state = "valve_1"
+	item_state = "ttv"
 	lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
-	desc = "Regulates the transfer of air between two tanks"
-	var/obj/item/tank/tank_one
-	var/obj/item/tank/tank_two
+	desc = "Regulates the transfer of air between two tanks"
+	var/obj/item/tank/tank_one
+	var/obj/item/tank/tank_two
 	var/obj/item/device/assembly/attached_device
-	var/mob/attacher = null
+	var/mob/attacher = null
 	var/valve_open = FALSE
-	var/toggle = 1
-	origin_tech = "materials=1;engineering=1"
-
-/obj/item/device/transfer_valve/IsAssemblyHolder()
-	return 1
-
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
-	if(istype(item, /obj/item/tank))
-		if(tank_one && tank_two)
-			to_chat(user, "<span class='warning'>There are already two tanks attached, remove one first!</span>")
-			return
-
-		if(!tank_one)
-			if(!user.transferItemToLoc(item, src))
-				return
-			tank_one = item
-			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
-			if(item.w_class > w_class)
-				w_class = item.w_class
-		else if(!tank_two)
-			if(!user.transferItemToLoc(item, src))
-				return
-			tank_two = item
-			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
-			if(item.w_class > w_class)
-				w_class = item.w_class
-
-		update_icon()
-//TODO: Have this take an assemblyholder
-	else if(isassembly(item))
-		var/obj/item/device/assembly/A = item
-		if(A.secured)
-			to_chat(user, "<span class='notice'>The device is secured.</span>")
-			return
-		if(attached_device)
-			to_chat(user, "<span class='warning'>There is already a device attached to the valve, remove it first!</span>")
-			return
-		if(!user.transferItemToLoc(item, src))
-			return
-		attached_device = A
-		to_chat(user, "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>")
-		A.holder = src
-		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
-
-		GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
-		message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
-		log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
-		attacher = user
-	return
-
-/obj/item/device/transfer_valve/attack_self(mob/user)
-	user.set_machine(src)
-	var/dat = {"<B> Valve properties: </B>
-	<BR> <B> Attachment one:</B> [tank_one] [tank_one ? "<A href='?src=\ref[src];tankone=1'>Remove</A>" : ""]
-	<BR> <B> Attachment two:</B> [tank_two] [tank_two ? "<A href='?src=\ref[src];tanktwo=1'>Remove</A>" : ""]
-	<BR> <B> Valve attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]
-	<BR> <B> Valve status: </B> [ valve_open ? "<A href='?src=\ref[src];open=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];open=1'>Open</A>"]"}
-
-	var/datum/browser/popup = new(user, "trans_valve", name)
-	popup.set_content(dat)
-	popup.open()
-	return
-
-/obj/item/device/transfer_valve/Topic(href, href_list)
-	..()
-	if ( usr.stat || usr.restrained() )
-		return
-	if (src.loc == usr)
-		if(tank_one && href_list["tankone"])
-			split_gases()
+	var/toggle = 1
+	origin_tech = "materials=1;engineering=1"
+
+/obj/item/device/transfer_valve/IsAssemblyHolder()
+	return 1
+
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
+	if(istype(item, /obj/item/tank))
+		if(tank_one && tank_two)
+			to_chat(user, "<span class='warning'>There are already two tanks attached, remove one first!</span>")
+			return
+
+		if(!tank_one)
+			if(!user.transferItemToLoc(item, src))
+				return
+			tank_one = item
+			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(item.w_class > w_class)
+				w_class = item.w_class
+		else if(!tank_two)
+			if(!user.transferItemToLoc(item, src))
+				return
+			tank_two = item
+			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(item.w_class > w_class)
+				w_class = item.w_class
+
+		update_icon()
+//TODO: Have this take an assemblyholder
+	else if(isassembly(item))
+		var/obj/item/device/assembly/A = item
+		if(A.secured)
+			to_chat(user, "<span class='notice'>The device is secured.</span>")
+			return
+		if(attached_device)
+			to_chat(user, "<span class='warning'>There is already a device attached to the valve, remove it first!</span>")
+			return
+		if(!user.transferItemToLoc(item, src))
+			return
+		attached_device = A
+		to_chat(user, "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>")
+		A.holder = src
+		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
+
+		GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
+		message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
+		log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
+		attacher = user
+	return
+
+/obj/item/device/transfer_valve/attack_self(mob/user)
+	user.set_machine(src)
+	var/dat = {"<B> Valve properties: </B>
+	<BR> <B> Attachment one:</B> [tank_one] [tank_one ? "<A href='?src=\ref[src];tankone=1'>Remove</A>" : ""]
+	<BR> <B> Attachment two:</B> [tank_two] [tank_two ? "<A href='?src=\ref[src];tanktwo=1'>Remove</A>" : ""]
+	<BR> <B> Valve attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]
+	<BR> <B> Valve status: </B> [ valve_open ? "<A href='?src=\ref[src];open=1'>Closed</A> <B>Open</B>" : "<B>Closed</B> <A href='?src=\ref[src];open=1'>Open</A>"]"}
+
+	var/datum/browser/popup = new(user, "trans_valve", name)
+	popup.set_content(dat)
+	popup.open()
+	return
+
+/obj/item/device/transfer_valve/Topic(href, href_list)
+	..()
+	if ( usr.stat || usr.restrained() )
+		return
+	if (src.loc == usr)
+		if(tank_one && href_list["tankone"])
+			split_gases()
 			valve_open = FALSE
-			tank_one.loc = get_turf(src)
-			tank_one = null
-			update_icon()
-			if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-				w_class = WEIGHT_CLASS_NORMAL
-		else if(tank_two && href_list["tanktwo"])
-			split_gases()
+			tank_one.loc = get_turf(src)
+			tank_one = null
+			update_icon()
+			if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+				w_class = WEIGHT_CLASS_NORMAL
+		else if(tank_two && href_list["tanktwo"])
+			split_gases()
 			valve_open = FALSE
-			tank_two.loc = get_turf(src)
-			tank_two = null
-			update_icon()
-			if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
-				w_class = WEIGHT_CLASS_NORMAL
-		else if(href_list["open"])
-			toggle_valve()
-		else if(attached_device)
-			if(href_list["rem_device"])
+			tank_two.loc = get_turf(src)
+			tank_two = null
+			update_icon()
+			if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
+				w_class = WEIGHT_CLASS_NORMAL
+		else if(href_list["open"])
+			toggle_valve()
+		else if(attached_device)
+			if(href_list["rem_device"])
 				attached_device.forceMove(get_turf(src))
 				attached_device.holder = null
-				attached_device = null
-				update_icon()
-			if(href_list["device"])
-				attached_device.attack_self(usr)
-
-		src.attack_self(usr)
-		src.add_fingerprint(usr)
-		return
-	return
-
-/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
-	if(toggle)
-		toggle = 0
-		toggle_valve()
-		spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
-			toggle = 1
-
-/obj/item/device/transfer_valve/update_icon()
-	cut_overlays()
-	underlays = null
-
-	if(!tank_one && !tank_two && !attached_device)
-		icon_state = "valve_1"
-		return
-	icon_state = "valve"
-
-	if(tank_one)
-		add_overlay("[tank_one.icon_state]")
-	if(tank_two)
-		var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
-		J.Shift(WEST, 13)
-		underlays += J
-	if(attached_device)
-		add_overlay("device")
-
-/obj/item/device/transfer_valve/proc/merge_gases()
-	tank_two.air_contents.volume += tank_one.air_contents.volume
-	var/datum/gas_mixture/temp
-	temp = tank_one.air_contents.remove_ratio(1)
-	tank_two.air_contents.merge(temp)
-
-/obj/item/device/transfer_valve/proc/split_gases()
-	if (!valve_open || !tank_one || !tank_two)
-		return
-	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
-	var/datum/gas_mixture/temp
-	temp = tank_two.air_contents.remove_ratio(ratio1)
-	tank_one.air_contents.merge(temp)
-	tank_two.air_contents.volume -=  tank_one.air_contents.volume
-
-	/*
-	Exadv1: I know this isn't how it's going to work, but this was just to check
-	it explodes properly when it gets a signal (and it does).
-	*/
-
-/obj/item/device/transfer_valve/proc/toggle_valve()
-	if(!valve_open && tank_one && tank_two)
+				attached_device = null
+				update_icon()
+			if(href_list["device"])
+				attached_device.attack_self(usr)
+
+		src.attack_self(usr)
+		src.add_fingerprint(usr)
+		return
+	return
+
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
+	if(toggle)
+		toggle = 0
+		toggle_valve()
+		spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
+			toggle = 1
+
+/obj/item/device/transfer_valve/update_icon()
+	cut_overlays()
+	underlays = null
+
+	if(!tank_one && !tank_two && !attached_device)
+		icon_state = "valve_1"
+		return
+	icon_state = "valve"
+
+	if(tank_one)
+		add_overlay("[tank_one.icon_state]")
+	if(tank_two)
+		var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
+		J.Shift(WEST, 13)
+		underlays += J
+	if(attached_device)
+		add_overlay("device")
+
+/obj/item/device/transfer_valve/proc/merge_gases()
+	tank_two.air_contents.volume += tank_one.air_contents.volume
+	var/datum/gas_mixture/temp
+	temp = tank_one.air_contents.remove_ratio(1)
+	tank_two.air_contents.merge(temp)
+
+/obj/item/device/transfer_valve/proc/split_gases()
+	if (!valve_open || !tank_one || !tank_two)
+		return
+	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
+	var/datum/gas_mixture/temp
+	temp = tank_two.air_contents.remove_ratio(ratio1)
+	tank_one.air_contents.merge(temp)
+	tank_two.air_contents.volume -=  tank_one.air_contents.volume
+
+	/*
+	Exadv1: I know this isn't how it's going to work, but this was just to check
+	it explodes properly when it gets a signal (and it does).
+	*/
+
+/obj/item/device/transfer_valve/proc/toggle_valve()
+	if(!valve_open && tank_one && tank_two)
 		valve_open = TRUE
-		var/turf/bombturf = get_turf(src)
-		var/area/A = get_area(bombturf)
-
-		var/attachment = "no device"
-		if(attached_device)
-			if(istype(attached_device, /obj/item/device/assembly/signaler))
-				attachment = "<A HREF='?_src_=holder;secrets=list_signalers'>[attached_device]</A>"
-			else
-				attachment = attached_device
-
-		var/attacher_name = ""
-		if(!attacher)
-			attacher_name = "Unknown"
-		else
-			attacher_name = "[key_name_admin(attacher)]"
-
-		var/log_str1 = "Bomb valve opened in "
-		var/log_str2 = "with [attachment] attacher: [attacher_name]"
-
-		var/log_attacher = ""
-		if(attacher)
-			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
-
-		var/mob/mob = get_mob_by_key(src.fingerprintslast)
-		var/last_touch_info = ""
-		if(mob)
-			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
-
-		var/log_str3 = " Last touched by: [key_name_admin(mob)]"
-
-		var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
-
-		GLOB.bombers += bomb_message
-
-		message_admins(bomb_message, 0, 1)
-		log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
-		merge_gases()
-		spawn(20) // In case one tank bursts
-			for (var/i=0,i<5,i++)
-				src.update_icon()
-				sleep(10)
-			src.update_icon()
-
-	else if(valve_open && tank_one && tank_two)
-		split_gases()
+		var/turf/bombturf = get_turf(src)
+		var/area/A = get_area(bombturf)
+
+		var/attachment = "no device"
+		if(attached_device)
+			if(istype(attached_device, /obj/item/device/assembly/signaler))
+				attachment = "<A HREF='?_src_=holder;[HrefToken()];secrets=list_signalers'>[attached_device]</A>"
+			else
+				attachment = attached_device
+
+		var/attacher_name = ""
+		if(!attacher)
+			attacher_name = "Unknown"
+		else
+			attacher_name = "[key_name_admin(attacher)]"
+
+		var/log_str1 = "Bomb valve opened in "
+		var/log_str2 = "with [attachment] attacher: [attacher_name]"
+
+		var/log_attacher = ""
+		if(attacher)
+			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"
+
+		var/mob/mob = get_mob_by_key(src.fingerprintslast)
+		var/last_touch_info = ""
+		if(mob)
+			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"
+
+		var/log_str3 = " Last touched by: [key_name_admin(mob)]"
+
+		var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"
+
+		GLOB.bombers += bomb_message
+
+		message_admins(bomb_message, 0, 1)
+		log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
+		merge_gases()
+		spawn(20) // In case one tank bursts
+			for (var/i=0,i<5,i++)
+				src.update_icon()
+				sleep(10)
+			src.update_icon()
+
+	else if(valve_open && tank_one && tank_two)
+		split_gases()
 		valve_open = FALSE
-		src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
-	return
+		src.update_icon()
+
+// this doesn't do anything but the timer etc. expects it to be here
+// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
+/obj/item/device/transfer_valve/proc/c_state()
+	return

code/game/objects/items/dice.dm

@@ -1,193 +1,192 @@
-/obj/item/storage/pill_bottle/dice
-	name = "bag of dice"
-	desc = "Contains all the luck you'll ever need."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "dicebag"
-
-/obj/item/storage/pill_bottle/dice/New()
-	..()
-	var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
-	if(special_die == "1")
-		new /obj/item/dice/d1(src)
-	if(special_die == "2")
-		new /obj/item/dice/d2(src)
-	new /obj/item/dice/d4(src)
-	new /obj/item/dice/d6(src)
-	if(special_die == "fudge")
-		new /obj/item/dice/fudge(src)
-	if(special_die == "space")
-		new /obj/item/dice/d6/space(src)
-	new /obj/item/dice/d8(src)
-	new /obj/item/dice/d10(src)
-	if(special_die == "00")
-		new /obj/item/dice/d00(src)
-	new /obj/item/dice/d12(src)
-	new /obj/item/dice/d20(src)
-	if(special_die == "8bd20")
-		new /obj/item/dice/eightbd20(src)
-	if(special_die == "4dd6")
-		new /obj/item/dice/fourdd6(src)
-	if(special_die == "100")
-		new /obj/item/dice/d100(src)
-
-/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
-	name = "die"
-	desc = "A die with six sides. Basic and servicable."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "d6"
-	w_class = WEIGHT_CLASS_TINY
-	var/sides = 6
-	var/result = null
-	var/list/special_faces = list() //entries should match up to sides var if used
-	var/can_be_rigged = TRUE
-	var/rigged = FALSE
-
-/obj/item/dice/New()
-	result = rand(1, sides)
-	update_icon()
-	..()
-
-/obj/item/dice/d1
-	name = "d1"
-	desc = "A die with one side. Deterministic!"
-	icon_state = "d1"
-	sides = 1
-
-/obj/item/dice/d2
-	name = "d2"
-	desc = "A die with two sides. Coins are undignified!"
-	icon_state = "d2"
-	sides = 2
-
-/obj/item/dice/d4
-	name = "d4"
-	desc = "A die with four sides. The nerd's caltrop."
-	icon_state = "d4"
-	sides = 4
-
-/obj/item/dice/d6
-	name = "d6"
-
-/obj/item/dice/d6/space
-	name = "space cube"
-	desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
-	icon_state = "spaced6"
-
-/obj/item/dice/d6/space/New()
-	..()
-	if(prob(10))
-		name = "spess cube"
-
-/obj/item/dice/fudge
-	name = "fudge die"
-	desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
-	sides = 3 //shhh
-	icon_state = "fudge"
-	special_faces = list("minus","blank","plus")
-
-/obj/item/dice/d8
-	name = "d8"
-	desc = "A die with eight sides. It feels... lucky."
-	icon_state = "d8"
-	sides = 8
-
-/obj/item/dice/d10
-	name = "d10"
-	desc = "A die with ten sides. Useful for percentages."
-	icon_state = "d10"
-	sides = 10
-
-/obj/item/dice/d00
-	name = "d00"
-	desc = "A die with ten sides. Works better for d100 rolls than a golfball."
-	icon_state = "d00"
-	sides = 10
-
-/obj/item/dice/d12
-	name = "d12"
-	desc = "A die with twelve sides. There's an air of neglect about it."
-	icon_state = "d12"
-	sides = 12
-
-/obj/item/dice/d20
-	name = "d20"
-	desc = "A die with twenty sides. The prefered die to throw at the GM."
-	icon_state = "d20"
-	sides = 20
-
-/obj/item/dice/d100
-	name = "d100"
-	desc = "A die with one hundred sides! Probably not fairly weighted..."
-	icon_state = "d100"
-	sides = 100
-
-/obj/item/dice/d100/update_icon()
-	return
-
-/obj/item/dice/eightbd20
-	name = "strange d20"
-	desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
-	icon_state = "8bd20"
-	sides = 20
-	special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
-
-/obj/item/dice/eightbd20/update_icon()
-	return
-
-/obj/item/dice/fourdd6
-	name = "4d d6"
-	desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
-	icon_state = "4dd6"
-	sides = 48
-	special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
-
-/obj/item/dice/fourdd6/update_icon()
-	return
-
-/obj/item/dice/attack_self(mob/user)
-	diceroll(user)
-
-/obj/item/dice/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
-	if(!..())
-		return
-	diceroll(thrower)
-
-/obj/item/dice/proc/diceroll(mob/user)
-	result = rand(1, sides)
-	if(rigged && result != rigged)
-		if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
-			result = rigged
-	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
-	var/comment = ""
-	if(sides == 20 && result == 20)
-		comment = "Nat 20!"
-	else if(sides == 20 && result == 1)
-		comment = "Ouch, bad luck."
-	update_icon()
-	if(initial(icon_state) == "d00")
-		result = (result - 1)*10
-	if(special_faces.len == sides)
-		result = special_faces[result]
-	if(user != null) //Dice was rolled in someone's hand
-		user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
-							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
-							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
-	else if(!src.throwing) //Dice was thrown and is coming to rest
-		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
-
-/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
-	if(istype(H) && !H.shoes)
-		if(PIERCEIMMUNE in H.dna.species.species_traits)
-			return 0
-		to_chat(H, "<span class='userdanger'>You step on the D4!</span>")
-		H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
-		H.Knockdown(60)
-
-/obj/item/dice/update_icon()
-	cut_overlays()
-	add_overlay("[src.icon_state][src.result]")
-
-/obj/item/dice/microwave_act(obj/machinery/microwave/M)
-	if(can_be_rigged)
-		rigged = result
-	..(M)
+/obj/item/storage/pill_bottle/dice
+	name = "bag of dice"
+	desc = "Contains all the luck you'll ever need."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "dicebag"
+
+/obj/item/storage/pill_bottle/dice/New()
+	..()
+	var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
+	if(special_die == "1")
+		new /obj/item/dice/d1(src)
+	if(special_die == "2")
+		new /obj/item/dice/d2(src)
+	new /obj/item/dice/d4(src)
+	new /obj/item/dice/d6(src)
+	if(special_die == "fudge")
+		new /obj/item/dice/fudge(src)
+	if(special_die == "space")
+		new /obj/item/dice/d6/space(src)
+	new /obj/item/dice/d8(src)
+	new /obj/item/dice/d10(src)
+	if(special_die == "00")
+		new /obj/item/dice/d00(src)
+	new /obj/item/dice/d12(src)
+	new /obj/item/dice/d20(src)
+	if(special_die == "8bd20")
+		new /obj/item/dice/eightbd20(src)
+	if(special_die == "4dd6")
+		new /obj/item/dice/fourdd6(src)
+	if(special_die == "100")
+		new /obj/item/dice/d100(src)
+
+/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
+	name = "die"
+	desc = "A die with six sides. Basic and servicable."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "d6"
+	w_class = WEIGHT_CLASS_TINY
+	var/sides = 6
+	var/result = null
+	var/list/special_faces = list() //entries should match up to sides var if used
+	var/can_be_rigged = TRUE
+	var/rigged = FALSE
+
+/obj/item/dice/New()
+	result = rand(1, sides)
+	update_icon()
+	..()
+
+/obj/item/dice/d1
+	name = "d1"
+	desc = "A die with one side. Deterministic!"
+	icon_state = "d1"
+	sides = 1
+
+/obj/item/dice/d2
+	name = "d2"
+	desc = "A die with two sides. Coins are undignified!"
+	icon_state = "d2"
+	sides = 2
+
+/obj/item/dice/d4
+	name = "d4"
+	desc = "A die with four sides. The nerd's caltrop."
+	icon_state = "d4"
+	sides = 4
+
+/obj/item/dice/d6
+	name = "d6"
+
+/obj/item/dice/d6/space
+	name = "space cube"
+	desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
+	icon_state = "spaced6"
+
+/obj/item/dice/d6/space/New()
+	..()
+	if(prob(10))
+		name = "spess cube"
+
+/obj/item/dice/fudge
+	name = "fudge die"
+	desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
+	sides = 3 //shhh
+	icon_state = "fudge"
+	special_faces = list("minus","blank","plus")
+
+/obj/item/dice/d8
+	name = "d8"
+	desc = "A die with eight sides. It feels... lucky."
+	icon_state = "d8"
+	sides = 8
+
+/obj/item/dice/d10
+	name = "d10"
+	desc = "A die with ten sides. Useful for percentages."
+	icon_state = "d10"
+	sides = 10
+
+/obj/item/dice/d00
+	name = "d00"
+	desc = "A die with ten sides. Works better for d100 rolls than a golfball."
+	icon_state = "d00"
+	sides = 10
+
+/obj/item/dice/d12
+	name = "d12"
+	desc = "A die with twelve sides. There's an air of neglect about it."
+	icon_state = "d12"
+	sides = 12
+
+/obj/item/dice/d20
+	name = "d20"
+	desc = "A die with twenty sides. The prefered die to throw at the GM."
+	icon_state = "d20"
+	sides = 20
+
+/obj/item/dice/d100
+	name = "d100"
+	desc = "A die with one hundred sides! Probably not fairly weighted..."
+	icon_state = "d100"
+	sides = 100
+
+/obj/item/dice/d100/update_icon()
+	return
+
+/obj/item/dice/eightbd20
+	name = "strange d20"
+	desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
+	icon_state = "8bd20"
+	sides = 20
+	special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
+
+/obj/item/dice/eightbd20/update_icon()
+	return
+
+/obj/item/dice/fourdd6
+	name = "4d d6"
+	desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
+	icon_state = "4dd6"
+	sides = 48
+	special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
+
+/obj/item/dice/fourdd6/update_icon()
+	return
+
+/obj/item/dice/attack_self(mob/user)
+	diceroll(user)
+
+/obj/item/dice/throw_impact(atom/target)
+	diceroll(thrownby)
+	. = ..()
+
+/obj/item/dice/proc/diceroll(mob/user)
+	result = rand(1, sides)
+	if(rigged && result != rigged)
+		if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+			result = rigged
+	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
+	var/comment = ""
+	if(sides == 20 && result == 20)
+		comment = "Nat 20!"
+	else if(sides == 20 && result == 1)
+		comment = "Ouch, bad luck."
+	update_icon()
+	if(initial(icon_state) == "d00")
+		result = (result - 1)*10
+	if(special_faces.len == sides)
+		result = special_faces[result]
+	if(user != null) //Dice was rolled in someone's hand
+		user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
+							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
+							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
+	else if(!src.throwing) //Dice was thrown and is coming to rest
+		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
+
+/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
+	if(istype(H) && !H.shoes)
+		if(PIERCEIMMUNE in H.dna.species.species_traits)
+			return 0
+		to_chat(H, "<span class='userdanger'>You step on the D4!</span>")
+		H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
+		H.Knockdown(60)
+
+/obj/item/dice/update_icon()
+	cut_overlays()
+	add_overlay("[src.icon_state][src.result]")
+
+/obj/item/dice/microwave_act(obj/machinery/microwave/M)
+	if(can_be_rigged)
+		rigged = result
+	..(M)

code/game/objects/items/eightball.dm

@@ -37,10 +37,10 @@
 		"Very doubtful")
 
 /obj/item/toy/eightball/Initialize(mapload)
-	..()
+	. = ..()
 	if(prob(1))
 		new /obj/item/toy/eightball/haunted(get_turf(src))
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 
 /obj/item/toy/eightball/attack_self(mob/user)
 	if(shaking)
@@ -81,7 +81,7 @@
 	var/fixed_answer
 
 /obj/item/toy/eightball/broken/Initialize(mapload)
-	..()
+	. = ..()
 	fixed_answer = pick(possible_answers)
 
 /obj/item/toy/eightball/broken/get_answer()
@@ -97,7 +97,7 @@
 	var/list/votes
 
 /obj/item/toy/eightball/haunted/Initialize(mapload)
-	..()
+	. = ..()
 	votes = list()
 	GLOB.poi_list |= src
 

code/game/objects/items/grenades/chem_grenade.dm

@@ -292,7 +292,7 @@
 		var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast)
 		var/turf/T = get_turf(src)
 		var/area/A = get_area(T)
-		message_admins("grenade primed by an assembly, attached by [key_name_admin(M)]<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) and last touched by [key_name_admin(last)]<A HREF='?_src_=holder;adminmoreinfo=\ref[last]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[last]'>FLW</A>) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[A.name] (JMP)</a>.")
+		message_admins("grenade primed by an assembly, attached by [key_name_admin(M)]<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[M]'>(?)</A> (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</A>) and last touched by [key_name_admin(last)]<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[last]'>(?)</A> (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[last]'>FLW</A>) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at <A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[A.name] (JMP)</a>.")
 		log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])")
 	else
 		addtimer(CALLBACK(src, .proc/prime), det_time)

code/game/objects/items/handcuffs.dm

@@ -253,7 +253,7 @@
 	var/trap_damage = 20
 
 /obj/item/restraints/legcuffs/beartrap/Initialize()
-	..()
+	. = ..()
 	icon_state = "[initial(icon_state)][armed]"
 
 /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user)
@@ -369,4 +369,4 @@
 		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
 		B.Crossed(hit_atom)
 		qdel(src)
-	..()
+	..()

code/game/objects/items/holy_weapons.dm

@@ -9,6 +9,7 @@
 	throw_speed = 3
 	throw_range = 4
 	throwforce = 10
+	unique_rename = TRUE
 	w_class = WEIGHT_CLASS_TINY
 	var/reskinned = FALSE
 
@@ -244,6 +245,7 @@
 		S.name = name
 		S.ckey = theghost.ckey
 		S.status_flags |= GODMODE
+		S.language_holder = user.language_holder.copy(S)
 		var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
 
 		if(src && input)
@@ -381,12 +383,10 @@
 	flags_2 = SLOWS_WHILE_IN_HAND_2
 
 /obj/item/nullrod/tribal_knife/Initialize(mapload)
-	..()
-
-/obj/item/nullrod/tribal_knife/New()
-	..()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
+
 /obj/item/nullrod/tribal_knife/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	. = ..()
@@ -408,7 +408,7 @@
 
 /obj/item/nullrod/egyptian
 	name = "egyptian staff"
-	desc = "A tutorial in mummification is carved into the staff. You could probably follow the steps yourself if you had some bandages."
+	desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth."
 	icon = 'icons/obj/guns/magic.dmi'
 	icon_state = "pharoah_sceptre"
 	item_state = "pharoah_sceptre"

code/game/objects/items/implants/implant_abductor.dm

@@ -26,21 +26,15 @@
 	if(..())
 		var/obj/machinery/abductor/console/console
 		if(ishuman(target))
-			var/mob/living/carbon/human/H = target
-			if(H.dna.species.id == "abductor")
-				var/datum/species/abductor/S = H.dna.species
-				console = get_team_console(S.team)
+			var/datum/antagonist/abductor/A = target.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR)
+			if(A)
+				console = get_abductor_console(A.team.team_number)
 				home = console.pad
 
 		if(!home)
-			console = get_team_console(pick(1, 2, 3, 4))
+			var/list/consoles = list()
+			for(var/obj/machinery/abductor/console/C in GLOB.machines)
+				consoles += C
+			console = pick(consoles)
 			home = console.pad
-		return 1
-
-/obj/item/implant/abductor/proc/get_team_console(var/team)
-	var/obj/machinery/abductor/console/console
-	for(var/obj/machinery/abductor/console/c in GLOB.machines)
-		if(c.team == team)
-			console = c
-			break
-	return console
+		return TRUE

code/game/objects/items/implants/implant_loyality.dm

@@ -26,7 +26,7 @@
 			qdel(src)
 			return 0
 		if(target.mind in SSticker.mode.revolutionaries)
-			SSticker.mode.remove_revolutionary(target.mind)
+			SSticker.mode.remove_revolutionary(target.mind, FALSE, user)
 		if(!silent)
 			if(target.mind in SSticker.mode.cult)
 				to_chat(target, "<span class='warning'>You feel something interfering with your mental conditioning, but you resist it!</span>")