Updating

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
2020-03-29 08:35:15 -04:00
parent 5726b848b1 2c39b14f5c
commit 0bc6a3d4b6
1941 changed files with 549957 additions and 227956 deletions
@@ -28,7 +28,7 @@
 	update_icon()

 // update the icon_state
-/obj/machinery/bluespace_beacon/update_icon()
+/obj/machinery/bluespace_beacon/update_icon_state()
 	var/state="floor_beacon"

 	if(invisibility)
@@ -9,16 +9,12 @@
 	var/list/colorlist = list()


-/obj/machinery/pdapainter/update_icon()
-	cut_overlays()
+/obj/machinery/pdapainter/update_icon_state()

 	if(stat & BROKEN)
 		icon_state = "[initial(icon_state)]-broken"
 		return

-	if(storedpda)
-		add_overlay("[initial(icon_state)]-closed")
-
 	if(powered())
 		icon_state = initial(icon_state)
 	else
@@ -26,6 +22,15 @@

 	return

+/obj/machinery/pdapainter/update_overlays()
+	. = ..()
+
+	if(stat & BROKEN)
+		return
+
+	if(storedpda)
+		. += "[initial(icon_state)]-closed"
+
 /obj/machinery/pdapainter/Initialize()
 	. = ..()
 	var/list/blocked = list(
@@ -71,7 +71,7 @@
 		reagents.maximum_volume = (500*E)


-/obj/machinery/sleeper/update_icon()
+/obj/machinery/sleeper/update_icon_state()
 	icon_state = initial(icon_state)
 	if(state_open)
 		icon_state += "-open"
@@ -185,7 +185,7 @@ Class Procs:
 		A.forceMove(T)
 		if(isliving(A))
 			var/mob/living/L = A
-			L.update_canmove()
+			L.update_mobility()
 	if(occupant)
 		SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant)
 		occupant = null
@@ -113,7 +113,7 @@
 	id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
 	master_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER

-/obj/machinery/airlock_sensor/update_icon()
+/obj/machinery/airlock_sensor/update_icon_state()
 	if(on)
 		if(alert)
 			icon_state = "airlock_sensor_alert"
@@ -29,25 +29,25 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 /obj/machinery/announcement_system/Initialize()
 	. = ..()
 	GLOB.announcement_systems += src
-	radio = new /obj/item/radio/headset/ai(src)
+	radio = new /obj/item/radio/headset/silicon/ai(src)
 	update_icon()

-/obj/machinery/announcement_system/update_icon()
+/obj/machinery/announcement_system/update_icon_state()
 	if(is_operational())
 		icon_state = (panel_open ? "AAS_On_Open" : "AAS_On")
 	else
 		icon_state = (panel_open ? "AAS_Off_Open" : "AAS_Off")

-
-	cut_overlays()
+/obj/machinery/announcement_system/update_overlays()
+	. =..()
 	if(arrivalToggle)
-		add_overlay(greenlight)
+		. += greenlight

 	if(newheadToggle)
-		add_overlay(pinklight)
+		. += pinklight

 	if(stat & BROKEN)
-		add_overlay(errorlight)
+		. += errorlight

 /obj/machinery/announcement_system/Destroy()
 	QDEL_NULL(radio)
@@ -19,21 +19,21 @@
 	initial_icon_state = initial(icon_state)
 	return ..()

-/obj/machinery/aug_manipulator/update_icon()
-	cut_overlays()
-
+/obj/machinery/aug_manipulator/update_icon_state()
 	if(stat & BROKEN)
 		icon_state = "[initial_icon_state]-broken"
 		return

-	if(storedpart)
-		add_overlay("[initial_icon_state]-closed")
-
 	if(powered())
 		icon_state = initial_icon_state
 	else
 		icon_state = "[initial_icon_state]-off"

+/obj/machinery/aug_manipulator/update_overlays()
+	. = ..()
+	if(storedpart)
+		. += "[initial_icon_state]-closed"
+
 /obj/machinery/aug_manipulator/Destroy()
 	QDEL_NULL(storedpart)
 	return ..()
@@ -47,8 +47,8 @@
 							)

 /obj/machinery/autolathe/Initialize()
-	AddComponent(/datum/component/material_container,
-	list(/datum/material/iron,
+	var/static/list/allowed_types = list(
+		/datum/material/iron,
 		/datum/material/glass,
 		/datum/material/gold,
 		/datum/material/silver,
@@ -62,10 +62,9 @@
 		/datum/material/plastic,
 		/datum/material/adamantine,
 		/datum/material/mythril
-	),
-	 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
+		)
+	AddComponent(/datum/component/material_container, allowed_types, _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert))
 	. = ..()
-
 	wires = new /datum/wires/autolathe(src)
 	stored_research = new /datum/techweb/specialized/autounlocking/autolathe
 	matching_designs = list()
@@ -140,7 +139,7 @@
 /obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted)
 	if(istype(item_inserted, /obj/item/stack/ore/bluespace_crystal))
 		use_power(MINERAL_MATERIAL_AMOUNT / 10)
-	else if(item_inserted.custom_materials?.len && item_inserted.custom_materials[getmaterialref(/datum/material/glass)])
+	else if(item_inserted.custom_materials?.len && item_inserted.custom_materials[SSmaterials.GetMaterialRef(/datum/material/glass)])
 		flick("autolathe_r",src)//plays glass insertion animation by default otherwise
 	else
 		flick("autolathe_o",src)//plays metal insertion animation
@@ -54,16 +54,17 @@
 	efficiency = E
 	productivity = P

-/obj/machinery/bloodbankgen/update_icon()
-	cut_overlays()
+/obj/machinery/bloodbankgen/update_icon_state()
 	if(is_operational())
-		icon_state = "bloodbank-on"
+		icon_state = "bloodbank-[is_operational() ? "on" : "off"]"

+/obj/machinery/bloodbankgen/update_overlays()
+	. = ..()
 	if(panel_open)
-		add_overlay("bloodbank-panel")
+		. += "bloodbank-panel"

-	if(src.bag)
-		add_overlay("bloodbag-input")
+	if(bag)
+		. += "bloodbag-input"
 		if(bag.reagents.total_volume)
 			var/mutable_appearance/filling_overlay = mutable_appearance(icon, "input-reagent")

@@ -85,10 +86,10 @@
 					filling_overlay.icon_state = "input-reagent100"

 			filling_overlay.color = list(mix_color_from_reagents(bag.reagents.reagent_list))
-			add_overlay(filling_overlay)
+			. += filling_overlay

-	if(src.outbag)
-		add_overlay("bloodbag-output")
+	if(outbag)
+		. += "bloodbag-output"
 		if(outbag.reagents.total_volume)
 			var/mutable_appearance/filling_overlay = mutable_appearance(icon, "output-reagent")

@@ -110,8 +111,7 @@
 					filling_overlay.icon_state = "output-reagent100"

 			filling_overlay.color = list(mix_color_from_reagents(outbag.reagents.reagent_list))
-			add_overlay(filling_overlay)
-	return
+			. += filling_overlay

 /obj/machinery/bloodbankgen/process()
 	if(!is_operational())
@@ -240,10 +240,10 @@
 					to_chat(AI, "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
 				else
 					to_chat(AI, "<b><a href='?src=[REF(AI)];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
-				AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
+				AI.last_paper_seen = "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
 			else if (O.client && O.client.eye == src)
 				to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
-				O << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
+				O << browse(text("<HTML><HEAD<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
 		return

 	else if(istype(I, /obj/item/camera_bug))
@@ -10,18 +10,19 @@
 	circuit = /obj/item/circuitboard/machine/cell_charger
 	pass_flags = PASSTABLE
 	var/obj/item/stock_parts/cell/charging = null
-	var/chargelevel = -1
 	var/charge_rate = 500

-/obj/machinery/cell_charger/update_icon()
-	cut_overlays()
-	if(charging)
-		add_overlay(image(charging.icon, charging.icon_state))
-		add_overlay("ccharger-on")
-		if(!(stat & (BROKEN|NOPOWER)))
-			var/newlevel = 	round(charging.percent() * 4 / 100)
-			chargelevel = newlevel
-			add_overlay("ccharger-o[newlevel]")
+/obj/machinery/cell_charger/update_overlays()
+	. += ..()
+
+	if(!charging)
+		return
+
+	. += mutable_appearance(charging.icon, charging.icon_state)
+	. += "ccharger-on"
+	if(!(stat & (BROKEN|NOPOWER)))
+		var/newlevel = round(charging.percent() * 4 / 100)
+		. += "ccharger-o[newlevel]"

 /obj/machinery/cell_charger/examine(mob/user)
 	. = ..()
@@ -54,7 +55,6 @@

 			charging = W
 			user.visible_message("[user] inserts a cell into [src].", "<span class='notice'>You insert a cell into [src].</span>")
-			chargelevel = -1
 			update_icon()
 	else
 		if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W))
@@ -77,7 +77,6 @@
 /obj/machinery/cell_charger/proc/removecell()
 	charging.update_icon()
 	charging = null
-	chargelevel = -1
 	update_icon()

 /obj/machinery/cell_charger/attack_hand(mob/user)
@@ -77,6 +77,8 @@
 	name = "cloning data disk"
 	icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
 	var/list/fields = list()
+	var/list/mutations = list()
+	var/max_mutations = 6
 	var/read_only = 0 //Well,it's still a floppy disk

 //Disk stuff.
@@ -129,7 +131,7 @@
 	return examine(user)

 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/quirks)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, datum/species/mrace, list/features, factions, list/quirks)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
@@ -165,8 +167,9 @@

 	var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)

-	H.hardset_dna(ui, se, H.real_name, null, mrace, features)
-	H.randmutb() //100% bad mutation. Can be cured with mutadone.
+	H.hardset_dna(ui, mutation_index, H.real_name, null, mrace, features)
+
+	H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) //100% bad mutation. Can be cured with mutadone.

 	H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
 	occupant = H
@@ -216,7 +219,7 @@
 	if(!is_operational()) //Autoeject if power is lost
 		if(mob_occupant)
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 			connected_message("Clone Ejected: Loss of power.")

 	else if(mob_occupant && (mob_occupant.loc == src))
@@ -226,7 +229,7 @@
 				SPEAK("The cloning has been \
 					aborted due to unrecoverable tissue failure.")
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()

 		else if(mob_occupant.cloneloss > (100 - heal_level))
 			mob_occupant.Unconscious(80)
@@ -272,7 +275,7 @@
 					BP.attach_limb(mob_occupant)

 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()

 	else if (!mob_occupant || mob_occupant.loc != src)
 		occupant = null
@@ -320,7 +323,7 @@
 			SPEAK("An emergency ejection of the current clone has occurred. Survival not guaranteed.")
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 	else
 		return ..()

@@ -418,7 +421,7 @@
 		if(mob_occupant && prob(100/(severity*efficiency)))
 			connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
 			SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of, ERROR: John Doe, prematurely." ,0))
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 			go_out()

 /obj/machinery/clonepod/ex_act(severity, target)
@@ -477,51 +480,51 @@

 	flesh_number = unattached_flesh.len

-/obj/machinery/clonepod/update_icon()
-	cut_overlays()
-
+/obj/machinery/clonepod/update_icon_state()
 	if(mess)
 		icon_state = "pod_g"
-		var/image/gib1 = image(CRYOMOBS, "gibup")
-		var/image/gib2 = image(CRYOMOBS, "gibdown")
-		gib1.pixel_y = 27 + round(sin(world.time) * 3)
-		gib1.pixel_x = round(sin(world.time * 3))
-		gib2.pixel_y = 27 + round(cos(world.time) * 3)
-		gib2.pixel_x = round(cos(world.time * 3))
-		add_overlay(gib2)
-		add_overlay(gib1)
-		add_overlay("cover-on")
-
 	else if(occupant)
 		icon_state = "pod_1"
-
-		var/image/occupant_overlay
-		var/completion = (flesh_number - unattached_flesh.len) / flesh_number
-
-		if(unattached_flesh.len <= 0)
-			occupant_overlay = image(occupant.icon, occupant.icon_state)
-			occupant_overlay.copy_overlays(occupant)
-		else
-			occupant_overlay = image(CRYOMOBS, "clone_meat")
-			var/matrix/tform = matrix()
-			tform.Scale(completion)
-			tform.Turn(cos(world.time * 2) * 3)
-			occupant_overlay.transform = tform
-			occupant_overlay.appearance_flags = 0
-
-		occupant_overlay.dir = SOUTH
-		occupant_overlay.pixel_y = 27 + round(sin(world.time) * 3)
-		occupant_overlay.pixel_x = round(sin(world.time * 3))
-
-		add_overlay(occupant_overlay)
-		add_overlay("cover-on")
 	else
 		icon_state = "pod_0"

 	if(panel_open)
 		icon_state = "pod_0_maintenance"

-	add_overlay("panel")
+/obj/machinery/clonepod/update_overlays()
+	. = ..()
+	if(mess)
+		var/mutable_appearance/gib1 = mutable_appearance(CRYOMOBS, "gibup")
+		var/mutable_appearance/gib2 = mutable_appearance(CRYOMOBS, "gibdown")
+		gib1.pixel_y = 27 + round(sin(world.time) * 3)
+		gib1.pixel_x = round(sin(world.time * 3))
+		gib2.pixel_y = 27 + round(cos(world.time) * 3)
+		gib2.pixel_x = round(cos(world.time * 3))
+		. += gib2
+		. += gib1
+	else if(occupant)
+		var/mutable_appearance/occupant_overlay
+		var/completion = (flesh_number - unattached_flesh.len) / flesh_number
+
+		if(unattached_flesh.len <= 0)
+			occupant_overlay = mutable_appearance(occupant.icon, occupant.icon_state)
+			occupant_overlay.copy_overlays(occupant)
+			. += "cover-on"
+		else
+			occupant_overlay = mutable_appearance(CRYOMOBS, "clone_meat")
+			var/matrix/tform = matrix()
+			tform.Scale(completion)
+			tform.Turn(cos(world.time * 2) * 3)
+			occupant_overlay.transform = tform
+			occupant_overlay.appearance_flags = NONE
+
+		occupant_overlay.dir = SOUTH
+		occupant_overlay.pixel_y = 27 + round(sin(world.time) * 3)
+		occupant_overlay.pixel_x = round(sin(world.time * 3))
+
+		. += occupant_overlay
+		. += "cover-on"
+	. += "panel"

 /*
 *	Manual -- A big ol' manual.
@@ -48,13 +48,13 @@
 		icon_state = initial(icon_state)
 		update_icon()

-/obj/machinery/computer/update_icon()
-	cut_overlays()
+/obj/machinery/computer/update_overlays()
+	. = ..()
 	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
 	if(stat & NOPOWER)
-		add_overlay("[icon_keyboard]_off")
+		. += "[icon_keyboard]_off"
 		return
-	add_overlay(icon_keyboard)
+	. += icon_keyboard

 	// This whole block lets screens ignore lighting and be visible even in the darkest room
 	// We can't do this for many things that emit light unfortunately because it layers over things that would be on top of it
@@ -103,21 +103,20 @@
 		add_fingerprint(usr)
 	updateUsrDialog()

-/obj/machinery/computer/aifixer/update_icon()
-	..()
+/obj/machinery/computer/aifixer/update_overlays()
+	. = ..()
 	if(stat & (NOPOWER|BROKEN))
 		return
+	if(active)
+		. += "ai-fixer-on"
+	if (occupier)
+		switch (occupier.stat)
+			if (0)
+				. += "ai-fixer-full"
+			if (2)
+				. += "ai-fixer-404"
 	else
-		if(active)
-			add_overlay("ai-fixer-on")
-		if (occupier)
-			switch (occupier.stat)
-				if (0)
-					add_overlay("ai-fixer-full")
-				if (2)
-					add_overlay("ai-fixer-404")
-		else
-			add_overlay("ai-fixer-empty")
+		. += "ai-fixer-empty"

 /obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
 	if(!..())
@@ -217,7 +217,7 @@
 							M.vomit(10, distance = 5)
 					if(ORION_TRAIL_FLUX)
 						if(prob(75))
-							M.Knockdown(60)
+							M.DefaultCombatKnockdown(60)
 							say("A sudden gust of powerful wind slams [M] into the floor!")
 							M.take_bodypart_damage(25)
 							playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
@@ -78,23 +78,20 @@
 	update_icon()
 	return

-/obj/machinery/computer/atmos_alert/update_icon()
-	..()
-	cut_overlays()
+/obj/machinery/computer/atmos_alert/update_overlays()
+	. = ..()
 	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
 	var/overlay_state = icon_screen
 	if(stat & (NOPOWER|BROKEN))
-		add_overlay("[icon_keyboard]_off")
+		. |= "[icon_keyboard]_off"
 		return
-	add_overlay(icon_keyboard)
+	. |= icon_keyboard
 	if(priority_alarms.len)
 		overlay_state = "alert:2"
-		add_overlay("alert:2")
 	else if(minor_alarms.len)
 		overlay_state = "alert:1"
-		add_overlay("alert:1")
 	else
 		overlay_state = "alert:0"
-		add_overlay("alert:0")
+	. |= overlay_state
 	SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir)
 	SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir, alpha=128)
@@ -41,7 +41,7 @@
 	name = "incinerator chamber gas sensor"
 	id_tag = ATMOS_GAS_MONITOR_SENSOR_INCINERATOR

-/obj/machinery/air_sensor/update_icon()
+/obj/machinery/air_sensor/update_icon_state()
 		icon_state = "gsensor[on]"

 /obj/machinery/air_sensor/process_atmos()
@@ -175,11 +175,10 @@
 	clockwork = TRUE //it'd look very weird
 	light_power = 0

-/obj/machinery/computer/security/telescreen/update_icon()
+/obj/machinery/computer/security/telescreen/update_icon_state()
 	icon_state = initial(icon_state)
 	if(stat & BROKEN)
 		icon_state += "b"
-	return

 /obj/machinery/computer/security/telescreen/entertainment
 	name = "entertainment monitor"
@@ -485,7 +485,7 @@
 	R.fields["id"] = copytext_char(md5(mob_occupant.real_name), 2, 6)
 	R.fields["UE"] = dna.unique_enzymes
 	R.fields["UI"] = dna.uni_identity
-	R.fields["SE"] = dna.struc_enzymes
+	R.fields["SE"] = dna.mutation_index
 	R.fields["blood_type"] = dna.blood_type
 	R.fields["features"] = dna.features
 	R.fields["factions"] = mob_occupant.faction
@@ -15,6 +15,7 @@
 	var/message_cooldown = 0
 	var/ai_message_cooldown = 0
 	var/tmp_alertlevel = 0
+	var/static/security_level_cd // used to stop mass spam.
 	var/const/STATE_DEFAULT = 1
 	var/const/STATE_CALLSHUTTLE = 2
 	var/const/STATE_CANCELSHUTTLE = 3
@@ -94,16 +95,18 @@
 				I = pda.id
 			if (I && istype(I))
 				if(ACCESS_CAPTAIN in I.access)
+					if(security_level_cd > world.time)
+						to_chat(usr, "<span class='warning'>Security level protocols are currently on cooldown. Please stand by.</span>")
+						return
 					var/old_level = GLOB.security_level
 					if(!tmp_alertlevel)
 						tmp_alertlevel = SEC_LEVEL_GREEN
 					if(tmp_alertlevel < SEC_LEVEL_GREEN)
 						tmp_alertlevel = SEC_LEVEL_GREEN
-					if(tmp_alertlevel == SEC_LEVEL_BLUE)
-						tmp_alertlevel = SEC_LEVEL_BLUE
 					if(tmp_alertlevel > SEC_LEVEL_AMBER)
 						tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
 					set_security_level(tmp_alertlevel)
+					security_level_cd = world.time + 15 SECONDS
 					if(GLOB.security_level != old_level)
 						to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
 						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -194,7 +197,7 @@
 				state = STATE_CANCELSHUTTLE
 		if("cancelshuttle2")
 			if(authenticated)
-				if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) //Citadel Edit Removing auto_call caused recall.
+				if(SSshuttle.endvote_passed) //Citadel Edit - endvote passing = no recalls
 					say("Warning: Emergency shuttle recalls have been blocked by Central Command due to ongoing crew transfer procedures.")
 				else
 					SSshuttle.cancelEvac(usr)
@@ -376,19 +379,21 @@
 		if("ai-announce")
 			make_announcement(usr, 1)
 		if("ai-securitylevel")
+			if(security_level_cd > world.time)
+				to_chat(usr, "<span class='warning'>Security level protocols are currently on cooldown. Please stand by.</span>")
+				return
 			tmp_alertlevel = text2num( href_list["newalertlevel"] )
 			if(!tmp_alertlevel)
-				tmp_alertlevel = 0
+				tmp_alertlevel = SEC_LEVEL_GREEN
 			var/old_level = GLOB.security_level
 			if(!tmp_alertlevel)
 				tmp_alertlevel = SEC_LEVEL_GREEN
 			if(tmp_alertlevel < SEC_LEVEL_GREEN)
 				tmp_alertlevel = SEC_LEVEL_GREEN
-			if(tmp_alertlevel == SEC_LEVEL_BLUE)
-				tmp_alertlevel = SEC_LEVEL_BLUE
 			if(tmp_alertlevel > SEC_LEVEL_AMBER)
 				tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
 			set_security_level(tmp_alertlevel)
+			security_level_cd = world.time + 15 SECONDS
 			if(GLOB.security_level != old_level)
 				//Only notify people if an actual change happened
 				var/security_level = get_security_level()
@@ -40,6 +40,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Geneticist"] = 22
 	jobs["Virologist"] = 23
 	jobs["Medical Doctor"] = 24
+	jobs["Paramedic"] = 25
 	jobs["Research Director"] = 30
 	jobs["Scientist"] = 31
 	jobs["Roboticist"] = 32
@@ -207,4 +208,4 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		if ("select_person")
 			AI.ai_camera_track(params["name"])

-#undef SENSORS_UPDATE_PERIOD
+#undef SENSORS_UPDATE_PERIOD
@@ -1,14 +1,16 @@
 #define INJECTOR_TIMEOUT 100
-#define REJUVENATORS_INJECT 15
-#define REJUVENATORS_MAX 90
 #define NUMBER_OF_BUFFERS 3
+#define SCRAMBLE_TIMEOUT 600
+#define JOKER_TIMEOUT 12000					//20 minutes
+#define JOKER_UPGRADE 1800

 #define RADIATION_STRENGTH_MAX 15
-#define RADIATION_STRENGTH_MULTIPLIER 1			//larger has a more range
+#define RADIATION_STRENGTH_MULTIPLIER 1			//larger has more range

 #define RADIATION_DURATION_MAX 30
 #define RADIATION_ACCURACY_MULTIPLIER 3			//larger is less accurate

+
 #define RADIATION_IRRADIATION_MULTIPLIER 1		//multiplier for how much radiation a test subject receives

 #define SCANNER_ACTION_SE 1
@@ -23,22 +25,44 @@
 	icon_keyboard = "med_key"
 	density = TRUE
 	circuit = /obj/item/circuitboard/computer/scan_consolenew
-	var/radduration = 2
-	var/radstrength = 1

-	var/list/buffer[NUMBER_OF_BUFFERS]
-
-	var/injectorready = 0	//world timer cooldown var
-	var/current_screen = "mainmenu"
-	var/obj/machinery/dna_scannernew/connected = null
-	var/obj/item/disk/data/diskette = null
-	var/list/delayed_action = null
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 10
 	active_power_usage = 400
-
 	light_color = LIGHT_COLOR_BLUE

+	var/datum/techweb/stored_research
+	var/max_storage = 6
+	var/combine
+	var/radduration = 2
+	var/radstrength = 1
+	var/max_chromosomes = 6
+
+	///Amount of mutations we can store
+	var/list/buffer[NUMBER_OF_BUFFERS]
+	///mutations we have stored
+	var/list/stored_mutations = list()
+	///chromosomes we have stored
+	var/list/stored_chromosomes = list()
+	///combinations of injectors for the 'injector selection'. format is list("Elsa" = list(Cryokinesis, Geladikinesis), "The Hulk" = list(Hulk, Gigantism), etc) Glowy and the gang being an initialized datum
+	var/list/injector_selection = list()
+	///max amount of selections you can make
+	var/max_injector_selections = 2
+	///hard-cap on the advanced dna injector
+	var/max_injector_mutations = 10
+	///the max instability of the advanced injector.
+	var/max_injector_instability = 50
+
+	var/injectorready = 0	//world timer cooldown var
+	var/jokerready = 0
+	var/scrambleready = 0
+	var/current_screen = "mainmenu"
+	var/current_mutation   //what block are we inspecting? only used when screen = "info"
+	var/current_storage   //what storage block are we looking at?
+	var/obj/machinery/dna_scannernew/connected = null
+	var/obj/item/disk/data/diskette = null
+	var/list/delayed_action = null
+
 /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params)
 	if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES
 		if (!src.diskette)
@@ -48,6 +72,28 @@
 			to_chat(user, "<span class='notice'>You insert [I].</span>")
 			src.updateUsrDialog()
 			return
+	if (istype(I, /obj/item/chromosome))
+		if(LAZYLEN(stored_chromosomes) < max_chromosomes)
+			I.forceMove(src)
+			stored_chromosomes += I
+			to_chat(user, "<span class='notice'>You insert [I].</span>")
+		else
+			to_chat(user, "<span class='warning'>You cannot store any more chromosomes!</span>")
+		return
+	if(istype(I, /obj/item/dnainjector/activator))
+		var/obj/item/dnainjector/activator/A = I
+		if(A.used)
+			to_chat(user,"<span class='notice'>Recycled [I].</span>")
+			if(A.research)
+				var/c_typepath = generate_chromosome()
+				var/obj/item/chromosome/CM = new c_typepath (drop_location())
+				to_chat(user,"<span class='notice'>Recycled [I].</span>")
+				if((LAZYLEN(stored_chromosomes) < max_chromosomes) && prob(60))
+					CM.forceMove(src)
+					stored_chromosomes += CM
+					to_chat(user,"<span class='notice'>[capitalize(CM.name)] added to storage.</span>")
+			qdel(I)
+			return
 	else
 		return ..()

@@ -58,12 +104,26 @@
 		if(!isnull(connected))
 			break
 	injectorready = world.time + INJECTOR_TIMEOUT
+	scrambleready = world.time + SCRAMBLE_TIMEOUT
+	jokerready = world.time + JOKER_TIMEOUT
+
+	stored_research = SSresearch.science_tech
+
+/obj/machinery/computer/scan_consolenew/examine(mob/user)
+	. = ..()
+	if(jokerready < world.time)
+		. += "<span class='notice'>JOKER algorithm available.</span>"
+	else
+		. += "<span class='notice'>JOKER algorithm available in about [round(0.00166666667 * (jokerready - world.time))] minutes."

 /obj/machinery/computer/scan_consolenew/ui_interact(mob/user, last_change)
 	. = ..()
 	if(!user)
 		return
 	var/datum/browser/popup = new(user, "scannernew", "DNA Modifier Console", 800, 630) // Set up the popup browser window
+	if(user.client)
+		var/datum/asset/simple/assets =  get_asset_datum(/datum/asset/simple/genetics)
+		assets.send(user.client)
 	if(!(in_range(src, user) || hasSiliconAccessInArea(user)))
 		popup.close()
 		return
@@ -76,7 +136,7 @@
 	if(connected && connected.is_operational())
 		if(connected.occupant)	//set occupant_status message
 			viable_occupant = connected.occupant
-			if(viable_occupant.has_dna() && !HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(viable_occupant, TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
+			if(viable_occupant.has_dna() && !HAS_TRAIT_NOT_FROM(viable_occupant, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) && !HAS_TRAIT(viable_occupant, TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
 				occupant_status += "[viable_occupant.name] => "
 				switch(viable_occupant.stat)
 					if(CONSCIOUS)
@@ -88,8 +148,6 @@
 				occupant_status += "</div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Health:</div><div class='progressBar'><div style='width: [viable_occupant.health]%;' class='progressFill good'></div></div><div class='statusValue'>[viable_occupant.health] %</div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Radiation Level:</div><div class='progressBar'><div style='width: [viable_occupant.radiation/(RAD_MOB_SAFE/100)]%;' class='progressFill bad'></div></div><div class='statusValue'>[viable_occupant.radiation/(RAD_MOB_SAFE/100)] %</div></div>"
-				var/rejuvenators = viable_occupant.reagents.get_reagent_amount(/datum/reagent/medicine/potass_iodide)
-				occupant_status += "<div class='line'><div class='statusLabel'>Rejuvenators:</div><div class='progressBar'><div style='width: [round((rejuvenators / REJUVENATORS_MAX) * 100)]%;' class='progressFill highlight'></div></div><div class='statusValue'>[rejuvenators] units</div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Unique Enzymes :</div><div class='statusValue'><span class='highlight'>[viable_occupant.dna.unique_enzymes]</span></div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Last Operation:</div><div class='statusValue'>[last_change ? last_change : "----"]</div></div>"
 			else
@@ -147,28 +205,61 @@
 			buttons += "<a href='?src=[REF(src)];task=togglelock;'>[connected.locked ? "Unlock" : "Lock"] Scanner</a>"
 	else
 		buttons += "<span class='linkOff'>Open Scanner</span> <span class='linkOff'>Lock Scanner</span>"
-	if(viable_occupant)
-		buttons += "<a href='?src=[REF(src)];task=rejuv'>Inject Rejuvenators</a>"
+	if(viable_occupant && (scrambleready < world.time))
+		buttons += "<a href='?src=[REF(src)];task=scramble'>Scramble DNA</a>"
 	else
-		buttons += "<span class='linkOff'>Inject Rejuvenators</span>"
+		buttons += "<span class='linkOff'>Scramble DNA</span>"
 	if(diskette)
-		buttons += "<a href='?src=[REF(src)];task=ejectdisk'>Eject Disk</a>"
+		buttons += "<a href='?src=[REF(src)];task=screen;text=disk;'>Disk</a>"
 	else
-		buttons += "<span class='linkOff'>Eject Disk</span>"
-	if(current_screen == "buffer")
-		buttons += "<a href='?src=[REF(src)];task=screen;text=mainmenu;'>Radiation Emitter Menu</a>"
+		buttons += "<span class='linkOff'>Disk</span>"
+	if(current_screen == "mutations")
+		buttons += "<span class='linkOff'>Mutations</span>"
 	else
-		buttons += "<a href='?src=[REF(src)];task=screen;text=buffer;'>Buffer Menu</a>"
-
+		buttons += "<a href='?src=[REF(src)];task=screen;text=mutations;'>Mutations</a>"
+	if((current_screen == "mainmenu") || !current_screen)
+		buttons += "<span class='linkOff'>Genetic Sequencer</span>"
+	else
+		buttons += "<a href='?src=[REF(src)];task=screen;text=mainmenu;'>Genetic Sequencer</a>"
+	if(current_screen == "ui")
+		buttons += "<span class='linkOff'>Unique Identifiers</span>"
+	else
+		buttons += "<a href='?src=[REF(src)];task=screen;text=ui;'>Unique Identifiers</a>"
+	if(current_screen == "advinjector")
+		buttons += "<span class='linkOff'>Adv. Injectors</span>"
+	else
+		buttons += "<a href='?src=[REF(src)];task=screen;text=advinjector;'>Adv. Injectors</a>"
 	switch(current_screen)
 		if("working")
 			temp_html += status
 			temp_html += "<h1>System Busy</h1>"
 			temp_html += "Working ... Please wait ([DisplayTimeText(radduration*10)])"
-		if("buffer")
+		if("ui")
 			temp_html += status
 			temp_html += buttons
-			temp_html += "<h1>Buffer Menu</h1>"
+			temp_html += "<h1>Unique Identifiers</h1>"
+			temp_html += "<a href='?src=[REF(src)];task=setstrength;num=[radstrength-1];'>--</a> <a href='?src=[REF(src)];task=setstrength;'>Output Level</a> <a href='?src=[REF(src)];task=setstrength;num=[radstrength+1];'>++</a>"
+			temp_html += "<br><a href='?src=[REF(src)];task=setduration;num=[radduration-1];'>--</a> <a href='?src=[REF(src)];task=setduration;'>Pulse Duration</a> <a href='?src=[REF(src)];task=setduration;num=[radduration+1];'>++</a>"
+			temp_html += "<h3>Irradiate Subject</h3>"
+			temp_html += "<div class='line'><div class='statusLabel'>Unique Identifier:</div><div class='statusValue'><div class='clearBoth'>"
+			var/max_line_len = 7*DNA_BLOCK_SIZE
+			if(viable_occupant)
+				temp_html += "<div class='dnaBlockNumber'>1</div>"
+				var/char = ""
+				var/ui_text = viable_occupant.dna.uni_identity
+				var/len_byte = length(ui_text)
+				var/char_it = 0
+				for(var/byte_it = 1, byte_it <= len_byte, byte_it += length(char))
+					char_it++
+					char = ui_text[byte_it]
+					temp_html += "<a class='dnaBlock' href='?src=[REF(src)];task=pulseui;num=[char_it];'>[char]</a>"
+					if((char_it % max_line_len) == 0)
+						temp_html += "</div><div class='clearBoth'>"
+					if((char_it % DNA_BLOCK_SIZE) == 0 && byte_it < len_byte)
+						temp_html += "<div class='dnaBlockNumber'>[(char_it / DNA_BLOCK_SIZE) + 1]</div>"
+			else
+				temp_html += "---------"
+			temp_html += "</div></div><br><h1>Buffer Menu</h1>"

 			if(istype(buffer))
 				for(var/i=1, i<=buffer.len, i++)
@@ -188,7 +279,6 @@
 						temp_html += "<span class='linkOff'>Save to Disk</span>"
 					else
 						var/ui = buffer_slot["UI"]
-						var/se = buffer_slot["SE"]
 						var/ue = buffer_slot["UE"]
 						var/name = buffer_slot["name"]
 						var/label = buffer_slot["label"]
@@ -234,19 +324,6 @@
 								temp_html += "<a href='?src=[REF(src)];task=injector;num=[i];text=mixed'>UI+UE Injector</a>"
 							else
 								temp_html += "<span class='linkOff'>UI+UE Injector</span>"
-						if(se)
-							temp_html += "<br>\tSE: [se] "
-							if(viable_occupant)
-								temp_html += "<a href='?src=[REF(src)];task=transferbuffer;num=[i];text=se'>Occupant</a>"
-							else
-								temp_html += "<span class='linkOff'>Occupant</span>"
-							temp_html += "<a href='?src=[REF(src)];task=setdelayed;num=[i];delayaction=[SCANNER_ACTION_SE]'>Occupant:Delayed</a>"
-							if(injectorready < world.time )
-								temp_html += "<a href='?src=[REF(src)];task=injector;num=[i];text=se'>Injector</a>"
-							else
-								temp_html += "<span class='linkOff'>Injector</span>"
-						else
-							temp_html += "<br>\tSE: No Data"
 						if(viable_occupant)
 							temp_html += "<br><a href='?src=[REF(src)];task=setbuffer;num=[i];'>Save to Buffer</a>"
 						else
@@ -260,58 +337,225 @@
 							temp_html += "<a href='?src=[REF(src)];task=savedisk;num=[i];'>Save to Disk</a>"
 						else
 							temp_html += "<span class='linkOff'>Save to Disk</span>"
+		if("disk")
+			temp_html += status
+			temp_html += buttons
+			if(diskette)
+				temp_html += "<h3>[diskette.name]</h3><br>"
+				temp_html += "<a href='?src=[REF(src)];task=ejectdisk'>Eject Disk</a><br>"
+				if(LAZYLEN(diskette.mutations))
+					temp_html += "<table>"
+					for(var/datum/mutation/human/A in diskette.mutations)
+						temp_html += "<tr><td><span class='linkOff'>[A.name]</span></td>"
+						temp_html += "<td><a href='?src=[REF(src)];task=deletediskmut;num=[diskette.mutations.Find(A)];'>Delete</a></td>"
+						if(LAZYLEN(stored_mutations) < max_storage)
+							temp_html += "<td><a href='?src=[REF(src)];task=importdiskmut;num=[diskette.mutations.Find(A)];'>Import</a></td>"
+						else
+							temp_html += "<td><td><span class='linkOff'>Import</span></td>"
+						temp_html += "</tr>"
+					temp_html += "</table>"
+			else
+				temp_html += "<br>Load diskette to start ----------"
+		if("info")
+			if(LAZYLEN(stored_mutations))
+				if(LAZYLEN(stored_mutations) >= current_storage)
+					var/datum/mutation/human/HM = stored_mutations[current_storage]
+					if(HM)
+						temp_html += display_sequence(HM.type, current_storage)
+			else
+				current_screen = "mainmenu"
+		if("mutations")
+			temp_html += status
+			temp_html += buttons
+			temp_html += "<h3>Mutation Storage:<br></h3>"
+			temp_html += "<table>"
+			for(var/datum/mutation/human/HM in stored_mutations)
+				var/i = stored_mutations.Find(HM)
+				temp_html += "<tr><td><a href='?src=[REF(src)];task=inspectstorage;num=[i]'>[HM.name]</a></td>"
+				temp_html += "<td><a href='?src=[REF(src)];task=exportdiskmut;path=[HM.type]'>Export</a></td>"
+				temp_html += "<td><a href='?src=[REF(src)];task=deletemut;num=[i]'>Delete</a></td>"
+				if(combine == HM.type)
+					temp_html += "<td><span class='linkOff'>Combine</span></td></tr>"
+				else
+					temp_html += "<td><a href='?src=[REF(src)];task=combine;num=[i]'>Combine</a></td></tr>"
+			temp_html += "</table><br>"
+			temp_html += "<h3>Chromosome Storage:<br></h3>"
+			temp_html += "<table>"
+			for(var/i in 1 to stored_chromosomes.len)
+				var/obj/item/chromosome/CM = stored_chromosomes[i]
+				temp_html += "<td><a href='?src=[REF(src)];task=ejectchromosome;num=[i]'>[CM.name]</a></td><br>"
+			temp_html += "</table>"
+		if("advinjector")
+			temp_html += status
+			temp_html += buttons
+			temp_html += "<div class='line'><div class='statusLabel'><b>Advanced Injectors:</b></div></div><br>"
+			temp_html += "<div class='statusLine'><a href='?src=[REF(src)];task=add_advinjector;'>New Selection</a></div>"
+			for(var/A in injector_selection)
+				temp_html += "<div class='statusDisplay'><b>[A]</b>"
+				var/list/true_selection = injector_selection[A]
+				temp_html += "<br>"
+				for(var/B in true_selection)
+					var/datum/mutation/human/HM = B
+					var/mutcolor
+					switch(HM.quality)
+						if(POSITIVE)
+							mutcolor = "good"
+						if(MINOR_NEGATIVE)
+							mutcolor = "average"
+						if(NEGATIVE)
+							mutcolor = "bad"
+					temp_html += "<div class='statusLine'><span class='[mutcolor]'>[HM.name] </span>"
+					temp_html += "<a href='?src=[REF(src)];task=remove_from_advinjector;injector=[A];path=[HM.type];'>Remove</a></div>"
+				if (injectorready < world.time)
+					temp_html += "<div class='statusLine'> <a href='?src=[REF(src)];task=advinjector;injector=[A];'>Print Advanced Injector</a>"
+				else
+					temp_html += "<div class='statusLine'> <span class='linkOff'>Print Advanced Injector</span>"
+				temp_html += "<a href='?src=[REF(src)];task=remove_advinjector;injector=[A];'>Remove Injector</a></div>"
+				temp_html += "<br></div>"
 		else
 			temp_html += status
 			temp_html += buttons
-			temp_html += "<h1>Radiation Emitter Menu</h1>"
-
-			temp_html += "<a href='?src=[REF(src)];task=setstrength;num=[radstrength-1];'>--</a> <a href='?src=[REF(src)];task=setstrength;'>Output Level</a> <a href='?src=[REF(src)];task=setstrength;num=[radstrength+1];'>++</a>"
-			temp_html += "<br><a href='?src=[REF(src)];task=setduration;num=[radduration-1];'>--</a> <a href='?src=[REF(src)];task=setduration;'>Pulse Duration</a> <a href='?src=[REF(src)];task=setduration;num=[radduration+1];'>++</a>"
-
-			temp_html += "<h3>Irradiate Subject</h3>"
-			temp_html += "<div class='line'><div class='statusLabel'>Unique Identifier:</div><div class='statusValue'><div class='clearBoth'>"
-
-			var/max_line_len = 7*DNA_BLOCK_SIZE
+			temp_html += "<div class='line'><div class='statusLabel'>Genetic Sequence:</div><br>"
 			if(viable_occupant)
-				temp_html += "<div class='dnaBlockNumber'>1</div>"
-				var/char = ""
-				var/ui_text = viable_occupant.dna.uni_identity
-				var/len_byte = length(ui_text)
-				var/char_it = 0
-				for(var/byte_it = 1, byte_it <= len_byte, byte_it += length(char))
-					char_it++
-					char = ui_text[byte_it]
-					temp_html += "<a class='dnaBlock' href='?src=[REF(src)];task=pulseui;num=[char_it];'>[char]</a>"
-					if((char_it % max_line_len) == 0)
-						temp_html += "</div><div class='clearBoth'>"
-					if((char_it % DNA_BLOCK_SIZE) == 0 && byte_it < len_byte)
-						temp_html += "<div class='dnaBlockNumber'>[(char_it / DNA_BLOCK_SIZE) + 1]</div>"
+				if(viable_occupant)
+					for(var/A in get_mutation_list())
+						temp_html += display_inactive_sequence(A)
+					temp_html += "<br>"
+				else
+					temp_html += "----"
+				if(viable_occupant && (current_mutation in get_mutation_list(viable_occupant)))
+					temp_html += display_sequence(current_mutation)
+				temp_html += "</div><br>"
 			else
-				temp_html += "----"
-			temp_html += "</div></div></div><br>"
-
-			temp_html += "<br><div class='line'><div class='statusLabel'>Structural Enzymes:</div><div class='statusValue'><div class='clearBoth'>"
-			if(viable_occupant)
-				temp_html += "<div class='dnaBlockNumber'>1</div>"
-				var/char = ""
-				var/se_text = viable_occupant.dna.struc_enzymes
-				var/len_byte = length(se_text)
-				var/char_it = 0
-				for(var/byte_it = 1, byte_it <= len_byte, byte_it += length(char))
-					char_it++
-					char = se_text[byte_it]
-					temp_html += "<a class='dnaBlock' href='?src=[REF(src)];task=pulsese;num=[char_it];'>[char]</a>"
-					if((char_it % max_line_len) == 0)
-						temp_html += "</div><div class='clearBoth'>"
-					if((char_it % DNA_BLOCK_SIZE) == 0 && byte_it < len_byte)
-						temp_html += "<div class='dnaBlockNumber'>[(char_it / DNA_BLOCK_SIZE) + 1]</div>"
-			else
-				temp_html += "----"
-			temp_html += "</div></div></div>"
+				temp_html += "----------"

 	popup.set_content(temp_html.Join())
 	popup.open()

+/obj/machinery/computer/scan_consolenew/proc/display_inactive_sequence(mutation)
+	var/temp_html = ""
+	var/class = "unselected"
+	var/mob/living/carbon/viable_occupant = get_viable_occupant()
+	if(!viable_occupant)
+		return
+
+	var/location = viable_occupant.dna.mutation_index.Find(mutation) //We do this because we dont want people using sysexp or similair tools to just read the mutations.
+
+	if(!location) //Do this only when needed, dont make a list with mutations for every iteration if you dont need to
+		var/list/mutations = get_mutation_list(TRUE)
+		if(mutation in mutations)
+			location = mutations.Find(mutation)
+	if(mutation == current_mutation)
+		class = "selected"
+	if(location > DNA_MUTATION_BLOCKS)
+		temp_html += "<a class='clean' href='?src=[REF(src)];task=inspect;num=[location];'><img class='[class]' src='dna_extra.gif' width = '65'  alt='Extra Mutation'></a>"
+	else if(mutation in stored_research.discovered_mutations)
+		temp_html += "<a class='clean' href='?src=[REF(src)];task=inspect;num=[location];'><img class='[class]' src='dna_discovered.gif' width = '65'  alt='Discovered Mutation'></a>"
+	else
+		temp_html += "<a class='clean' clean href='?src=[REF(src)];task=inspect;num=[location];'><img class='[class]' src='dna_undiscovered.gif' width = '65' alt=Undiscovered Mutation'></a>"
+	return temp_html
+
+/obj/machinery/computer/scan_consolenew/proc/display_sequence(mutation, storage_slot) //Storage slot is for when viewing from the stored mutations
+	var/temp_html = ""
+	if(!mutation)
+		temp_html += "ERR-"
+		return
+	var/mut_name = "Unknown gene"
+	var/mut_desc = "No information available."
+	var/alias
+	var/discovered = FALSE
+	var/active = FALSE
+	var/scrambled = FALSE
+	var/instability
+	var/mob/living/carbon/viable_occupant = get_viable_occupant()
+	var/datum/mutation/human/HM = get_valid_mutation(mutation)
+
+	if(viable_occupant)
+		var/datum/mutation/human/M = viable_occupant.dna.get_mutation(mutation)
+		if(M)
+			scrambled = M.scrambled
+			active = TRUE
+	var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation)
+	alias = A.alias
+	if(active && !scrambled)
+		discover(mutation)
+	if(stored_research && (mutation in stored_research.discovered_mutations))
+		mut_name = A.name
+		mut_desc = A.desc
+		discovered = TRUE
+		instability = A.instability
+	var/extra
+	if(viable_occupant && !(storage_slot || viable_occupant.dna.mutation_in_sequence(mutation)))
+		extra = TRUE
+
+	if(discovered && !scrambled)
+		var/mutcolor
+		switch(A.quality)
+			if(POSITIVE)
+				mutcolor = "good"
+			if(MINOR_NEGATIVE)
+				mutcolor = "average"
+			if(NEGATIVE)
+				mutcolor = "bad"
+		if(HM)
+			instability *= GET_MUTATION_STABILIZER(HM)
+		temp_html += "<div class='statusDisplay'><div class='statusLine'><span class='[mutcolor]'><b>[mut_name]</b></span><small> ([alias])</small><br>"
+		temp_html += "<div class='statusLine'>Instability : [round(instability)]</span><br>"
+	else
+		temp_html += "<div class='statusDisplay'><div class='statusLine'><b>[alias]</b><br>"
+	temp_html += "<div class='statusLine'>[mut_desc]<br></div>"
+	if(active && !storage_slot)
+		if(HM?.can_chromosome && (HM in viable_occupant.dna.mutations))
+			var/i = viable_occupant.dna.mutations.Find(HM)
+			var/chromosome_name = "<a href='?src=[REF(src)];task=applychromosome;path=[mutation];num=[i];'>----</a>"
+			if(HM.chromosome_name)
+				chromosome_name = HM.chromosome_name
+			temp_html += "<div class='statusLine'>Chromosome status: [chromosome_name]<br></div>"
+	temp_html += "<div class='statusLine'>Sequence:<br><br></div>"
+	if(!scrambled)
+		for(var/block in 1 to A.blocks)
+			var/whole_sequence = get_valid_gene_string(mutation)
+			var/sequence = copytext(whole_sequence, 1+(block-1)*(DNA_SEQUENCE_LENGTH*2),(DNA_SEQUENCE_LENGTH*2*block+1))
+			temp_html += "<div class='statusLine'><table class='statusDisplay'><tr>"
+			for(var/i in 1 to DNA_SEQUENCE_LENGTH)
+				var/num = 1+(i-1)*2
+				var/genenum = num+(DNA_SEQUENCE_LENGTH*2*(block-1))
+				temp_html += "<td><div class='statusLine'><span class='dnaBlockNumber'><a href='?src=[REF(src)];task=pulsegene;num=[genenum];path=[mutation];'>[sequence[num]]</span></a></div></td>"
+			temp_html += "</tr><tr>"
+			for(var/i in 1 to DNA_SEQUENCE_LENGTH)
+				temp_html += "<td><div class='statusLine'>|</div></td>"
+			temp_html += "</tr><tr>"
+			for(var/i in 1 to DNA_SEQUENCE_LENGTH)
+				var/num = i*2
+				var/genenum = num+(DNA_SEQUENCE_LENGTH*2*(block-1))
+				temp_html += "<td><div class='statusLine'><span class='dnaBlockNumber'><a href='?src=[REF(src)];task=pulsegene;num=[genenum];path=[mutation];'>[sequence[num]]</span></a></div></td>"
+			temp_html += "</tr></table></div>"
+		temp_html += "<br><br><br><br><br>"
+	else
+		temp_html = "<div class='statusLine'>Sequence unreadable due to unpredictable mutation.</div>"
+	if((active || storage_slot) && (injectorready < world.time) && !scrambled)
+		temp_html += "<a href='?src=[REF(src)];task=activator;path=[mutation];slot=[storage_slot];'>Print Activator</a>"
+		temp_html += "<a href='?src=[REF(src)];task=mutator;path=[mutation];slot;=[storage_slot];'>Print Mutator</a>"
+	else
+		temp_html += "<span class='linkOff'>Print Activator</span>"
+		temp_html += "<span class='linkOff'>Print Mutator</span>"
+	temp_html += "<br><div class='statusLine'>"
+	if(storage_slot)
+		temp_html += "<a href='?src=[REF(src)];task=deletemut;num=[storage_slot];'>Delete</a>"
+		if((LAZYLEN(stored_mutations) < max_storage) && diskette && !diskette.read_only)
+			temp_html += "<a href='?src=[REF(src)];task=exportdiskmut;path=[mutation];'>Export</a>"
+		else
+			temp_html += "<span class='linkOff'>Export</span>"
+		temp_html += "<a href='?src=[REF(src)];task=screen;text=mutations;'>Back</a>"
+	else if(active && !scrambled)
+		temp_html += "<a href='?src=[REF(src)];task=savemut;path=[mutation];'>Store</a>"
+		temp_html += "<a href='?src=[REF(src)];task=expand_advinjector;path=[mutation];'>Adv. Injector</a>"
+	if(extra || scrambled)
+		temp_html += "<a href='?src=[REF(src)];task=nullify;'>Nullify</a>"
+	else
+		temp_html += "<span class='linkOff'>Nullify</span>"
+	temp_html += "</div></div>"
+	return temp_html

 /obj/machinery/computer/scan_consolenew/Topic(href, href_list)
 	if(..())
@@ -350,13 +594,15 @@
 				radstrength = WRAP(num, 1, RADIATION_STRENGTH_MAX+1)
 		if("screen")
 			current_screen = href_list["text"]
-		if("rejuv")
-			if(viable_occupant && viable_occupant.reagents)
-				var/potassiodide_amount = viable_occupant.reagents.get_reagent_amount(/datum/reagent/medicine/potass_iodide)
-				var/can_add = max(min(REJUVENATORS_MAX - potassiodide_amount, REJUVENATORS_INJECT), 0)
-				viable_occupant.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, can_add)
+		if("scramble")
+			if(viable_occupant && (scrambleready < world.time))
+				viable_occupant.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA))
+				viable_occupant.dna.generate_dna_blocks()
+				scrambleready = world.time + SCRAMBLE_TIMEOUT
+				to_chat(usr,"<span class'notice'>DNA scrambled.</span>")
+				viable_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER*50/(connected.damage_coeff ** 2)
 		if("setbufferlabel")
-			var/text = sanitize(input(usr, "Input a new label:", "Input an Text", null) as text|null)
+			var/text = sanitize(input(usr, "Input a new label:", "Input a Text", null) as text|null)
 			if(num && text)
 				num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
 				var/list/buffer_slot = buffer[num]
@@ -368,7 +614,6 @@
 				buffer[num] = list(
 					"label"="Buffer[num]:[viable_occupant.real_name]",
 					"UI"=viable_occupant.dna.uni_identity,
-					"SE"=viable_occupant.dna.struc_enzymes,
 					"UE"=viable_occupant.dna.unique_enzymes,
 					"name"=viable_occupant.real_name,
 					"blood_type"=viable_occupant.dna.blood_type
@@ -382,8 +627,6 @@
 		if("transferbuffer")
 			if(num && viable_occupant)
 				switch(href_list["text"])                                                                            //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove
-					if("se")
-						apply_buffer(SCANNER_ACTION_SE,num)
 					if("ui")
 						apply_buffer(SCANNER_ACTION_UI,num)
 					if("ue")
@@ -397,28 +640,6 @@
 				if(istype(buffer_slot))
 					var/obj/item/dnainjector/timed/I
 					switch(href_list["text"])
-						if("se")
-							if(buffer_slot["SE"])
-								I = new /obj/item/dnainjector/timed(loc)
-								var/powers = 0
-								for(var/datum/mutation/human/HM in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations)
-									if(HM.check_block_string(buffer_slot["SE"]))
-										I.add_mutations.Add(HM)
-										if(HM in GLOB.good_mutations)
-											powers += 1
-										if(HM in GLOB.bad_mutations + GLOB.not_good_mutations)
-											powers -= 1 //To prevent just unlocking everything to get all powers to a syringe for max tech
-									else
-										I.remove_mutations.Add(HM)
-								var/time_coeff
-								for(var/datum/mutation/human/HM in I.add_mutations)
-									if(!time_coeff)
-										time_coeff = HM.time_coeff
-										continue
-									time_coeff = min(time_coeff,HM.time_coeff)
-								if(connected)
-									I.duration = I.duration * time_coeff * connected.damage_coeff
-									I.damage_coeff  = connected.damage_coeff
 						if("ui")
 							if(buffer_slot["UI"])
 								I = new /obj/item/dnainjector/timed(loc)
@@ -457,7 +678,7 @@
 		if("setdelayed")
 			if(num)
 				delayed_action = list("action"=text2num(href_list["delayaction"]),"buffer"=num)
-		if("pulseui","pulsese")
+		if("pulseui")
 			if(num && viable_occupant && connected)
 				radduration = WRAP(radduration, 1, RADIATION_DURATION_MAX+1)
 				radstrength = WRAP(radstrength, 1, RADIATION_STRENGTH_MAX+1)
@@ -469,7 +690,7 @@
 				ui_interact(usr)

 				sleep(radduration*10)
-				current_screen = "mainmenu"
+				current_screen = "ui"

 				if(viable_occupant && connected && connected.occupant==viable_occupant)
 					viable_occupant.radiation += (RADIATION_IRRADIATION_MULTIPLIER*radduration*radstrength)/(connected.damage_coeff ** 2) //Read comment in "transferbuffer" section above for explanation
@@ -478,7 +699,7 @@
 							var/len = length_char(viable_occupant.dna.uni_identity)
 							num = WRAP(num, 1, len+1)
 							num = randomize_radiation_accuracy(num, radduration + (connected.precision_coeff ** 2), len) //Each manipulator level above 1 makes randomization as accurate as selected time + manipulator lvl^2
-																														//Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low
+                                                                                                                         //Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low
 							var/block = round((num-1)/DNA_BLOCK_SIZE)+1
 							var/subblock = num - block*DNA_BLOCK_SIZE
 							last_change = "UI #[block]-[subblock]; "
@@ -490,35 +711,229 @@

 							viable_occupant.dna.uni_identity = copytext_char(viable_occupant.dna.uni_identity, 1, num) + hex + copytext_char(viable_occupant.dna.uni_identity, num + 1)
 							viable_occupant.updateappearance(mutations_overlay_update=1)
-						if("pulsese")
-							var/len = length(viable_occupant.dna.struc_enzymes)
-							num = WRAP(num, 1, len+1)
-							num = randomize_radiation_accuracy(num, radduration + (connected.precision_coeff ** 2), len)
-
-							var/block = round((num-1)/DNA_BLOCK_SIZE)+1
-							var/subblock = num - block*DNA_BLOCK_SIZE
-							last_change = "SE #[block]-[subblock]; "
-
-							var/hex = copytext_char(viable_occupant.dna.struc_enzymes, num, num+1)
-							last_change += "[hex]"
-							hex = scramble(hex, radstrength, radduration)
-							last_change += "->[hex]"
-
-							viable_occupant.dna.struc_enzymes = copytext_char(viable_occupant.dna.struc_enzymes, 1, num) + hex + copytext_char(viable_occupant.dna.struc_enzymes, num + 1)
-							viable_occupant.domutcheck()
 				else
 					current_screen = "mainmenu"

 				if(connected)
 					connected.locked = locked_state
+		if("inspect")
+			if(viable_occupant)
+				var/list/mutations = get_mutation_list(TRUE)
+				if(current_mutation == mutations[num])
+					current_mutation = null
+				else
+					current_mutation = mutations[num]
+
+		if("inspectstorage")
+			current_storage = num
+			current_screen = "info"
+		if("savemut")
+			if(viable_occupant)
+				var/succes
+				if(LAZYLEN(stored_mutations) < max_storage)
+					var/mutation = text2path(href_list["path"])
+					if(ispath(mutation, /datum/mutation/human)) //sanity checks
+						var/datum/mutation/human/HM = viable_occupant.dna.get_mutation(mutation)
+						if(HM)
+							var/datum/mutation/human/A = new HM.type()
+							A.copy_mutation(HM)
+							succes = TRUE
+							stored_mutations += A
+							to_chat(usr,"<span class='notice'>Mutation succesfully stored.</span>")
+				if(!succes) //we can exactly return here
+					to_chat(usr,"<span class='warning'>Mutation storage is full.</span>")
+		if("deletemut")
+			var/datum/mutation/human/HM = stored_mutations[num]
+			if(HM)
+				stored_mutations.Remove(HM)
+				qdel(HM)
+				current_screen = "mutations"
+		if("activator")
+			if(injectorready < world.time)
+				var/mutation = text2path(href_list["path"])
+				if(ispath(mutation, /datum/mutation/human))
+					var/datum/mutation/human/HM = get_valid_mutation(mutation)
+					if(HM)
+						var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
+						I.add_mutations += new HM.type (copymut = HM)
+						I.name = "[HM.name] activator"
+						I.research = TRUE
+						if(connected)
+							I.damage_coeff = connected.damage_coeff*4
+							injectorready = world.time + INJECTOR_TIMEOUT * (1 - 0.1 * connected.precision_coeff) //precision_coeff being the matter bin rating
+						else
+							injectorready = world.time + INJECTOR_TIMEOUT
+		if("mutator")
+			if(injectorready < world.time)
+				var/mutation = text2path(href_list["path"])
+				if(ispath(mutation, /datum/mutation/human))
+					var/datum/mutation/human/HM = get_valid_mutation(mutation)
+					if(HM)
+						var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
+						I.add_mutations += new HM.type (copymut = HM)
+						I.doitanyway = TRUE
+						I.name = "[HM.name] injector"
+						if(connected)
+							I.damage_coeff = connected.damage_coeff
+							injectorready = world.time + INJECTOR_TIMEOUT * 5 * (1 - 0.1 * connected.precision_coeff)
+						else
+							injectorready = world.time + INJECTOR_TIMEOUT * 5
+
+		if("advinjector")
+			var/selection = href_list["injector"]
+			if(injectorready < world.time)
+				if(injector_selection.Find(selection))
+					var/list/true_selection = injector_selection[selection]
+					if(LAZYLEN(injector_selection))
+						var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
+						for(var/A in true_selection)
+							var/datum/mutation/human/HM = A
+							I.add_mutations += new HM.type (copymut = HM)
+						I.doitanyway = TRUE
+						I.name = "Advanced [selection] injector"
+						if(connected)
+							I.damage_coeff = connected.damage_coeff
+							injectorready = world.time + INJECTOR_TIMEOUT * 8 * (1 - 0.1 * connected.precision_coeff)
+						else
+							injectorready = world.time + INJECTOR_TIMEOUT * 8
+		if("nullify")
+			if(viable_occupant)
+				var/datum/mutation/human/A = viable_occupant.dna.get_mutation(current_mutation)
+				if(A && (!viable_occupant.dna.mutation_in_sequence(current_mutation) || A.scrambled))
+					viable_occupant.dna.remove_mutation(current_mutation)
+					current_screen = "mainmenu"
+					current_mutation = null
+		if("pulsegene")
+			if(current_screen != "info")
+				var/path = text2path(href_list["path"])
+				if(viable_occupant && num && (path in viable_occupant.dna.mutation_index))
+					var/list/genes = list("A","T","G","C","X")
+					if(jokerready < world.time)
+						genes += "JOKER"
+					var/sequence = GET_GENE_STRING(path, viable_occupant.dna)
+					var/original = sequence[num]
+					var/new_gene = input("From [original] to-", "New block", original) as null|anything in genes
+					if(!new_gene)
+						new_gene = original
+					if(viable_occupant == get_viable_occupant()) //No cheesing
+						if((new_gene == "JOKER") && (jokerready < world.time))
+							var/true_genes = GET_SEQUENCE(current_mutation)
+							new_gene = true_genes[num]
+							jokerready = world.time + JOKER_TIMEOUT - (JOKER_UPGRADE * (connected.precision_coeff-1))
+						sequence = copytext(sequence, 1, num) + new_gene + copytext(sequence, num+1, length(sequence)+1)
+						viable_occupant.dna.mutation_index[path] = sequence
+					viable_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER/connected.damage_coeff
+					viable_occupant.domutcheck()
+		if("exportdiskmut")
+			if(diskette && !diskette.read_only)
+				var/path = text2path(href_list["path"])
+				if(ispath(path, /datum/mutation/human))
+					var/datum/mutation/human/A = get_valid_mutation(path)
+					if(A && diskette && (LAZYLEN(diskette.mutations) < diskette.max_mutations))
+						var/datum/mutation/human/HM = new A.type()
+						diskette.mutations += HM
+						HM.copy_mutation(A)
+						to_chat(usr, "<span class='notice'>Succesfully written [A.name] to [diskette.name].</span>")
+		if("deletediskmut")
+			if(diskette && !diskette.read_only)
+				if(num && (LAZYLEN(diskette.mutations) >= num))
+					var/datum/mutation/human/A = diskette.mutations[num]
+					diskette.mutations.Remove(A)
+					qdel(A)
+		if("importdiskmut")
+			if(diskette && (LAZYLEN(diskette.mutations) >= num))
+				if(LAZYLEN(stored_mutations) < max_storage)
+					var/datum/mutation/human/A = diskette.mutations[num]
+					var/datum/mutation/human/HM = new A.type()
+					HM.copy_mutation(A)
+					stored_mutations += HM
+					to_chat(usr,"<span class='notice'>Succesfully written [A.name] to storage.")
+		if("combine")
+			if(num && (LAZYLEN(stored_mutations) >= num))
+				if(LAZYLEN(stored_mutations) < max_storage)
+					var/datum/mutation/human/A = stored_mutations[num]
+					var/path = A.type
+					if(combine)
+						var/result_path = get_mixed_mutation(combine, path)
+						if(result_path)
+							stored_mutations += new result_path()
+							to_chat(usr, "<span class='boldnotice'>Succes! New mutation has been added to storage</span>")
+							discover(result_path)
+							combine = null
+						else
+							to_chat(usr, "<span class='warning'>Failed. No mutation could be created.</span>")
+							combine = null
+					else
+						combine = path
+						to_chat(usr,"<span class='notice'>Selected [A.name] for combining</span>")
+				else
+					to_chat(usr, "<span class='warning'>Not enough space to store potential mutation.</span>")
+		if("ejectchromosome")
+			if(LAZYLEN(stored_chromosomes) <= num)
+				var/obj/item/chromosome/CM = stored_chromosomes[num]
+				CM.forceMove(drop_location())
+				adjust_item_drop_location(CM)
+				stored_chromosomes -= CM
+		if("applychromosome")
+			if(viable_occupant && (LAZYLEN(viable_occupant.dna.mutations) <= num))
+				var/datum/mutation/human/HM = viable_occupant.dna.mutations[num]
+				var/list/chromosomes = list()
+				for(var/obj/item/chromosome/CM in stored_chromosomes)
+					if(CM.can_apply(HM))
+						chromosomes += CM
+				if(chromosomes.len)
+					var/obj/item/chromosome/CM = input("Select a chromosome to apply", "Apply Chromosome") as null|anything in sortNames(chromosomes)
+					if(CM)
+						to_chat(usr, "<span class='notice'>You apply [CM] to [HM.name].</span>")
+						stored_chromosomes -= CM
+						CM.apply(HM)
+		if("expand_advinjector")
+			var/mutation = text2path(href_list["path"])
+			var/datum/mutation/human/HM = get_valid_mutation(mutation)
+			if(HM && LAZYLEN(injector_selection))
+				var/which_injector = input(usr, "Select Adv. Injector", "Advanced Injectors") as null|anything in injector_selection
+				if(injector_selection.Find(which_injector))
+					var/list/true_selection = injector_selection[which_injector]
+					var/total_instability
+					for(var/B in true_selection)
+						var/datum/mutation/human/mootacion = B
+						total_instability += mootacion.instability
+					total_instability += HM.instability
+					if((total_instability > max_injector_instability) || (true_selection.len + 1) > max_injector_mutations)
+						to_chat(usr, "<span class='warning'>Adding more mutations would make the advanced injector too unstable!</span>")
+					else
+						true_selection += HM //reminder that this works. because I keep forgetting this works
+		if("remove_from_advinjector")
+			var/mutation = text2path(href_list["path"])
+			var/selection = href_list["injector"]
+			if(injector_selection.Find(selection))
+				var/list/true_selection = injector_selection[selection]
+				for(var/B in true_selection)
+					var/datum/mutation/human/HM = B
+					if(HM.type == mutation)
+						true_selection -= HM
+					break
+
+		if("remove_advinjector")
+			var/selection = href_list["injector"]
+			for(selection in injector_selection)
+				if(selection == selection)
+					injector_selection.Remove(selection)
+
+		if("add_advinjector")
+			if(LAZYLEN(injector_selection) < max_injector_selections)
+				var/new_selection = input(usr, "Enter Adv. Injector name", "Advanced Injectors") as text|null
+				if(new_selection && !(new_selection in injector_selection))
+					injector_selection[new_selection] = list()
+

 	ui_interact(usr,last_change)

-/obj/machinery/computer/scan_consolenew/proc/scramble(input,rs,rd)
+/obj/machinery/computer/scan_consolenew/proc/scramble(input,rs,rd) //hexadecimal genetics. dont confuse with scramble button
 	var/length = length(input)
 	var/ran = gaussian(0, rs*RADIATION_STRENGTH_MULTIPLIER)
 	if(ran == 0)
-		ran = pick(-1,1)	//hacky, statistically should almost never happen. 0-change makes people mad though
+		ran = pick(-1,1)	//hacky, statistically should almost never happen. 0-chance makes people mad though
 	else if(ran < 0)
 		ran = round(ran)	//negative, so floor it
 	else
@@ -533,7 +948,7 @@
 	var/mob/living/carbon/viable_occupant = null
 	if(connected)
 		viable_occupant = connected.occupant
-		if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) || HAS_TRAIT(viable_occupant, TRAIT_NOCLONE))
+		if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT_NOT_FROM(viable_occupant, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) || HAS_TRAIT(viable_occupant, TRAIT_NOCLONE))
 			viable_occupant = null
 	return viable_occupant

@@ -547,10 +962,6 @@
 		//Each laser level reduces damage by lvl^2, so no effect on 1 lvl, 4 times less damage on 2 and 9 times less damage on 3
 		//Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove
 		switch(action)
-			if(SCANNER_ACTION_SE)
-				if(buffer_slot["SE"])
-					viable_occupant.dna.struc_enzymes = buffer_slot["SE"]
-					viable_occupant.domutcheck()
 			if(SCANNER_ACTION_UI)
 				if(buffer_slot["UI"])
 					viable_occupant.dna.uni_identity = buffer_slot["UI"]
@@ -572,15 +983,54 @@
 					viable_occupant.dna.blood_type = buffer_slot["blood_type"]

 /obj/machinery/computer/scan_consolenew/proc/on_scanner_close()
-	if(delayed_action && connected)
+	if(delayed_action && get_viable_occupant())
 		to_chat(connected.occupant, "<span class='notice'>[src] activates!</span>")
 		apply_buffer(delayed_action["action"],delayed_action["buffer"])
 		delayed_action = null //or make it stick + reset button ?

+/obj/machinery/computer/scan_consolenew/proc/get_valid_mutation(mutation)
+	var/mob/living/carbon/C = get_viable_occupant()
+	if(C)
+		var/datum/mutation/human/HM = C.dna.get_mutation(mutation)
+		if(HM)
+			return HM
+	for(var/datum/mutation/human/A in stored_mutations)
+		if(A.type == mutation)
+			return A
+
+
+/obj/machinery/computer/scan_consolenew/proc/get_mutation_list(include_storage) //Returns a list of the mutation index types and any extra mutations
+	var/mob/living/carbon/viable_occupant = get_viable_occupant()
+	var/list/paths = list()
+	if(viable_occupant)
+		for(var/A in viable_occupant.dna.mutation_index)
+			paths += A
+		for(var/datum/mutation/human/A in viable_occupant.dna.mutations)
+			if(A.class == MUT_EXTRA)
+				paths += A.type
+	if(include_storage)
+		for(var/datum/mutation/human/A in stored_mutations)
+			paths += A.type
+	return paths
+
+/obj/machinery/computer/scan_consolenew/proc/get_valid_gene_string(mutation)
+	var/mob/living/carbon/C = get_viable_occupant()
+	if(C && (mutation in C.dna.mutation_index))
+		return GET_GENE_STRING(mutation, C.dna)
+	else if(C && (LAZYLEN(C.dna.mutations)))
+		for(var/datum/mutation/human/A in C.dna.mutations)
+			if(A.type == mutation)
+				return GET_SEQUENCE(mutation)
+	for(var/datum/mutation/human/A in stored_mutations)
+		if(A.type == mutation)
+			return GET_SEQUENCE(mutation)
+
+/obj/machinery/computer/scan_consolenew/proc/discover(mutation)
+	if(stored_research && !(mutation in stored_research.discovered_mutations))
+		stored_research.discovered_mutations += mutation
+		return TRUE
 /////////////////////////// DNA MACHINES
 #undef INJECTOR_TIMEOUT
-#undef REJUVENATORS_INJECT
-#undef REJUVENATORS_MAX
 #undef NUMBER_OF_BUFFERS

 #undef RADIATION_STRENGTH_MAX
@@ -145,7 +145,7 @@
 				if(5)
 					dat += "<CENTER><B>Virus Database</B></CENTER>"
 					for(var/Dt in typesof(/datum/disease/))
-						var/datum/disease/Dis = new Dt(0)
+						var/datum/disease/Dis = new Dt(FALSE)
 						if(istype(Dis, /datum/disease/advance))
 							continue // TODO (tm): Add advance diseases to the virus database which no one uses.
 						if(!Dis.desc)
@@ -248,7 +248,7 @@

 			else if(href_list["vir"])
 				var/type = href_list["vir"]
-				var/datum/disease/Dis = new type(0)
+				var/datum/disease/Dis = new type(FALSE)
 				var/AfS = ""
 				for(var/mob/M in Dis.viable_mobtypes)
 					AfS += " [initial(M.name)];"
@@ -11,16 +11,19 @@

 /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
 	if(!istype(R))
-		return 0
+		return FALSE
 	if(isAI(user))
 		if (R.connected_ai != user)
-			return 0
+			return FALSE
 	if(iscyborg(user))
 		if (R != user)
-			return 0
+			return FALSE
 	if(R.scrambledcodes)
-		return 0
-	return 1
+		return FALSE
+	if (hasSiliconAccessInArea(user) && !issilicon(user))
+		if (!Adjacent(user))
+			return FALSE
+	return TRUE

 /obj/machinery/computer/robotics/ui_interact(mob/user)
 	. = ..()
@@ -37,12 +40,11 @@
 		dat += "[R.name] |"
 		if(R.stat)
 			dat += " Not Responding |"
-		else if (!R.canmove)
+		else if(R.locked_down)
 			dat += " Locked Down |"
 		else
 			dat += " Operating Normally |"
-		if (!R.canmove)
-		else if(R.cell)
+		if(R.cell)
 			dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
 		else
 			dat += " No Cell Installed |"
@@ -62,7 +64,7 @@
 				dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
 		else if(IsAdminGhost(user) && !R.emagged)
 			dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
-		dat += "<A href='?src=[REF(src)];stopbot=[REF(R)]'>(<font color=green><i>[R.canmove ? "Lockdown" : "Release"]</i></font>)</A> "
+		dat += "<A href='?src=[REF(src)];stopbot=[REF(R)]'>(<font color=green><i>[R.locked_down? "Lockdown" : "Release"]</i></font>)</A> "
 		dat += "<A href='?src=[REF(src)];killbot=[REF(R)]'>(<font color=red><i>Destroy</i></font>)</A>"
 		dat += "<BR>"

@@ -116,14 +118,14 @@
 		if(src.allowed(usr))
 			var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs
 			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
+				var/choice = input("Are you certain you wish to [!R.locked_down ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
 				if(choice == "Confirm" && can_control(usr, R) && !..())
-					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [R.canmove ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!</span>")
-					log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!")
-					R.SetLockdown(!R.lockcharge)
-					to_chat(R, "[!R.lockcharge ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
+					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!</span>")
+					log_game("[key_name(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R)]!")
+					R.SetLockdown(!R.locked_down)
+					to_chat(R, "[!R.locked_down ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
 					if(R.connected_ai)
-						to_chat(R.connected_ai, "[!R.lockcharge ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=[REF(R.connected_ai)];track=[html_encode(R.name)]'>[R.name]</a></span><br>")
+						to_chat(R.connected_ai, "[!R.locked_down ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=[REF(R.connected_ai)];track=[html_encode(R.name)]'>[R.name]</a></span><br>")

 		else
 			to_chat(usr, "<span class='danger'>Access Denied.</span>")
@@ -75,25 +75,23 @@
 				L -= I
 	return !cleared

-/obj/machinery/computer/station_alert/update_icon()
-	..()
-	cut_overlays()
+/obj/machinery/computer/station_alert/update_overlays()
+	. = ..()
 	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
 	var/overlay_state = icon_screen
 	if(stat & (NOPOWER|BROKEN))
-		add_overlay("[icon_keyboard]_off")
+		. |= "[icon_keyboard]_off"
 		return
-	add_overlay(icon_keyboard)
+	. |= icon_keyboard
 	var/active_alarms = FALSE
 	for(var/cat in alarms)
-		var/list/L = alarms[cat]
-		if(L.len)
+		if(length(alarms[cat]))
 			active_alarms = TRUE
+			break
 	if(active_alarms)
 		overlay_state = "alert:2"
-		add_overlay("alert:2")
 	else
 		overlay_state = "alert:0"
-		add_overlay("alert:0")
+	. |= overlay_state
 	SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir)
-	SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir, alpha=128)
+	SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir, alpha=128)
@@ -44,8 +44,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	else
 		to_chat(user, "<span class='notice'>[I] doesn't appear to be an uplink...</span>")

-/obj/machinery/computer/telecrystals/uplinker/update_icon()
-	..()
+/obj/machinery/computer/telecrystals/uplinker/update_overlays()
+	. = ..()
 	if(uplinkholder)
 		add_overlay("[initial(icon_state)]-closed")

@@ -287,6 +287,7 @@
 #define CRYO_PRESERVE 1
 #define CRYO_OBJECTIVE 2
 #define CRYO_IGNORE 3
+#define CRYO_DESTROY_LATER 4

 /obj/machinery/cryopod/proc/should_preserve_item(obj/item/I)
 	for(var/datum/objective_item/steal/T in control_computer.theft_cache)
@@ -308,8 +309,8 @@
 	if(iscyborg(mob_occupant))
 		var/mob/living/silicon/robot/R = mob_occupant
 		if(R.mmi?.brain)
-			cryo_items[R.mmi] = CRYO_IGNORE
-			cryo_items[R.mmi.brain] = CRYO_IGNORE
+			cryo_items[R.mmi] = CRYO_DESTROY_LATER
+			cryo_items[R.mmi.brain] = CRYO_DESTROY_LATER
 		for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
 			for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
 				cryo_items[O] = should_preserve_item(O)
@@ -318,7 +319,7 @@

 	//Drop all items into the pod.
 	for(var/obj/item/I in mob_occupant)
-		if(cryo_items[I] == CRYO_IGNORE)
+		if(cryo_items[I] == CRYO_IGNORE || cryo_items[I] ==CRYO_DESTROY_LATER)
 			continue
 		cryo_items[I] = should_preserve_item(I)
 		mob_occupant.transferItemToLoc(I, src, TRUE)
@@ -334,17 +335,19 @@
 		if(QDELETED(I)) //edge cases and DROPDEL.
 			continue
 		var/preserve = cryo_items[I]
-		if(preserve == CRYO_IGNORE)
+		if(preserve == CRYO_DESTROY_LATER)
 			continue
-		else if(preserve == CRYO_DESTROY)
-			qdel(I)
-		else if(control_computer?.allow_items)
-			control_computer.frozen_items += I
-			if(preserve == CRYO_OBJECTIVE)
-				control_computer.objective_items += I
-			I.moveToNullspace()
-		else
-			I.forceMove(loc)
+		if(preserve != CRYO_IGNORE)
+			if(preserve == CRYO_DESTROY)
+				qdel(I)
+			else if(control_computer?.allow_items)
+				control_computer.frozen_items += I
+				if(preserve == CRYO_OBJECTIVE)
+					control_computer.objective_items += I
+				I.moveToNullspace()
+			else
+				I.forceMove(loc)
+		cryo_items -= I

 	//Update any existing objectives involving this mob.
 	for(var/datum/objective/O in GLOB.objectives)
@@ -405,6 +408,10 @@
 		mob_occupant.ghostize(FALSE, penalize = TRUE)

 	QDEL_NULL(occupant)
+	for(var/I in cryo_items) //only "CRYO_DESTROY_LATER" atoms are left)
+		var/atom/A = I
+		if(!QDELETED(A))
+			qdel(A)
 	open_machine()
 	name = initial(name)

@@ -412,6 +419,7 @@
 #undef CRYO_PRESERVE
 #undef CRYO_OBJECTIVE
 #undef CRYO_IGNORE
+#undef CRYO_DESTROY_LATER

 /obj/machinery/cryopod/MouseDrop_T(mob/living/target, mob/user)
 	if(!istype(target) || user.incapacitated() || !target.Adjacent(user) || !Adjacent(user) || !ismob(target) || (!ishuman(user) && !iscyborg(user)) || !istype(user.loc, /turf) || target.buckled)
@@ -45,7 +45,7 @@
 			return
 	return ..()

-/obj/machinery/jukebox/update_icon()
+/obj/machinery/jukebox/update_icon_state()
 	if(active)
 		icon_state = "[initial(icon_state)]-active"
 	else
@@ -433,5 +433,5 @@
 	. = ..()
 	if(active)
 		for(var/mob/living/M in rangers)
-			if(prob(5+(allowed(M)*4)) && M.canmove)
+			if(prob(5+(allowed(M)*4)) && CHECK_MOBILITY(M, MOBILITY_MOVE))
 				dance(M)
@@ -22,7 +22,7 @@
 	precision_coeff = 0
 	for(var/obj/item/stock_parts/scanning_module/P in component_parts)
 		scan_level += P.rating
-	for(var/obj/item/stock_parts/manipulator/P in component_parts)
+	for(var/obj/item/stock_parts/matter_bin/P in component_parts)
 		precision_coeff = P.rating
 	for(var/obj/item/stock_parts/micro_laser/P in component_parts)
 		damage_coeff = P.rating
@@ -34,7 +34,7 @@
 		if(scan_level >= 3)
 			. += "<span class='notice'>Scanner has been upgraded to support autoprocessing.<span>"

-/obj/machinery/dna_scannernew/update_icon()
+/obj/machinery/dna_scannernew/update_icon_state()

 	//no power or maintenance
 	if(stat & (NOPOWER|BROKEN))
@@ -769,7 +769,7 @@
 			if(!istype(H.head, /obj/item/clothing/head/helmet))
 				H.visible_message("<span class='danger'>[user] headbutts the airlock.</span>", \
 									"<span class='userdanger'>You headbutt the airlock!</span>")
-				H.Knockdown(100)
+				H.DefaultCombatKnockdown(100)
 				H.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
 			else
 				visible_message("<span class='danger'>[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.</span>")
@@ -1033,7 +1033,7 @@
 		if(!I.use_tool(src, user, 150, volume=50))
 			to_chat(user, "<span class='warning'>You slip and [charge] detonates!</span>")
 			charge.ex_act(EXPLODE_DEVASTATE)
-			user.Knockdown(60)
+			user.DefaultCombatKnockdown(60)
 			return
 		user.visible_message("<span class='notice'>[user] removes [charge] from [src].</span>", \
 							 "<span class='notice'>You gently pry out [charge] from [src] and unhook its wires.</span>")
@@ -508,7 +508,7 @@
 			throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
 			SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50))
 			flash_color(L, flash_color="#960000", flash_time=20)
-			L.Knockdown(40)
+			L.DefaultCombatKnockdown(40)
 			L.throw_at(throwtarget, 5, 1)
 		return 0

@@ -230,7 +230,7 @@
 /obj/machinery/door/proc/unelectrify()
 	secondsElectrified = 0

-/obj/machinery/door/update_icon()
+/obj/machinery/door/update_icon_state()
 	if(density)
 		icon_state = "door1"
 	else
@@ -319,10 +319,10 @@
 		else if(ishuman(L)) //For humans
 			L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
 			L.emote("scream")
-			L.Knockdown(100)
+			L.DefaultCombatKnockdown(100)
 		else if(ismonkey(L)) //For monkeys
 			L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
-			L.Knockdown(100)
+			L.DefaultCombatKnockdown(100)
 		else //for simple_animals & borgs
 			L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
 		var/turf/location = get_turf(src)
@@ -171,16 +171,20 @@
 		if("closing")
 			flick("door_closing", src)

-/obj/machinery/door/firedoor/update_icon()
-	cut_overlays()
+/obj/machinery/door/firedoor/update_icon_state()
 	if(density)
 		icon_state = "door_closed"
-		if(welded)
-			add_overlay("welded")
 	else
 		icon_state = "door_open"
-		if(welded)
-			add_overlay("welded_open")
+
+/obj/machinery/door/firedoor/update_overlays()
+	. = ..()
+	if(!welded)
+		return
+	if(density)
+		. += "welded"
+	else
+		. += "welded_open"

 /obj/machinery/door/firedoor/open()
 	. = ..()
@@ -283,8 +287,7 @@
 		if(CONSTRUCTION_NOCIRCUIT)
 			. += "<span class='notice'>There are no <i>firelock electronics</i> in the frame. The frame could be <b>cut</b> apart.</span>"

-/obj/structure/firelock_frame/update_icon()
-	..()
+/obj/structure/firelock_frame/update_icon_state()
 	icon_state = "frame[constructionStep]"

 /obj/structure/firelock_frame/attackby(obj/item/C, mob/user)
@@ -42,7 +42,7 @@
 		else
 			do_animate("deny")

-/obj/machinery/door/password/update_icon()
+/obj/machinery/door/password/update_icon_state()
 	if(density)
 		icon_state = "closed"
 	else
@@ -77,7 +77,7 @@
 			flick("closing", src)
 			playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)

-/obj/machinery/door/poddoor/update_icon()
+/obj/machinery/door/poddoor/update_icon_state()
 	if(density)
 		icon_state = "closed"
 	else
@@ -1,13 +1,67 @@
 /obj/machinery/door/poddoor/shutters
 	gender = PLURAL
 	name = "shutters"
-	desc = "Heavy duty metal shutters that open mechanically."
+	desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight."
 	icon = 'icons/obj/doors/shutters.dmi'
 	layer = SHUTTER_LAYER
 	closingLayer = SHUTTER_LAYER
+	armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
 	damage_deflection = 20
+	max_integrity = 100

 /obj/machinery/door/poddoor/shutters/preopen
 	icon_state = "open"
 	density = FALSE
 	opacity = 0
+
+// The below shutters are the original ones from the TG codebase. They are remaining as "secure" shutters. If anyone wants to improve their animation, feel free.
+// The original shutters are now shutters_old.dmi; copy the naming format of the files into new a new .dmi to add new shutters that work with the poddoor code for animating the doors.
+// Originally, the shutters were reskins of blast doors. Eighty hits with the Cap's sabre to destroy one shutter is far too powerful considering shutters cannot be deconstructed (yet).
+// If you're a mapper and want super strong shutter, use the 'old' ones.
+
+/obj/machinery/door/poddoor/shutters/old
+	name = "strong shutters"
+	desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions."
+	icon = 'icons/obj/doors/shutters_old.dmi'
+	icon_state = "closed"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 75, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	max_integrity = 300
+
+/obj/machinery/door/poddoor/shutters/old/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = 0
+
+// End of old shutter stuff. Credit for the old shutter sprites to TG.
+
+/obj/machinery/door/poddoor/shutters/radiation
+	name = "radiation shutters"
+	desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation"
+	icon = 'icons/obj/doors/shutters_radiation.dmi'
+	icon_state = "closed"
+	rad_insulation = 0.2
+
+/obj/machinery/door/poddoor/shutters/radiation/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = 0
+	rad_insulation = 1
+
+/obj/machinery/door/poddoor/shutters/radiation/do_animate(animation)
+	..()
+	switch(animation)
+		if("opening")
+			rad_insulation = 1
+		if("closing")
+			rad_insulation = 0.2
+
+/obj/machinery/door/poddoor/shutters/window
+	name = "windowed shutters"
+	desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times."
+	icon = 'icons/obj/doors/shutters_window.dmi'
+	icon_state = "closed"
+	opacity = 0
+
+/obj/machinery/door/poddoor/shutters/window/preopen
+	icon_state = "open"
+	density = FALSE
@@ -48,7 +48,7 @@
 	electronics = null
 	return ..()

-/obj/machinery/door/window/update_icon()
+/obj/machinery/door/window/update_icon_state()
 	if(density)
 		icon_state = base_state
 	else
@@ -199,7 +199,7 @@
 		if(istype(a, dispense_type))
 			.++

-/obj/machinery/droneDispenser/update_icon()
+/obj/machinery/droneDispenser/update_icon_state()
 	if(stat & (BROKEN|NOPOWER))
 		icon_state = icon_off
 	else if(mode == DRONE_RECHARGING)
@@ -84,7 +84,7 @@
 		busy = FALSE
 		update_icon()

-/obj/machinery/doorButtons/access_button/update_icon()
+/obj/machinery/doorButtons/access_button/update_icon_state()
 	if(stat & NOPOWER)
 		icon_state = "access_button_off"
 	else
@@ -249,7 +249,7 @@
 		else if(A.id_tag == idExterior)
 			exteriorAirlock = A

-/obj/machinery/doorButtons/airlock_controller/update_icon()
+/obj/machinery/doorButtons/airlock_controller/update_icon_state()
 	if(stat & NOPOWER)
 		icon_state = "access_control_off"
 		return
@@ -255,7 +255,7 @@
 	new_prog.master = src
 	program = new_prog

-/obj/machinery/embedded_controller/radio/airlock_controller/update_icon()
+/obj/machinery/embedded_controller/radio/airlock_controller/update_icon_state()
 	if(on && program)
 		if(program.memory["processing"])
 			icon_state = "airlock_control_process"
@@ -33,8 +33,6 @@
 	popup.set_content(return_text())
 	popup.open()

-/obj/machinery/embedded_controller/update_icon()
-
 /obj/machinery/embedded_controller/proc/return_text()

 /obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line)
@@ -54,7 +54,7 @@
 	new_prog.master = src
 	program = new_prog

-/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon()
+/obj/machinery/embedded_controller/radio/simple_vent_controller/update_icon_state()
 	if(on && program)
 		icon_state = "airlock_control_standby"
 	else
@@ -9,7 +9,7 @@
 	internal_radio = FALSE

 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/experimental/growclone(ckey, clonename, ui, se, datum/species/mrace, list/features, factions)
+/obj/machinery/clonepod/experimental/growclone(clonename, ui, mutation_index, mindref, last_death, blood_type, datum/species/mrace, list/features, factions, list/quirks)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
@@ -20,15 +20,15 @@

 	var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)

-	H.hardset_dna(ui, se, H.real_name, null, mrace, features)
+	H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features)

 	if(efficiency > 2)
 		var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations)
 		H.dna.remove_mutation_group(unclean_mutations)
 	if(efficiency > 5 && prob(20))
-		H.randmutvg()
+		H.easy_randmut(POSITIVE)
 	if(efficiency < 3 && prob(50))
-		var/mob/M = H.randmutb()
+		var/mob/M = H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
 		if(ismob(M))
 			H = M

@@ -42,18 +42,17 @@
 	icon_state = "pod_1"
 	//Get the clone body ready
 	maim_clone(H)
-	ADD_TRAIT(H, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
-	ADD_TRAIT(H, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
-	ADD_TRAIT(H, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
-	ADD_TRAIT(H, TRAIT_MUTE, CLONING_POD_TRAIT)
-	ADD_TRAIT(H, TRAIT_NOBREATH, CLONING_POD_TRAIT)
-	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_STABLEHEART, "cloning")
+	ADD_TRAIT(H, TRAIT_EMOTEMUTE, "cloning")
+	ADD_TRAIT(H, TRAIT_MUTE, "cloning")
+	ADD_TRAIT(H, TRAIT_NOBREATH, "cloning")
+	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, "cloning")
 	H.Unconscious(80)

-	var/list/candidates = pollCandidatesForMob("Do you want and agree to play as a [clonename]'s defective clone, respect their character and not engage in ERP without permission from the original?", null, null, null, 100, H, POLL_IGNORE_CLONE)
+	var/list/candidates = pollCandidatesForMob("Do you want to play as [clonename]'s defective clone?", null, null, null, 100, H)
 	if(LAZYLEN(candidates))
-		var/mob/dead/observer/C = pick(candidates)
-		C.transfer_ckey(H)
+		var/mob/C = pick(candidates)
+		H.key = C.key

 	if(grab_ghost_when == CLONER_FRESH_CLONE)
 		H.grab_ghost()
@@ -293,6 +292,7 @@
 		temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 	else
-		pod.growclone(null, mob_occupant.real_name, dna.uni_identity, dna.struc_enzymes, clone_species, dna.features, mob_occupant.faction)
+		pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, null, dna.blood_type, clone_species, dna.features, mob_occupant.faction)
 		temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
@@ -55,10 +55,7 @@
 	..()
 	update_icon()

-/obj/machinery/firealarm/update_icon()
-	cut_overlays()
-	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
-
+/obj/machinery/firealarm/update_icon_state()
 	if(panel_open)
 		icon_state = "fire_b[buildstage]"
 		return
@@ -72,26 +69,30 @@
 	if(stat & NOPOWER)
 		return

-	add_overlay("fire_overlay")
+/obj/machinery/firealarm/update_overlays()
+	. = ..()
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+
+	. += "fire_overlay"

 	if(is_station_level(z))
-		add_overlay("fire_[GLOB.security_level]")
+		. += "fire_[GLOB.security_level]"
 		SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
 	else
-		add_overlay("fire_[SEC_LEVEL_GREEN]")
+		. += "fire_[SEC_LEVEL_GREEN]"
 		SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)

 	var/area/A = src.loc
 	A = A.loc

 	if(!detecting || !A.fire)
-		add_overlay("fire_off")
+		. += "fire_off"
 		SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
 	else if(obj_flags & EMAGGED)
-		add_overlay("fire_emagged")
+		. += "fire_emagged"
 		SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
 	else
-		add_overlay("fire_on")
+		. += "fire_on"
 		SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)

 /obj/machinery/firealarm/emp_act(severity)
@@ -115,7 +115,7 @@
 			continue

 		if(L.flash_act(affect_silicon = 1))
-			L.Knockdown(strength)
+			L.DefaultCombatKnockdown(strength)
 			flashed = TRUE

 	if(flashed)
@@ -68,7 +68,7 @@ The console is located at computer/gulag_teleporter.dm

 	return ..()

-/obj/machinery/gulag_teleporter/update_icon()
+/obj/machinery/gulag_teleporter/update_icon_state()
 	icon_state = initial(icon_state) + (state_open ? "_open" : "")
 	//no power or maintenance
 	if(stat & (NOPOWER|BROKEN))
@@ -11,6 +11,7 @@
 	light_color = LIGHT_COLOR_BLUE
 	var/interval = 20
 	var/harvesting = FALSE
+	var/warming_up = FALSE
 	var/list/operation_order = list() //Order of wich we harvest limbs.
 	var/allow_clothing = FALSE
 	var/allow_living = FALSE
@@ -27,12 +28,11 @@
 		max_time -= L.rating
 	interval = max(max_time,1)

-/obj/machinery/harvester/update_icon(warming_up)
-	if(warming_up)
-		icon_state = initial(icon_state)+"-charging"
-		return
+/obj/machinery/harvester/update_icon_state()
 	if(state_open)
 		icon_state = initial(icon_state)+"-open"
+	else if(warming_up)
+		icon_state = initial(icon_state)+"-charging"
 	else if(harvesting)
 		icon_state = initial(icon_state)+"-active"
 	else
@@ -43,6 +43,7 @@
 		return
 	. = ..()
 	harvesting = FALSE
+	warming_up = FALSE

 /obj/machinery/harvester/attack_hand(mob/user)
 	if(state_open)
@@ -86,13 +87,15 @@
 		return
 	var/mob/living/carbon/C = occupant
 	operation_order = reverseList(C.bodyparts)   //Chest and head are first in bodyparts, so we invert it to make them suffer more
+	warming_up = TRUE
 	harvesting = TRUE
 	visible_message("<span class='notice'>The [name] begins warming up!</span>")
 	say("Initializing harvest protocol.")
-	update_icon(TRUE)
+	update_icon()
 	addtimer(CALLBACK(src, .proc/harvest), interval)

 /obj/machinery/harvester/proc/harvest()
+	warming_up = FALSE
 	update_icon()
 	if(!harvesting || state_open || !powered(EQUIP) || !occupant || !iscarbon(occupant))
 		return
@@ -127,6 +130,7 @@
 	addtimer(CALLBACK(src, .proc/harvest), interval)

 /obj/machinery/harvester/proc/end_harvesting()
+	warming_up = FALSE
 	harvesting = FALSE
 	open_machine()
 	say("Subject has been successfully harvested.")
@@ -441,7 +441,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		set_light(0)
 	update_icon()

-/obj/machinery/holopad/update_icon()
+/obj/machinery/holopad/update_icon_state()
 	var/total_users = LAZYLEN(masters) + LAZYLEN(holo_calls)
 	if(ringing)
 		icon_state = "holopad_ringing"
@@ -24,7 +24,7 @@
 	QDEL_NULL(beaker)
 	return ..()

-/obj/machinery/iv_drip/update_icon()
+/obj/machinery/iv_drip/update_icon_state()
 	if(attached)
 		if(mode)
 			icon_state = "injecting"
@@ -36,13 +36,14 @@
 		else
 			icon_state = "donateidle"

-	cut_overlays()
+/obj/machinery/iv_drip/update_overlays()
+	. = ..()

 	if(beaker)
 		if(attached)
-			add_overlay("beakeractive")
+			. += "beakeractive"
 		else
-			add_overlay("beakeridle")
+			. += "beakeridle"
 		if(beaker.reagents.total_volume)
 			var/mutable_appearance/filling_overlay = mutable_appearance('icons/obj/iv_drip.dmi', "reagent")

@@ -64,7 +65,7 @@
 					filling_overlay.icon_state = "reagent100"

 			filling_overlay.color = mix_color_from_reagents(beaker.reagents.reagent_list)
-			add_overlay(filling_overlay)
+			. += filling_overlay

 /obj/machinery/iv_drip/MouseDrop(mob/living/target)
 	. = ..()
@@ -227,9 +228,9 @@
 	desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
 	icon_state = "iv_drip"

-/obj/machinery/iv_drip/telescopic/update_icon()
+/obj/machinery/iv_drip/telescopic/update_icon_state()
 	..()
-	icon_state = icon_state + "_tele"
+	icon_state += "_tele"

 /obj/machinery/iv_drip/telescopic/AltClick(mob/user)
 	if (attached || beaker || !user.canUseTopic(src, BE_CLOSE))
@@ -23,7 +23,7 @@
 	on = area.lightswitch
 	update_icon()

-/obj/machinery/light_switch/update_icon()
+/obj/machinery/light_switch/update_icon_state()
 	if(stat & NOPOWER)
 		icon_state = "light-p"
 	else
@@ -138,7 +138,8 @@
 	limb = new buildpath(loc)
 	if(selected_category=="human" || selected_category=="lizard") //Species with greyscale parts should be included here
 		limb.icon = 'icons/mob/human_parts_greyscale.dmi'
-		limb.should_draw_greyscale = TRUE
+		limb.base_bp_icon = DEFAULT_BODYPART_ICON_ORGANIC
+		limb.color_src = MUTCOLORS
 	else
 		limb.icon = 'icons/mob/human_parts.dmi'
 	// Set this limb up using the specias name and body zone
@@ -49,7 +49,7 @@
 	update_icon()

 // update the icon_state
-/obj/machinery/magnetic_module/update_icon()
+/obj/machinery/magnetic_module/update_icon_state()
 	var/state="floor_magnet"
 	var/onstate=""
 	if(!on)
@@ -316,7 +316,7 @@
 			if("togglemoving")
 				moving = !moving
 				if(moving)
-					spawn() MagnetMove()
+					INVOKE_ASYNC(src, .proc/MagnetMove)


 	updateUsrDialog()
@@ -325,7 +325,7 @@
 	if(looping)
 		return

-	while(moving && rpath.len >= 1)
+	while(moving && length(rpath) >= 1)

 		if(stat & (BROKEN|NOPOWER))
 			break
@@ -75,7 +75,7 @@
 	update_icon()

 // update the icon_state
-/obj/machinery/navbeacon/update_icon()
+/obj/machinery/navbeacon/update_icon_state()
 	var/state="navbeacon[open]"

 	if(invisibility)
@@ -17,7 +17,7 @@ Buildable meters
 	icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
 	icon_state = "simple"
 	item_state = "buildpipe"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_SMALL
 	level = 2
 	var/piping_layer = PIPING_LAYER_DEFAULT
 	var/RPD_type
@@ -63,7 +63,7 @@ Buildable meters
 	if(make_from.flipped)
 		do_a_flip()

-/obj/item/pipe/dropped()
+/obj/item/pipe/dropped(mob/user)
 	if(loc)
 		setPipingLayer(piping_layer)
 	return ..()
@@ -90,7 +90,8 @@ Buildable meters
 	set name = "Flip Pipe"
 	set src in view(1)

-	if ( usr.stat || usr.restrained() || !usr.canmove )
+	var/mob/living/L = usr
+	if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
 		return

 	do_a_flip()
@@ -224,7 +225,7 @@ Buildable meters
 	to_chat(user, "<span class='notice'>You fasten the meter to the [loc.name].</span>")
 	qdel(src)

-/obj/item/pipe_meter/dropped()
+/obj/item/pipe_meter/dropped(mob/user)
 	. = ..()
 	if(loc)
 		setAttachLayer(piping_layer)
@@ -34,7 +34,8 @@
 /obj/machinery/pipedispenser/Topic(href, href_list)
 	if(..())
 		return 1
-	if(!anchored|| !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+	var/mob/living/L = usr
+	if(!anchored || !istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
 		usr << browse(null, "window=pipedispenser")
 		return 1
 	usr.set_machine(src)
@@ -93,14 +94,14 @@


 //Allow you to drag-drop disposal pipes and transit tubes into it
-/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr)
-	if(!usr.canmove || usr.stat || usr.restrained())
+/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/living/user)
+	if(!istype(user) || !CHECK_MOBILITY(user, MOBILITY_USE))
 		return

 	if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod))
 		return

-	if (get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 )
+	if (get_dist(user, src) > 1 || get_dist(src,pipe) > 1 )
 		return

 	if (pipe.anchored)
@@ -99,8 +99,7 @@
 	if(!has_cover)
 		INVOKE_ASYNC(src, .proc/popUp)

-/obj/machinery/porta_turret/update_icon()
-	cut_overlays()
+/obj/machinery/porta_turret/update_icon_state()
 	if(!anchored)
 		icon_state = "turretCover"
 		return
@@ -248,6 +247,7 @@
 				if(prob(70))
 					if(stored_gun)
 						stored_gun.forceMove(loc)
+						stored_gun = null
 					to_chat(user, "<span class='notice'>You remove the turret and salvage some components.</span>")
 					if(prob(50))
 						new /obj/item/stack/sheet/metal(loc, rand(1,4))
@@ -409,7 +409,7 @@
 		if(iscarbon(A))
 			var/mob/living/carbon/C = A
 			//If not emagged, only target non downed carbons
-			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || C.recoveringstam))//CIT CHANGE - replaces check for lying with check for recoveringstam
+			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || (C.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)))//CIT CHANGE - replaces check for lying with check for recoveringstam
 				continue

 			//If emagged, target all but dead carbons
@@ -706,7 +706,7 @@

 /obj/machinery/porta_turret/syndicate/energy/pirate
 	max_integrity = 260
-	integrity_failure = 20
+	integrity_failure = 0.08
 	armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)


@@ -970,8 +970,7 @@
 	..()
 	update_icon()

-/obj/machinery/turretid/update_icon()
-	..()
+/obj/machinery/turretid/update_icon_state()
 	if(stat & NOPOWER)
 		icon_state = "control_off"
 	else if (enabled)
@@ -10,12 +10,14 @@
 	pass_flags = PASSTABLE
 	var/obj/item/charging = null
 	var/recharge_coeff = 1
+	var/using_power = FALSE //Did we put power into "charging" last process()?

 	var/static/list/allowed_devices = typecacheof(list(
 		/obj/item/gun/energy,
 		/obj/item/melee/baton,
 		/obj/item/ammo_box/magazine/recharge,
 		/obj/item/modular_computer,
+		/obj/item/twohanded/electrostaff,
 		/obj/item/gun/ballistic/automatic/magrifle))

 /obj/machinery/recharger/RefreshParts()
@@ -44,9 +46,11 @@
 	if (new_charging)
 		START_PROCESSING(SSmachines, src)
 		use_power = ACTIVE_POWER_USE
-		update_icon(scan = TRUE)
+		using_power = TRUE
+		update_icon()
 	else
 		use_power = IDLE_POWER_USE
+		using_power = FALSE
 		update_icon()

 /obj/machinery/recharger/attackby(obj/item/G, mob/user, params)
@@ -119,23 +123,23 @@
 	if(stat & (NOPOWER|BROKEN) || !anchored)
 		return PROCESS_KILL

-	var/using_power = 0
+	using_power = FALSE
 	if(charging)
 		var/obj/item/stock_parts/cell/C = charging.get_cell()
 		if(C)
 			if(C.charge < C.maxcharge)
 				C.give(C.chargerate * recharge_coeff)
 				use_power(250 * recharge_coeff)
-				using_power = 1
-			update_icon(using_power)
+				using_power = TRUE
+			update_icon()

 		if(istype(charging, /obj/item/ammo_box/magazine/recharge))
 			var/obj/item/ammo_box/magazine/recharge/R = charging
 			if(R.stored_ammo.len < R.max_ammo)
 				R.stored_ammo += new R.ammo_type(R)
 				use_power(200 * recharge_coeff)
-				using_power = 1
-			update_icon(using_power)
+				using_power = TRUE
+			update_icon()
 			return
 	else
 		return PROCESS_KILL
@@ -160,20 +164,15 @@
 				B.cell.charge = 0


-/obj/machinery/recharger/update_icon(using_power = 0, scan)	//we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier.
+/obj/machinery/recharger/update_icon_state()
 	if(stat & (NOPOWER|BROKEN) || !anchored)
 		icon_state = "rechargeroff"
-		return
-	if(scan)
-		icon_state = "rechargeroff"
-		return
-	if(panel_open)
+	else if(panel_open)
 		icon_state = "rechargeropen"
-		return
-	if(charging)
+	else if(charging)
 		if(using_power)
 			icon_state = "recharger1"
 		else
 			icon_state = "recharger2"
-		return
-	icon_state = "recharger0"
+	else
+		icon_state = "recharger0"
@@ -112,7 +112,7 @@
 			use_power = ACTIVE_POWER_USE
 		add_fingerprint(occupant)

-/obj/machinery/recharge_station/update_icon()
+/obj/machinery/recharge_station/update_icon_state()
 	if(is_operational())
 		if(state_open)
 			icon_state = "borgcharger0"
@@ -8,7 +8,7 @@
 	layer = ABOVE_ALL_MOB_LAYER // Overhead
 	density = TRUE
 	circuit = /obj/item/circuitboard/machine/recycler
-	var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
+	var/safety_mode = FALSE // Temporarily stops machine if it detects a mob, or upon deconstruction.
 	var/icon_name = "grinder-o"
 	var/blood = 0
 	var/eat_dir = WEST
@@ -24,6 +24,10 @@
 	update_icon()
 	req_one_access = get_all_accesses() + get_all_centcom_access()

+/obj/machinery/recycler/deconstruct(disassembled = TRUE)
+	safety_mode = TRUE //to stop stock parts and circuit from being deleted.
+	return ..()
+
 /obj/machinery/recycler/RefreshParts()
 	var/amt_made = 0
 	var/mat_mod = 0
@@ -77,8 +81,7 @@
 	to_chat(user, "<span class='notice'>You use the cryptographic sequencer on [src].</span>")
 	return TRUE

-/obj/machinery/recycler/update_icon()
-	..()
+/obj/machinery/recycler/update_icon_state()
 	var/is_powered = !(stat & (BROKEN|NOPOWER))
 	if(safety_mode)
 		is_powered = FALSE
@@ -98,18 +101,14 @@
 	. = ..()

 /obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
-	if(stat & (BROKEN|NOPOWER))
-		return
-	if(safety_mode)
+	if(stat & (BROKEN|NOPOWER) || safety_mode)
 		return
+
 	var/list/to_eat
-	if(isitem(AM0))
-		to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
-	else
-		to_eat = list(AM0)
+
+	to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)

 	var/items_recycled = 0
-
 	for(var/i in to_eat)
 		var/atom/movable/AM = i
 		var/obj/item/bodypart/head/as_head = AM
@@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 	..()
 	update_icon()

-/obj/machinery/requests_console/update_icon()
+/obj/machinery/requests_console/update_icon_state()
 	if(stat & NOPOWER)
 		set_light(0)
 	else
@@ -208,7 +208,7 @@
 	to_chat(user, "<span class='warning'>You short out the access controller.</span>")
 	return TRUE

-/obj/machinery/shieldgen/update_icon()
+/obj/machinery/shieldgen/update_icon_state()
 	if(active)
 		icon_state = (stat & BROKEN) ? "shieldonbr":"shieldon"
 	else
@@ -56,7 +56,7 @@

 	money++ //SPESSH MAJICKS

-/obj/machinery/computer/slot_machine/update_icon()
+/obj/machinery/computer/slot_machine/update_icon_state()
 	if(stat & NOPOWER)
 		icon_state = "slots0"

@@ -53,17 +53,18 @@
 	else
 		. += "There is no power cell installed."
 	if(in_range(user, src) || isobserver(user))
-		. += "<span class='notice'>The status display reads: Temperature range at <b>[settableTemperatureRange]°C</b>.<br>Heating power at <b>[heatingPower*0.001]kJ</b>.<br>Power consumption at <b>[(efficiency*-0.0025)+150]%</b>.<span>" //100%, 75%, 50%, 25%	
+		. += "<span class='notice'>The status display reads: Temperature range at <b>[settableTemperatureRange]°C</b>.<br>Heating power at <b>[heatingPower*0.001]kJ</b>.<br>Power consumption at <b>[(efficiency*-0.0025)+150]%</b>.<span>" //100%, 75%, 50%, 25%

-/obj/machinery/space_heater/update_icon()
+/obj/machinery/space_heater/update_icon_state()
 	if(on)
 		icon_state = "sheater-[mode]"
 	else
 		icon_state = "sheater-off"

-	cut_overlays()
+/obj/machinery/space_heater/update_overlays()
+	. = ..()
 	if(panel_open)
-		add_overlay("sheater-open")
+		. += "sheater-open"

 /obj/machinery/space_heater/process()
 	if(!on || !is_operational())
@@ -75,6 +75,12 @@
 	suit_type = /obj/item/clothing/suit/space/hardsuit/medical
 	mask_type = /obj/item/clothing/mask/breath

+/obj/machinery/suit_storage_unit/paramedic
+	name = "paramedic suit storage unit"
+	suit_type = /obj/item/clothing/suit/space/eva/paramedic
+	helmet_type = /obj/item/clothing/head/helmet/space/eva/paramedic
+	mask_type = /obj/item/clothing/mask/breath
+
 /obj/machinery/suit_storage_unit/rd
 	suit_type = /obj/item/clothing/suit/space/hardsuit/rd
 	mask_type = /obj/item/clothing/mask/breath
@@ -134,29 +140,28 @@
 	QDEL_NULL(storage)
 	return ..()

-/obj/machinery/suit_storage_unit/update_icon()
-	cut_overlays()
-
+/obj/machinery/suit_storage_unit/update_overlays()
+	. = ..()
 	if(uv)
 		if(uv_super)
-			add_overlay("super")
+			. += "super"
 		else if(occupant)
-			add_overlay("uvhuman")
+			. += "uvhuman"
 		else
-			add_overlay("uv")
+			. += "uv"
 	else if(state_open)
 		if(stat & BROKEN)
-			add_overlay("broken")
+			. += "broken"
 		else
-			add_overlay("open")
+			. += "open"
 			if(suit)
-				add_overlay("suit")
+				. += "suit"
 			if(helmet)
-				add_overlay("helm")
+				. += "helm"
 			if(storage)
-				add_overlay("storage")
+				. += "storage"
 	else if(occupant)
-		add_overlay("human")
+		. += "human"

 /obj/machinery/suit_storage_unit/power_change()
 	..()
@@ -102,7 +102,7 @@
 	. = ..()
 	. += "A digital display on it reads \"[seconds_remaining()]\"."

-/obj/machinery/syndicatebomb/update_icon()
+/obj/machinery/syndicatebomb/update_icon_state()
 	icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]"

 /obj/machinery/syndicatebomb/proc/seconds_remaining()
@@ -35,8 +35,6 @@

 	signal.data["compression"] = 0
 	signal.mark_done()
-	if(signal.data["slow"] > 0)
-		sleep(signal.data["slow"]) // simulate the network lag if necessary
 	signal.broadcast()

 /obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params)
@@ -41,9 +41,6 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
 		return
 	GLOB.recentmessages.Add(signal_message)

-	if(signal.data["slow"] > 0)
-		sleep(signal.data["slow"]) // simulate the network lag if necessary
-
 	signal.broadcast()

 	if(!GLOB.message_delay)
@@ -31,17 +31,10 @@
 		if(relay_information(signal, /obj/machinery/telecomms/processor))
 			return

-		// failed to send to a processor, relay information anyway
-		signal.data["slow"] += rand(1, 5) // slow the signal down only slightly
-
 	// Try sending it!
 	var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster)

-	var/i = 0
 	for(var/send in try_send)
-		if(i)
-			signal.data["slow"] += rand(0, 1) // slow the signal down only slightly
-		i++
 		if(relay_information(signal, send))
 			break

@@ -79,4 +72,4 @@
 /obj/machinery/telecomms/bus/preset_one/birdstation
 	name = "Bus"
 	autolinkers = list("processor1", "common")
-	freq_listening = list()
+	freq_listening = list()
@@ -74,7 +74,7 @@
 	if(!relay_information(signal, /obj/machinery/telecomms/hub))
 		relay_information(signal, /obj/machinery/telecomms/broadcaster)

-/obj/machinery/telecomms/message_server/update_icon()
+/obj/machinery/telecomms/message_server/update_icon_state()
 	if((stat & (BROKEN|NOPOWER)))
 		icon_state = "server-nopower"
 	else if (!toggled)
@@ -141,7 +141,7 @@
 	if(href_list["photo"])
 		var/mob/M = usr
 		M << browse_rsc(picture.picture_image, "pda_photo.png")
-		M << browse("<html><head><title>PDA Photo</title></head>" \
+		M << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>PDA Photo</title></head>" \
 		+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
 		+ "<img src='pda_photo.png' width='192' style='-ms-interpolation-mode:nearest-neighbor' />" \
 		+ "</body></html>", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
@@ -28,7 +28,6 @@
 	if(istype(machine_from, /obj/machinery/telecomms/bus))
 		relay_direct_information(signal, machine_from) // send the signal back to the machine
 	else // no bus detected - send the signal to servers instead
-		signal.data["slow"] += rand(5, 10) // slow the signal down
 		relay_information(signal, signal.server_type)

 //Preset Processors
@@ -39,11 +39,6 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 		return
 	var/send_count = 0

-	// Apply some lag based on traffic rates
-	var/netlag = round(traffic / 50)
-	if(netlag > signal.data["slow"])
-		signal.data["slow"] = netlag
-
 	// Loop through all linked machines and send the signal or copy.
 	for(var/obj/machinery/telecomms/machine in links)
 		if(filter && !istype( machine, filter ))
@@ -109,7 +104,7 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 					links |= T
 					T.links |= src

-/obj/machinery/telecomms/update_icon()
+/obj/machinery/telecomms/update_icon_state()
 	if(on)
 		if(panel_open)
 			icon_state = "[initial(icon_state)]_o"
@@ -85,7 +85,7 @@
 			calibrated = FALSE
 	return

-/obj/machinery/teleport/hub/update_icon()
+/obj/machinery/teleport/hub/update_icon_state()
 	if(panel_open)
 		icon_state = "tele-o"
 	else if(is_ready())
@@ -218,7 +218,7 @@
 	if(teleporter_hub)
 		teleporter_hub.update_icon()

-/obj/machinery/teleport/station/update_icon()
+/obj/machinery/teleport/station/update_icon_state()
 	if(panel_open)
 		icon_state = "controller-o"
 	else if(stat & (BROKEN|NOPOWER))
@@ -46,7 +46,12 @@
 							)

 /obj/machinery/autoylathe/Initialize()
-	AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/plastic), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
+	var/static/list/allowed_materials = list(
+		/datum/material/iron,
+		/datum/material/glass,
+		/datum/material/plastic
+		)
+	AddComponent(/datum/component/material_container, allowed_materials, 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
 	. = ..()

 	wires = new /datum/wires/autoylathe(src)
@@ -121,7 +126,7 @@
 	return ..()

 /obj/machinery/autoylathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted)
-	if(item_inserted.custom_materials?.len && item_inserted.custom_materials[getmaterialref(/datum/material/glass)])
+	if(item_inserted.custom_materials?.len && item_inserted.custom_materials[SSmaterials.GetMaterialRef(/datum/material/glass)])
 		flick("autolathe_r",src)//plays glass insertion animation by default otherwise
 	else
 		flick("autolathe_o",src)//plays metal insertion animation
@@ -38,8 +38,7 @@
 	..()
 	update_icon()

-/obj/machinery/transformer/update_icon()
-	..()
+/obj/machinery/transformer/update_icon_state()
 	if(stat & (BROKEN|NOPOWER) || cooldown == 1)
 		icon_state = "separator-AO0"
 	else
@@ -199,8 +199,7 @@



-/obj/machinery/washing_machine/update_icon()
-	cut_overlays()
+/obj/machinery/washing_machine/update_icon_state()
 	if(busy)
 		icon_state = "wm_running_[bloody_mess]"
 	else if(bloody_mess)
@@ -208,8 +207,11 @@
 	else
 		var/full = contents.len ? 1 : 0
 		icon_state = "wm_[state_open]_[full]"
+
+/obj/machinery/washing_machine/update_overlays()
+	. = ..()
 	if(panel_open)
-		add_overlay("wm_panel")
+		. += "wm_panel"

 /obj/machinery/washing_machine/attackby(obj/item/W, mob/user, params)
 	if(panel_open && !busy && default_unfasten_wrench(user, W))