Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

baystation12.dme

@@ -16,7 +16,6 @@
 #include "code\setup.dm"
 #include "code\stylesheet.dm"
 #include "code\world.dm"
-#include "code\__HELPERS\bygex.dm"
 #include "code\__HELPERS\files.dm"
 #include "code\__HELPERS\game.dm"
 #include "code\__HELPERS\global_lists.dm"
@@ -178,8 +177,8 @@
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
 #include "code\game\area\Space Station 13 areas.dm"
-#include "code\game\dna\dna.dm"
-#include "code\game\dna\dna_misc.dm"
+#include "code\game\dna\dna2.dm"
+#include "code\game\dna\dna2_helpers.dm"
 #include "code\game\dna\dna_modifier.dm"
 #include "code\game\gamemodes\events.dm"
 #include "code\game\gamemodes\factions.dm"
@@ -267,6 +266,7 @@
 #include "code\game\machinery\cloning.dm"
 #include "code\game\machinery\constructable_frame.dm"
 #include "code\game\machinery\cryo.dm"
+#include "code\game\machinery\cryopod.dm"
 #include "code\game\machinery\deployable.dm"
 #include "code\game\machinery\door_control.dm"
 #include "code\game\machinery\doppler_array.dm"
@@ -834,6 +834,7 @@
 #include "code\modules\mining\money_bag.dm"
 #include "code\modules\mining\ores_coins.dm"
 #include "code\modules\mining\satchel_ore_boxdm.dm"
+#include "code\modules\mob\abilities.dm"
 #include "code\modules\mob\death.dm"
 #include "code\modules\mob\emote.dm"
 #include "code\modules\mob\inventory.dm"

code/WorkInProgress/carn/master_controller_semi-seq.dm

@@ -50,7 +50,7 @@ datum/controller/game_controller/New()
 	if(!syndicate_code_response)	syndicate_code_response	= generate_code_phrase()
 	if(!ticker)						ticker = new /datum/controller/gameticker()
 	if(!emergency_shuttle)			emergency_shuttle = new /datum/shuttle_controller/emergency_shuttle()
-
+	if(artifact_spawn)				artifact_spawning_turfs = artifact_spawn
 
 datum/controller/game_controller/proc/setup()
 	world.tick_lag = config.Ticklag

code/WorkInProgress/kilakk/fax.dm

@@ -109,10 +109,13 @@ var/list/alldepartments = list("Central Command")
 
 	if(href_list["remove"])
 		if(tofax)
-			tofax.loc = usr.loc
-			usr.put_in_hands(tofax)
-			usr << "<span class='notice'>You take the paper out of \the [src].</span>"
-			tofax = null
+			if(!ishuman(usr))
+				usr << "<span class='warning'>You can't do it.</span>"
+			else
+				tofax.loc = usr.loc
+				usr.put_in_hands(tofax)
+				usr << "<span class='notice'>You take the paper out of \the [src].</span>"
+				tofax = null
 
 	if(href_list["scan"])
 		if (scan)

code/__HELPERS/bygex.dm

@@ -1,107 +0,0 @@
-#ifndef LIBREGEX_LIBRARY
-	#define LIBREGEX_LIBRARY "bygex"
-#endif
-
-proc
-	regEx_compare(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regEx_compare")(str, exp))
-
-	regex_compare(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regex_compare")(str, exp))
-
-	regEx_find(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regEx_find")(str, exp))
-
-	regex_find(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regex_find")(str, exp))
-
-	regEx_replaceall(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regEx_replaceall")(str, exp, fmt)
-
-	regex_replaceall(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regex_replaceall")(str, exp, fmt)
-
-	replacetextEx(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regEx_replaceallliteral")(str, exp, fmt)
-
-	replacetext(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regex_replaceallliteral")(str, exp, fmt)
-
-	regEx_replace(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regEx_replace")(str, exp, fmt)
-
-	regex_replace(str, exp, fmt)
-		return call(LIBREGEX_LIBRARY, "regex_replace")(str, exp, fmt)
-
-	regEx_findall(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regEx_findall")(str, exp))
-
-	regex_findall(str, exp)
-		return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regex_findall")(str, exp))
-
-
-//upon calling a regex match or search, a /datum/regex object is created with str(haystack) and exp(needle) variables set
-//it also contains a list(matches) of /datum/match objects, each of which holds the position and length of the match
-//matched strings are not returned from the dll, in order to save on memory allocation for large numbers of strings
-//instead, you can use regex.str(matchnum) to fetch this string as needed.
-//likewise you can also use regex.pos(matchnum) and regex.len(matchnum) as shorthands
-/datum/regex
-	var/str
-	var/exp
-	var/error
-	var/anchors = 0
-	var/list/matches = list()
-
-	New(str, exp, results)
-		src.str = str
-		src.exp = exp
-
-		if(findtext(results, "Err", 1, 4))	//error message
-			src.error = results
-		else
-			var/list/L = params2list(results)
-			var/list/M
-			var{i;j}
-			for(i in L)
-				M = L[i]
-				for(j=2, j<=M.len, j+=2)
-					matches += new /datum/match(text2num(M[j-1]),text2num(M[j]))
-			anchors = (j-2)/2
-		return matches
-
-	proc
-		str(i)
-			if(!i)	return str
-			var/datum/match/M = matches[i]
-			return copytext(str, M.pos, M.pos+M.len)
-
-		pos(i)
-			if(!i)	return 1
-			var/datum/match/M = matches[i]
-			return M.pos
-
-		len(i)
-			if(!i)	return length(str)
-			var/datum/match/M = matches[i]
-			return M.len
-
-		end(i)
-			if(!i) return length(str)
-			var/datum/match/M = matches[i]
-			return M.pos + M.len
-
-		report()	//debug tool
-			. = ":: RESULTS ::\n:: str :: [html_encode(str)]\n:: exp :: [html_encode(exp)]\n:: anchors :: [anchors]"
-			if(error)
-				. += "\n<font color='red'>[error]</font>"
-				return
-			for(var/i=1, i<=matches.len, ++i)
-				. += "\nMatch[i]\n\t[html_encode(str(i))]\n\tpos=[pos(i)] len=[len(i)]"
-
-/datum/match
-	var/pos
-	var/len
-
-	New(pos, len)
-		src.pos = pos
-		src.len = len

code/__HELPERS/text.dm

@@ -194,7 +194,35 @@ proc/checkhtml(var/t)
 /*
  * Text modification
  */
- //Adds 'u' number of zeros ahead of the text 't'
+/proc/replacetext(text, find, replacement)
+	var/find_len = length(find)
+	if(find_len < 1)	return text
+	. = ""
+	var/last_found = 1
+	while(1)
+		var/found = findtext(text, find, last_found, 0)
+		. += copytext(text, last_found, found)
+		if(found)
+			. += replacement
+			last_found = found + find_len
+			continue
+		return .
+
+/proc/replacetextEx(text, find, replacement)
+	var/find_len = length(find)
+	if(find_len < 1)	return text
+	. = ""
+	var/last_found = 1
+	while(1)
+		var/found = findtextEx(text, find, last_found, 0)
+		. += copytext(text, last_found, found)
+		if(found)
+			. += replacement
+			last_found = found + find_len
+			continue
+		return .
+
+//Adds 'u' number of zeros ahead of the text 't'
 /proc/add_zero(t, u)
 	while (length(t) < u)
 		t = "0[t]"

code/__HELPERS/type2type.dm

@@ -261,4 +261,5 @@ proc/tg_list2text(list/list, glue=",")
 	switch(ui_style)
 		if("old")		return 'icons/mob/screen1_old.dmi'
 		if("Orange")	return 'icons/mob/screen1_Orange.dmi'
-		else			return 'icons/mob/screen1_Midnight.dmi'
+		if("Midnight")	return 'icons/mob/screen1_Midnight.dmi'
+		else			return 'icons/mob/screen1_White.dmi'

code/_onclick/click.dm

@@ -291,7 +291,7 @@
 
 // Simple helper to face what you clicked on, in case it should be needed in more than one place
 /mob/proc/face_atom(var/atom/A)
-	if( buckled || !A || !x || !y || !A.x || !A.y ) return
+	if( stat || buckled || !A || !x || !y || !A.x || !A.y ) return
 	var/dx = A.x - x
 	var/dy = A.y - y
 	if(!dx && !dy) return

code/_onclick/hud/hud.dm

@@ -166,9 +166,11 @@ datum/hud/New(mob/owner)
 	if(!ismob(mymob)) return 0
 	if(!mymob.client) return 0
 	var/ui_style = ui_style2icon(mymob.client.prefs.UI_style)
+	var/ui_color = mymob.client.prefs.UI_style_color
+	var/ui_alpha = mymob.client.prefs.UI_style_alpha
 
 	if(ishuman(mymob))
-		human_hud(ui_style) // Pass the player the UI style chosen in preferences
+		human_hud(ui_style, ui_color, ui_alpha) // Pass the player the UI style chosen in preferences
 	else if(ismonkey(mymob))
 		monkey_hud(ui_style)
 	else if(isbrain(mymob))

code/_onclick/hud/human.dm

@@ -1,4 +1,4 @@
-/datum/hud/proc/human_hud(var/ui_style='icons/mob/screen1_old.dmi')
+/datum/hud/proc/human_hud(var/ui_style='icons/mob/screen1_White.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255)
 
 	src.adding = list()
 	src.other = list()
@@ -73,6 +73,8 @@
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
 	using.screen_loc = ui_movi
 	using.layer = 20
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.adding += using
 	move_intent = using
 
@@ -82,6 +84,8 @@
 	using.icon_state = "act_drop"
 	using.screen_loc = ui_drop_throw
 	using.layer = 19
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.hotkeybuttons += using
 
 	inv_box = new /obj/screen/inventory()
@@ -92,6 +96,8 @@
 	inv_box.icon_state = "center"
 	inv_box.screen_loc = ui_iclothing
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -102,6 +108,8 @@
 	inv_box.icon_state = "equip"
 	inv_box.screen_loc = ui_oclothing
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -114,6 +122,9 @@
 	inv_box.screen_loc = ui_rhand
 	inv_box.slot_id = slot_r_hand
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
+
 	src.r_hand_hud_object = inv_box
 	src.adding += inv_box
 
@@ -127,6 +138,8 @@
 	inv_box.screen_loc = ui_lhand
 	inv_box.slot_id = slot_l_hand
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.l_hand_hud_object = inv_box
 	src.adding += inv_box
 
@@ -137,6 +150,8 @@
 	using.icon_state = "hand1"
 	using.screen_loc = ui_swaphand1
 	using.layer = 19
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.adding += using
 
 	using = new /obj/screen/inventory()
@@ -146,6 +161,8 @@
 	using.icon_state = "hand2"
 	using.screen_loc = ui_swaphand2
 	using.layer = 19
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.adding += using
 
 	inv_box = new /obj/screen/inventory()
@@ -156,6 +173,8 @@
 	inv_box.screen_loc = ui_id
 	inv_box.slot_id = slot_wear_id
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -166,6 +185,8 @@
 	inv_box.screen_loc = ui_mask
 	inv_box.slot_id = slot_wear_mask
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -176,6 +197,8 @@
 	inv_box.screen_loc = ui_back
 	inv_box.slot_id = slot_back
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -185,6 +208,8 @@
 	inv_box.screen_loc = ui_storage1
 	inv_box.slot_id = slot_l_store
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -194,6 +219,8 @@
 	inv_box.screen_loc = ui_storage2
 	inv_box.slot_id = slot_r_store
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -204,6 +231,8 @@
 	inv_box.screen_loc = ui_sstore1
 	inv_box.slot_id = slot_s_store
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	using = new /obj/screen()
@@ -212,6 +241,8 @@
 	using.icon_state = "act_resist"
 	using.screen_loc = ui_pull_resist
 	using.layer = 19
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.hotkeybuttons += using
 
 	using = new /obj/screen()
@@ -220,6 +251,8 @@
 	using.icon_state = "other"
 	using.screen_loc = ui_inventory
 	using.layer = 20
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.adding += using
 
 	using = new /obj/screen()
@@ -228,6 +261,8 @@
 	using.icon_state = "act_equip"
 	using.screen_loc = ui_equip
 	using.layer = 20
+	using.color = ui_color
+	using.alpha = ui_alpha
 	src.adding += using
 
 	inv_box = new /obj/screen/inventory()
@@ -237,6 +272,8 @@
 	inv_box.screen_loc = ui_gloves
 	inv_box.slot_id = slot_gloves
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -246,6 +283,8 @@
 	inv_box.screen_loc = ui_glasses
 	inv_box.slot_id = slot_glasses
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -255,6 +294,8 @@
 	inv_box.screen_loc = ui_l_ear
 	inv_box.slot_id = slot_l_ear
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -264,6 +305,8 @@
 	inv_box.screen_loc = ui_r_ear
 	inv_box.slot_id = slot_r_ear
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -273,6 +316,8 @@
 	inv_box.screen_loc = ui_head
 	inv_box.slot_id = slot_head
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -282,6 +327,8 @@
 	inv_box.screen_loc = ui_shoes
 	inv_box.slot_id = slot_shoes
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.other += inv_box
 
 	inv_box = new /obj/screen/inventory()
@@ -291,6 +338,8 @@
 	inv_box.screen_loc = ui_belt
 	inv_box.slot_id = slot_belt
 	inv_box.layer = 19
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	src.adding += inv_box
 
 	mymob.throw_icon = new /obj/screen()
@@ -298,6 +347,8 @@
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
 	mymob.throw_icon.screen_loc = ui_drop_throw
+	mymob.throw_icon.color = ui_color
+	mymob.throw_icon.alpha = ui_alpha
 	src.hotkeybuttons += mymob.throw_icon
 
 	mymob.oxygen = new /obj/screen()
@@ -382,6 +433,8 @@
 
 	mymob.zone_sel = new /obj/screen/zone_sel( null )
 	mymob.zone_sel.icon = ui_style
+	mymob.zone_sel.color = ui_color
+	mymob.zone_sel.alpha = ui_alpha
 	mymob.zone_sel.overlays.Cut()
 	mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")
 

code/_onclick/hud/screen_objects.dm

@@ -276,37 +276,79 @@
 							C << "<span class='notice'>You are not wearing a mask.</span>"
 							return 1
 						else
-							if(istype(C.l_hand, /obj/item/weapon/tank))
-								C << "<span class='notice'>You are now running on internals from the [C.l_hand] on your left hand.</span>"
-								C.internal = C.l_hand
-							else if(istype(C.r_hand, /obj/item/weapon/tank))
-								C << "<span class='notice'>You are now running on internals from the [C.r_hand] on your right hand.</span>"
-								C.internal = C.r_hand
-							else if(ishuman(C))
+							var/list/nicename = null
+							var/list/tankcheck = null
+							var/breathes = "oxygen"    //default, we'll check later
+							var/list/contents = list()							
+
+							if(ishuman(C))
 								var/mob/living/carbon/human/H = C
-								if(istype(H.s_store, /obj/item/weapon/tank))
-									H << "<span class='notice'>You are now running on internals from the [H.s_store] on your [H.wear_suit].</span>"
-									H.internal = H.s_store
-								else if(istype(H.belt, /obj/item/weapon/tank))
-									H << "<span class='notice'>You are now running on internals from the [H.belt] on your belt.</span>"
-									H.internal = H.belt
-								else if(istype(H.l_store, /obj/item/weapon/tank))
-									H << "<span class='notice'>You are now running on internals from the [H.l_store] in your left pocket.</span>"
-									H.internal = H.l_store
-								else if(istype(H.r_store, /obj/item/weapon/tank))
-									H << "<span class='notice'>You are now running on internals from the [H.r_store] in your right pocket.</span>"
-									H.internal = H.r_store
+								breathes = H.species.breath_type
+								nicename = list ("suit", "back", "belt", "right hand", "left hand", "left pocket", "right pocket")
+								tankcheck = list (H.s_store, C.back, H.belt, C.r_hand, C.l_hand, H.l_store, H.r_store)
 
-							//Seperate so CO2 jetpacks are a little less cumbersome.
-							if(!C.internal && istype(C.back, /obj/item/weapon/tank))
-								C << "<span class='notice'>You are now running on internals from the [C.back] on your back.</span>"
-								C.internal = C.back
+							else    
 
+								nicename = list("Right Hand", "Left Hand", "Back")
+								tankcheck = list(C.r_hand, C.l_hand, C.back)
+
+							for(var/i=1, i<tankcheck.len+1, ++i)
+								if(istype(tankcheck[i], /obj/item/weapon/tank))
+									var/obj/item/weapon/tank/t = tankcheck[i]
+									if (!isnull(t.manipulated_by) && t.manipulated_by != C.real_name && findtext(t.desc,breathes))
+										contents.Add(t.air_contents.total_moles)	//Someone messed with the tank and put unknown gasses
+										continue					//in it, so we're going to believe the tank is what it says it is
+									switch(breathes)					
+																		//These tanks we're sure of their contents
+										if("nitrogen") 							//So we're a bit more picky about them.
+											
+											if(t.air_contents.nitrogen && !t.air_contents.oxygen)
+												contents.Add(t.air_contents.nitrogen)
+											else
+												contents.Add(0)	
+
+										if ("oxygen")
+											if(t.air_contents.oxygen && !t.air_contents.toxins) 
+												contents.Add(t.air_contents.oxygen)
+											else
+												contents.Add(0)
+
+										// No races breath this, but never know about downstream servers.
+										if ("carbon dioxide")
+											if(t.air_contents.carbon_dioxide && !t.air_contents.toxins)
+												contents.Add(t.air_contents.carbon_dioxide)
+											else
+												contents.Add(0)
+										
+	
+								else									
+									//no tank so we set contents to 0
+									contents.Add(0)
+
+							//Alright now we know the contents of the tanks so we have to pick the best one.
+
+							var/best = 0
+							var/bestcontents = 0
+							for(var/i=1, i <  contents.len + 1 , ++i)
+								if(!contents[i])
+									continue	
+								if(contents[i] > bestcontents)
+									best = i
+									bestcontents = contents[i]
+							
+							
+							//We've determined the best container now we set it as our internals
+
+							if(best)
+								C << "<span class='notice'>You are now running on internals from [tankcheck[best]] on your [nicename[best]].</span>"
+								C.internal = tankcheck[best]
+							
+								
 							if(C.internal)
 								if(C.internals)
 									C.internals.icon_state = "internal1"
 							else
-								C << "<span class='notice'>You don't have an oxygen tank.</span>"
+								C << "<span class='notice'>You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.</span>"
 		if("act_intent")
 			usr.a_intent_change("right")
 		if("help")

code/controllers/configuration.dm

@@ -62,6 +62,9 @@
 	var/automute_on = 0					//enables automuting/spam prevention
 	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
 
+	var/disable_player_mice = 0
+	var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech
+
 	var/usealienwhitelist = 0
 	var/limitalienplayers = 0
 	var/alien_to_human_ratio = 0.5
@@ -425,6 +428,12 @@
 				if("ghost_interaction")
 					config.ghost_interaction = 1
 
+				if("disable_player_mice")
+					config.disable_player_mice = 1
+
+				if("uneducated_mice")
+					config.uneducated_mice = 1
+
 				if("comms_password")
 					config.comms_password = value
 

code/datums/datacore.dm

@@ -112,8 +112,8 @@
 		L.fields["sex"]			= H.gender
 		L.fields["b_type"]		= H.b_type
 		L.fields["b_dna"]		= H.dna.unique_enzymes
-		L.fields["enzymes"]		= H.dna.struc_enzymes
-		L.fields["identity"]	= H.dna.uni_identity
+		L.fields["enzymes"]		= H.dna.SE
+		L.fields["identity"]	= H.dna.UI
 		L.fields["image"]		= getFlatIcon(H,0)	//This is god-awful
 		locked += L
 	return

code/datums/diseases/dna_spread.dm

@@ -39,13 +39,13 @@
 
 				//Save original dna for when the disease is cured.
 				src.original_dna["name"] = affected_mob.real_name
-				src.original_dna["UI"] = affected_mob.dna.uni_identity
-				src.original_dna["SE"] = affected_mob.dna.struc_enzymes
+				src.original_dna["UI"] = affected_mob.dna.UI
+				src.original_dna["SE"] = affected_mob.dna.SE
 
 				affected_mob << "\red You don't feel like yourself.."
-				affected_mob.dna.uni_identity = strain_data["UI"]
-				updateappearance(affected_mob, affected_mob.dna.uni_identity)
-				affected_mob.dna.struc_enzymes = strain_data["SE"]
+				affected_mob.UpdateAppearance(strain_data["UI"])
+				affected_mob.dna.SE = strain_data["SE"]
+				affected_mob.dna.UpdateSE()
 				affected_mob.real_name = strain_data["name"]
 				domutcheck(affected_mob)
 
@@ -56,9 +56,9 @@
 
 /datum/disease/dnaspread/Del()
 	if ((original_dna["name"]) && (original_dna["UI"]) && (original_dna["SE"]))
-		affected_mob.dna.uni_identity = original_dna["UI"]
-		updateappearance(affected_mob, affected_mob.dna.uni_identity)
-		affected_mob.dna.struc_enzymes = original_dna["SE"]
+		affected_mob.UpdateAppearance(original_dna["UI"])
+		affected_mob.dna.SE = original_dna["SE"]
+		affected_mob.dna.UpdateSE()
 		affected_mob.real_name = original_dna["name"]
 
 		affected_mob << "\blue You feel more like yourself."

code/datums/mind.dm

@@ -726,7 +726,7 @@ datum/mind
 					else
 						current.dna = changeling.absorbed_dna[1]
 						current.real_name = current.dna.real_name
-						updateappearance(current, current.dna.uni_identity)
+						current.UpdateAppearance()
 						domutcheck(current, null)
 
 		else if (href_list["nuclear"])

code/game/dna/dna2.dm

@@ -0,0 +1,333 @@
+/**
+* DNA 2: The Spaghetti Strikes Back
+*
+* @author N3X15 <nexisentertainment@gmail.com>
+*/
+
+// What each index means:
+#define DNA_OFF_LOWERBOUND 0
+#define DNA_OFF_UPPERBOUND 1
+#define DNA_ON_LOWERBOUND  2
+#define DNA_ON_UPPERBOUND  3
+
+// Define block bounds (off-low,off-high,on-low,on-high)
+// Used in setupgame.dm
+#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
+#define DNA_HARDER_BOUNDS  list(1,3049,3050,4095)
+#define DNA_HARD_BOUNDS    list(1,3490,3500,4095)
+
+// Defines which values mean "on" or "off".
+//  This is to make some of the more OP superpowers a larger PITA to activate,
+//  and to tell our new DNA datum which values to set in order to turn something
+//  on or off.
+var/global/list/dna_activity_bounds[STRUCDNASIZE]
+
+// Used to determine what each block means (admin hax and species stuff on /vg/, mostly)
+var/global/list/assigned_blocks[STRUCDNASIZE]
+
+// UI Indices (can change to mutblock style, if desired)
+#define DNA_UI_HAIR_R      1
+#define DNA_UI_HAIR_G      2
+#define DNA_UI_HAIR_B      3
+#define DNA_UI_BEARD_R     4
+#define DNA_UI_BEARD_G     5
+#define DNA_UI_BEARD_B     6
+#define DNA_UI_SKIN_TONE   7
+#define DNA_UI_EYES_R      8
+#define DNA_UI_EYES_G      9
+#define DNA_UI_EYES_B      10
+#define DNA_UI_GENDER      11
+#define DNA_UI_BEARD_STYLE 12
+#define DNA_UI_HAIR_STYLE  13
+#define DNA_UI_LENGTH      13 // Update this when you add something, or you WILL break shit.
+
+
+/* Note RE: unassigned blocks
+
+   Many genes in baycode are currently sitting unused
+   (compare setupgame.dm to the number of *BLOCK variables).
+
+   This datum will return 0 (or equivalent) if asked about
+   a block 0 (which means the gene was unassigned).  Setters
+   will silently return without performing any action.
+
+   I have code to assign these genes in a streamlined manner,
+   but in order to avoid breaking things, I've left the
+   existing setupgame.dm intact.  Please let me know if you
+   need this behavior changed.
+ */
+
+/datum/dna
+	// READ-ONLY, GETS OVERWRITTEN
+	// DO NOT FUCK WITH THESE OR BYOND WILL EAT YOUR FACE
+	var/uni_identity="" // Encoded UI
+	var/struc_enzymes="" // Encoded SE
+	var/unique_enzymes="" // MD5 of player name
+
+	// Internal dirtiness checks
+	var/dirtyUI=0
+	var/dirtySE=0
+
+	// Okay to read, but you're an idiot if you do.
+	// BLOCK = VALUE
+	var/list/SE[STRUCDNASIZE]
+	var/list/UI[DNA_UI_LENGTH]
+
+	// From old dna.
+	var/b_type = "A+"  // Should probably change to an integer => string map but I'm lazy.
+	var/mutantrace = null  // The type of mutant race the player is, if applicable (i.e. potato-man)
+	var/real_name          // Stores the real name of the person who originally got this dna datum. Used primarily for changelings,
+///////////////////////////////////////
+// UNIQUE IDENTITY
+///////////////////////////////////////
+
+// Create random UI.
+/datum/dna/proc/ResetUI(var/defer=0)
+	for(var/i=1,i<=DNA_UI_LENGTH,i++)
+		UI[i]=rand(0,4095)
+	if(!defer)
+		UpdateUI()
+
+/datum/dna/proc/ResetUIFrom(var/mob/living/carbon/human/character)
+	// INITIALIZE!
+	ResetUI(1)
+	// Hair
+	// FIXME:  Species-specific defaults pls
+	if(!character.h_style)
+		character.h_style = "Skinhead"
+	var/hair = hair_styles_list.Find(character.h_style)
+
+	// Facial Hair
+	if(!character.f_style)
+		character.f_style = "Shaved"
+	var/beard	= facial_hair_styles_list.Find(character.f_style)
+
+	SetUIValueRange(DNA_UI_HAIR_R,    character.r_hair,    255,    1)
+	SetUIValueRange(DNA_UI_HAIR_G,    character.g_hair,    255,    1)
+	SetUIValueRange(DNA_UI_HAIR_B,    character.b_hair,    255,    1)
+
+	SetUIValueRange(DNA_UI_BEARD_R,   character.r_facial,  255,    1)
+	SetUIValueRange(DNA_UI_BEARD_G,   character.g_facial,  255,    1)
+	SetUIValueRange(DNA_UI_BEARD_B,   character.b_facial,  255,    1)
+
+	SetUIValueRange(DNA_UI_BEARD_R,   character.r_eyes,    255,    1)
+	SetUIValueRange(DNA_UI_BEARD_G,   character.g_eyes,    255,    1)
+	SetUIValueRange(DNA_UI_BEARD_B,   character.b_eyes,    255,    1)
+
+	SetUIValueRange(DNA_UI_SKIN_TONE, character.s_tone,    220,    1)
+
+	SetUIState(DNA_UI_GENDER,         character.gender!=MALE,      1)
+
+	SetUIValueRange(DNA_UI_HAIR_STYLE,  hair,  hair_styles_list.len,       1)
+	SetUIValueRange(DNA_UI_BEARD_STYLE, beard, facial_hair_styles_list.len,1)
+
+	UpdateUI()
+
+// Set a DNA UI block's raw value.
+/datum/dna/proc/SetUIValue(var/block,var/value,var/defer=0)
+	if (block<=0) return
+	ASSERT(value>=0)
+	ASSERT(value<=4095)
+	UI[block]=value
+	dirtyUI=1
+	if(!defer)
+		UpdateUI()
+
+// Get a DNA UI block's raw value.
+/datum/dna/proc/GetUIValue(var/block)
+	if (block<=0) return 0
+	return UI[block]
+
+// Set a DNA UI block's value, given a value and a max possible value.
+// Used in hair and facial styles (value being the index and maxvalue being the len of the hairstyle list)
+/datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue)
+	if (block<=0) return
+	ASSERT(maxvalue<=4095)
+	var/range = round(4095 / maxvalue)
+	if(value)
+		SetUIValue(block,value * range - rand(1,range-1))
+
+// Getter version of above.
+/datum/dna/proc/GetUIValueRange(var/block,var/maxvalue)
+	if (block<=0) return 0
+	var/value = GetUIValue(block)
+	return round(1 +(value / 4096)*maxvalue)
+
+// Is the UI gene "on" or "off"?
+// For UI, this is simply a check of if the value is > 2050.
+/datum/dna/proc/GetUIState(var/block)
+	if (block<=0) return
+	return UI[block] > 2050
+
+
+// Set UI gene "on" (1) or "off" (0)
+/datum/dna/proc/SetUIState(var/block,var/on,var/defer=0)
+	if (block<=0) return
+	var/val
+	if(on)
+		val=rand(2050,4095)
+	else
+		val=rand(1,2049)
+	SetUIValue(block,val,defer)
+
+// Get a hex-encoded UI block.
+/datum/dna/proc/GetUIBlock(var/block)
+	return EncodeDNABlock(GetUIValue(block))
+
+// Do not use this unless you absolutely have to.
+// Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
+// Used in DNA modifiers.
+/datum/dna/proc/SetUIBlock(var/block,var/value,var/defer=0)
+	if (block<=0) return
+	return SetUIValue(block,hex2num(value),defer)
+
+// Get a sub-block from a block.
+/datum/dna/proc/GetUISubBlock(var/block,var/subBlock)
+	return copytext(GetUIBlock(block),subBlock,subBlock+1)
+
+// Do not use this unless you absolutely have to.
+// Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
+// Used in DNA modifiers.
+/datum/dna/proc/SetUISubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
+	if (block<=0) return
+	var/oldBlock=GetUIBlock(block)
+	var/newBlock=""
+	for(var/i=1, i<=length(oldBlock), i++)
+		if(i==subBlock)
+			newBlock+=newSubBlock
+		else
+			newBlock+=copytext(oldBlock,i,i+1)
+	SetUIBlock(block,newBlock,defer)
+
+///////////////////////////////////////
+// STRUCTURAL ENZYMES
+///////////////////////////////////////
+
+// "Zeroes out" all of the blocks.
+/datum/dna/proc/ResetSE()
+	for(var/i = 1, i <= STRUCDNASIZE, i++)
+		SetSEValue(i,rand(1,1024),1)
+	UpdateSE()
+
+// Set a DNA SE block's raw value.
+/datum/dna/proc/SetSEValue(var/block,var/value,var/defer=0)
+	//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
+	if (block<=0) return
+	ASSERT(value>=0)
+	ASSERT(value<=4095)
+	SE[block]=value
+	dirtySE=1
+	if(!defer)
+		UpdateSE()
+
+// Get a DNA SE block's raw value.
+/datum/dna/proc/GetSEValue(var/block)
+	if (block<=0) return 0
+	return SE[block]
+
+// Set a DNA SE block's value, given a value and a max possible value.
+// Might be used for species?
+/datum/dna/proc/SetSEValueRange(var/block,var/value,var/maxvalue)
+	if (block<=0) return
+	ASSERT(maxvalue<=4095)
+	var/range = round(4095 / maxvalue)
+	if(value)
+		SetSEValue(block, value * range - rand(1,range-1))
+
+// Is the block "on" (1) or "off" (0)? (Un-assigned genes are always off.)
+/datum/dna/proc/GetSEState(var/block)
+	if (block<=0) return 0
+	var/list/BOUNDS=GetDNABounds(block)
+	var/value=GetSEValue(block)
+	return (value > BOUNDS[DNA_ON_LOWERBOUND])
+
+// Set a block "on" or "off".
+/datum/dna/proc/SetSEState(var/block,var/on,var/defer=0)
+	if (block<=0) return
+	var/list/BOUNDS=GetDNABounds(block)
+	var/val
+	if(on)
+		val=rand(BOUNDS[DNA_ON_LOWERBOUND],BOUNDS[DNA_ON_UPPERBOUND])
+	else
+		val=rand(BOUNDS[DNA_OFF_LOWERBOUND],BOUNDS[DNA_OFF_UPPERBOUND])
+	SetSEValue(block,val,defer)
+
+// Get hex-encoded SE block.
+/datum/dna/proc/GetSEBlock(var/block)
+	return EncodeDNABlock(GetSEValue(block))
+
+// Do not use this unless you absolutely have to.
+// Set a block from a hex string.  This is inefficient.  If you can, use SetUIValue().
+// Used in DNA modifiers.
+/datum/dna/proc/SetSEBlock(var/block,var/value,var/defer=0)
+	if (block<=0) return
+	var/nval=hex2num(value)
+	//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
+	return SetSEValue(block,nval,defer)
+
+/datum/dna/proc/GetSESubBlock(var/block,var/subBlock)
+	return copytext(GetSEBlock(block),subBlock,subBlock+1)
+
+// Do not use this unless you absolutely have to.
+// Set a sub-block from a hex character.  This is inefficient.  If you can, use SetUIValue().
+// Used in DNA modifiers.
+/datum/dna/proc/SetSESubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
+	if (block<=0) return
+	var/oldBlock=GetSEBlock(block)
+	var/newBlock=""
+	for(var/i=1, i<=length(oldBlock), i++)
+		if(i==subBlock)
+			newBlock+=newSubBlock
+		else
+			newBlock+=copytext(oldBlock,i,i+1)
+	//testing("SetSESubBlock([block],[subBlock],[newSubBlock],[defer]): [oldBlock] -> [newBlock]")
+	SetSEBlock(block,newBlock,defer)
+
+
+/proc/EncodeDNABlock(var/value)
+	return add_zero2(num2hex(value,1), 3)
+
+/datum/dna/proc/UpdateUI()
+	src.uni_identity=""
+	for(var/block in UI)
+		uni_identity += EncodeDNABlock(block)
+	//testing("New UI: [uni_identity]")
+	dirtyUI=0
+
+/datum/dna/proc/UpdateSE()
+	//var/oldse=struc_enzymes
+	struc_enzymes=""
+	for(var/block in SE)
+		struc_enzymes += EncodeDNABlock(block)
+	//testing("Old SE: [oldse]")
+	//testing("New SE: [struc_enzymes]")
+	dirtySE=0
+
+// BACK-COMPAT!
+//  Just checks our character has all the crap it needs.
+/datum/dna/proc/check_integrity(var/mob/living/carbon/human/character)
+	if(character)
+		if(UI.len != DNA_UI_LENGTH)
+			ResetUIFrom(character)
+
+		if(length(struc_enzymes)!= 3*STRUCDNASIZE)
+			ResetSE()
+
+		if(length(unique_enzymes) != 32)
+			unique_enzymes = md5(character.real_name)
+	else
+		if(length(uni_identity) != 3*DNA_UI_LENGTH)
+			uni_identity = "00600200A00E0110148FC01300B0095BD7FD3F4"
+		if(length(struc_enzymes)!= 3*STRUCDNASIZE)
+			struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+
+// BACK-COMPAT!
+//  Initial DNA setup.  I'm kind of wondering why the hell this doesn't just call the above.
+/datum/dna/proc/ready_dna(mob/living/carbon/human/character)
+	ResetUIFrom(character)
+
+	ResetSE()
+
+	unique_enzymes = md5(character.real_name)
+	reg_dna[unique_enzymes] = character.real_name
+

code/game/dna/dna2_helpers.dm

@@ -0,0 +1,478 @@
+/////////////////////////////
+// Helpers for DNA2
+/////////////////////////////
+
+// Pads 0s to t until length == u
+/proc/add_zero2(t, u)
+	var/temp1
+	while (length(t) < u)
+		t = "0[t]"
+	temp1 = t
+	if (length(t) > u)
+		temp1 = copytext(t,2,u+1)
+	return temp1
+
+// DNA Gene activation boundaries, see dna2.dm.
+// Returns a list object with 4 numbers.
+/proc/GetDNABounds(var/block)
+	var/list/BOUNDS=dna_activity_bounds[block]
+	if(!istype(BOUNDS))
+		return DNA_DEFAULT_BOUNDS
+	return BOUNDS
+
+// Give Random Bad Mutation to M
+/proc/randmutb(var/mob/living/M)
+	if(!M) return
+	M.dna.check_integrity()
+	var/block = pick(GLASSESBLOCK,COUGHBLOCK,FAKEBLOCK,NERVOUSBLOCK,CLUMSYBLOCK,TWITCHBLOCK,HEADACHEBLOCK,BLINDBLOCK,DEAFBLOCK,HALLUCINATIONBLOCK)
+	M.dna.SetSEState(block, 1)
+
+// Give Random Good Mutation to M
+/proc/randmutg(var/mob/living/M)
+	if(!M) return
+	M.dna.check_integrity()
+	var/block = pick(HULKBLOCK,XRAYBLOCK,FIREBLOCK,TELEBLOCK,NOBREATHBLOCK,REMOTEVIEWBLOCK,REGENERATEBLOCK,INCREASERUNBLOCK,REMOTETALKBLOCK,MORPHBLOCK,BLENDBLOCK,NOPRINTSBLOCK,SHOCKIMMUNITYBLOCK,SMALLSIZEBLOCK)
+	M.dna.SetSEState(block, 1)
+
+// Random Appearance Mutation
+/proc/randmuti(var/mob/living/M)
+	if(!M) return
+	M.dna.check_integrity()
+	M.dna.SetUIValue(rand(1,UNIDNASIZE),rand(1,4095))
+
+// Scramble UI or SE.
+/proc/scramble(var/UI, var/mob/M, var/prob)
+	if(!M)	return
+	M.dna.check_integrity()
+	if(UI)
+		for(var/i = 1, i <= DNA_UI_LENGTH-1, i++)
+			if(prob(prob))
+				M.dna.SetUIValue(i,rand(1,4095),1)
+		M.dna.UpdateUI()
+		M.UpdateAppearance()
+
+	else
+		for(var/i = 1, i <= STRUCDNASIZE-1, i++)
+			if(prob(prob))
+				M.dna.SetSEValue(i,rand(1,4095),1)
+		M.dna.UpdateSE()
+		domutcheck(M, null)
+	return
+
+// I haven't yet figured out what the fuck this is supposed to do.
+/proc/miniscramble(input,rs,rd)
+	var/output
+	output = null
+	if (input == "C" || input == "D" || input == "E" || input == "F")
+		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"6",prob((rs*10));"7",prob((rs*5)+(rd));"0",prob((rs*5)+(rd));"1",prob((rs*10)-(rd));"2",prob((rs*10)-(rd));"3")
+	if (input == "8" || input == "9" || input == "A" || input == "B")
+		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"A",prob((rs*10));"B",prob((rs*5)+(rd));"C",prob((rs*5)+(rd));"D",prob((rs*5)+(rd));"2",prob((rs*5)+(rd));"3")
+	if (input == "4" || input == "5" || input == "6" || input == "7")
+		output = pick(prob((rs*10));"4",prob((rs*10));"5",prob((rs*10));"A",prob((rs*10));"B",prob((rs*5)+(rd));"C",prob((rs*5)+(rd));"D",prob((rs*5)+(rd));"2",prob((rs*5)+(rd));"3")
+	if (input == "0" || input == "1" || input == "2" || input == "3")
+		output = pick(prob((rs*10));"8",prob((rs*10));"9",prob((rs*10));"A",prob((rs*10));"B",prob((rs*10)-(rd));"C",prob((rs*10)-(rd));"D",prob((rs*5)+(rd));"E",prob((rs*5)+(rd));"F")
+	if (!output) output = "5"
+	return output
+
+// HELLO I MAKE BELL CURVES AROUND YOUR DESIRED TARGET
+// So a shitty way of replacing gaussian noise.
+// input: YOUR TARGET
+// rs: RAD STRENGTH
+// rd: DURATION
+/proc/miniscrambletarget(input,rs,rd)
+	var/output = null
+	switch(input)
+		if("0")
+			output = pick(prob((rs*10)+(rd));"0",prob((rs*10)+(rd));"1",prob((rs*10));"2",prob((rs*10)-(rd));"3")
+		if("1")
+			output = pick(prob((rs*10)+(rd));"0",prob((rs*10)+(rd));"1",prob((rs*10)+(rd));"2",prob((rs*10));"3",prob((rs*10)-(rd));"4")
+		if("2")
+			output = pick(prob((rs*10));"0",prob((rs*10)+(rd));"1",prob((rs*10)+(rd));"2",prob((rs*10)+(rd));"3",prob((rs*10));"4",prob((rs*10)-(rd));"5")
+		if("3")
+			output = pick(prob((rs*10)-(rd));"0",prob((rs*10));"1",prob((rs*10)+(rd));"2",prob((rs*10)+(rd));"3",prob((rs*10)+(rd));"4",prob((rs*10));"5",prob((rs*10)-(rd));"6")
+		if("4")
+			output = pick(prob((rs*10)-(rd));"1",prob((rs*10));"2",prob((rs*10)+(rd));"3",prob((rs*10)+(rd));"4",prob((rs*10)+(rd));"5",prob((rs*10));"6",prob((rs*10)-(rd));"7")
+		if("5")
+			output = pick(prob((rs*10)-(rd));"2",prob((rs*10));"3",prob((rs*10)+(rd));"4",prob((rs*10)+(rd));"5",prob((rs*10)+(rd));"6",prob((rs*10));"7",prob((rs*10)-(rd));"8")
+		if("6")
+			output = pick(prob((rs*10)-(rd));"3",prob((rs*10));"4",prob((rs*10)+(rd));"5",prob((rs*10)+(rd));"6",prob((rs*10)+(rd));"7",prob((rs*10));"8",prob((rs*10)-(rd));"9")
+		if("7")
+			output = pick(prob((rs*10)-(rd));"4",prob((rs*10));"5",prob((rs*10)+(rd));"6",prob((rs*10)+(rd));"7",prob((rs*10)+(rd));"8",prob((rs*10));"9",prob((rs*10)-(rd));"A")
+		if("8")
+			output = pick(prob((rs*10)-(rd));"5",prob((rs*10));"6",prob((rs*10)+(rd));"7",prob((rs*10)+(rd));"8",prob((rs*10)+(rd));"9",prob((rs*10));"A",prob((rs*10)-(rd));"B")
+		if("9")
+			output = pick(prob((rs*10)-(rd));"6",prob((rs*10));"7",prob((rs*10)+(rd));"8",prob((rs*10)+(rd));"9",prob((rs*10)+(rd));"A",prob((rs*10));"B",prob((rs*10)-(rd));"C")
+		if("10")//A
+			output = pick(prob((rs*10)-(rd));"7",prob((rs*10));"8",prob((rs*10)+(rd));"9",prob((rs*10)+(rd));"A",prob((rs*10)+(rd));"B",prob((rs*10));"C",prob((rs*10)-(rd));"D")
+		if("11")//B
+			output = pick(prob((rs*10)-(rd));"8",prob((rs*10));"9",prob((rs*10)+(rd));"A",prob((rs*10)+(rd));"B",prob((rs*10)+(rd));"C",prob((rs*10));"D",prob((rs*10)-(rd));"E")
+		if("12")//C
+			output = pick(prob((rs*10)-(rd));"9",prob((rs*10));"A",prob((rs*10)+(rd));"B",prob((rs*10)+(rd));"C",prob((rs*10)+(rd));"D",prob((rs*10));"E",prob((rs*10)-(rd));"F")
+		if("13")//D
+			output = pick(prob((rs*10)-(rd));"A",prob((rs*10));"B",prob((rs*10)+(rd));"C",prob((rs*10)+(rd));"D",prob((rs*10)+(rd));"E",prob((rs*10));"F")
+		if("14")//E
+			output = pick(prob((rs*10)-(rd));"B",prob((rs*10));"C",prob((rs*10)+(rd));"D",prob((rs*10)+(rd));"E",prob((rs*10)+(rd));"F")
+		if("15")//F
+			output = pick(prob((rs*10)-(rd));"C",prob((rs*10));"D",prob((rs*10)+(rd));"E",prob((rs*10)+(rd));"F")
+
+	if(!input || !output) //How did this happen?
+		output = "8"
+
+	return output
+
+// /proc/updateappearance has changed behavior, so it's been removed
+// Use mob.UpdateAppearance() instead.
+
+// Simpler. Don't specify UI in order for the mob to use its own.
+/mob/proc/UpdateAppearance(var/list/UI=null)
+	if(istype(src, /mob/living/carbon/human))
+		if(UI!=null)
+			src.dna.UI=UI
+			src.dna.UpdateUI()
+		dna.check_integrity()
+		var/mob/living/carbon/human/H = src
+		H.r_hair   = dna.GetUIValueRange(DNA_UI_HAIR_R,    255)
+		H.g_hair   = dna.GetUIValueRange(DNA_UI_HAIR_G,    255)
+		H.b_hair   = dna.GetUIValueRange(DNA_UI_HAIR_B,    255)
+
+		H.r_facial = dna.GetUIValueRange(DNA_UI_BEARD_R,   255)
+		H.g_facial = dna.GetUIValueRange(DNA_UI_BEARD_G,   255)
+		H.b_facial = dna.GetUIValueRange(DNA_UI_BEARD_B,   255)
+
+		H.r_eyes   = dna.GetUIValueRange(DNA_UI_EYES_R,    255)
+		H.g_eyes   = dna.GetUIValueRange(DNA_UI_EYES_G,    255)
+		H.b_eyes   = dna.GetUIValueRange(DNA_UI_EYES_B,    255)
+
+		H.s_tone   = dna.GetUIValueRange(DNA_UI_SKIN_TONE, 220)
+
+		if (dna.GetUIState(DNA_UI_GENDER))
+			H.gender = FEMALE
+		else
+			H.gender = MALE
+
+		//Hair
+		var/hair = dna.GetUIValueRange(DNA_UI_HAIR_STYLE,hair_styles_list.len)
+		if((0 < hair) && (hair <= hair_styles_list.len))
+			H.h_style = hair_styles_list[hair]
+
+		//Facial Hair
+		var/beard = dna.GetUIValueRange(DNA_UI_BEARD_STYLE,facial_hair_styles_list.len)
+		if((0 < beard) && (beard <= facial_hair_styles_list.len))
+			H.f_style = facial_hair_styles_list[beard]
+
+		H.update_body(0)
+		H.update_hair()
+
+		return 1
+	else
+		return 0
+
+// Used below, simple injection modifier.
+/proc/probinj(var/pr, var/inj)
+	return prob(pr+inj*pr)
+
+// (Re-)Apply mutations.
+// TODO: Turn into a /mob proc, change inj to a bitflag for various forms of differing behavior.
+// M: Mob to mess with
+// connected: Machine we're in, type unchecked so I doubt it's used beyond monkeying
+// inj: 1 for if we're checking this from an injector, screws with manifestation probability calc.
+/proc/domutcheck(mob/living/M as mob, connected, inj)
+	if (!M) return
+
+	M.dna.check_integrity()
+
+	M.disabilities = 0
+	M.sdisabilities = 0
+	var/old_mutations = M.mutations
+	M.mutations = list()
+	M.pass_flags = 0
+//	M.see_in_dark = 2
+//	M.see_invisible = 0
+
+	if(PLANT in old_mutations)
+		M.mutations.Add(PLANT)
+	if(SKELETON in old_mutations)
+		M.mutations.Add(SKELETON)
+	if(FAT in old_mutations)
+		M.mutations.Add(FAT)
+	if(HUSK in old_mutations)
+		M.mutations.Add(HUSK)
+
+	/////////////////////////////////////
+	//        IMPORTANT REMINDER
+	// IF A BLOCK IS SET TO 0 (unused)
+	// GetSEState(block) WILL RETURN 0
+	/////////////////////////////////////
+
+	if(M.dna.GetSEState(NOBREATHBLOCK))
+		if(probinj(45,inj) || (mNobreath in old_mutations))
+			M << "\blue You feel no need to breathe."
+			M.mutations.Add(mNobreath)
+	if(M.dna.GetSEState(REMOTEVIEWBLOCK))
+		if(probinj(45,inj) || (mRemote in old_mutations))
+			M << "\blue Your mind expands"
+			M.mutations.Add(mRemote)
+			M.verbs += /mob/living/carbon/human/proc/remoteobserve
+	if(M.dna.GetSEState(REGENERATEBLOCK))
+		if(probinj(45,inj) || (mRegen in old_mutations))
+			M << "\blue You feel better"
+			M.mutations.Add(mRegen)
+	if(M.dna.GetSEState(INCREASERUNBLOCK))
+		if(probinj(45,inj) || (mRun in old_mutations))
+			M << "\blue Your leg muscles pulsate."
+			M.mutations.Add(mRun)
+	if(M.dna.GetSEState(REMOTETALKBLOCK))
+		if(probinj(45,inj) || (mRemotetalk in old_mutations))
+			M << "\blue You expand your mind outwards"
+			M.mutations.Add(mRemotetalk)
+			M.verbs += /mob/living/carbon/human/proc/remotesay
+	if(M.dna.GetSEState(MORPHBLOCK))
+		if(probinj(45,inj) || (mMorph in old_mutations))
+			M.mutations.Add(mMorph)
+			M << "\blue Your skin feels strange"
+			M.verbs += /mob/living/carbon/human/proc/morph
+	if(M.dna.GetSEState(HALLUCINATIONBLOCK))
+		if(probinj(45,inj) || (mHallucination in old_mutations))
+			M.mutations.Add(mHallucination)
+			M << "\red Your mind says 'Hello'"
+	if(M.dna.GetSEState(NOPRINTSBLOCK))
+		if(probinj(45,inj) || (mFingerprints in old_mutations))
+			M.mutations.Add(mFingerprints)
+			M << "\blue Your fingers feel numb"
+	if(M.dna.GetSEState(SHOCKIMMUNITYBLOCK))
+		if(probinj(45,inj) || (mShock in old_mutations))
+			M.mutations.Add(mShock)
+			M << "\blue Your skin feels strange"
+	if(M.dna.GetSEState(SMALLSIZEBLOCK))
+		if(probinj(45,inj) || (mSmallsize in old_mutations))
+			M << "\blue Your skin feels rubbery"
+			M.mutations.Add(mSmallsize)
+			M.pass_flags |= 1
+
+
+
+	if (M.dna.GetSEState(HULKBLOCK))
+		if(probinj(5,inj) || (HULK in old_mutations))
+			M << "\blue Your muscles hurt."
+			M.mutations.Add(HULK)
+	if (M.dna.GetSEState(HEADACHEBLOCK))
+		M.disabilities |= EPILEPSY
+		M << "\red You get a headache."
+	if (M.dna.GetSEState(FAKEBLOCK))
+		M << "\red You feel strange."
+		if (prob(95))
+			if(prob(50))
+				randmutb(M)
+			else
+				randmuti(M)
+		else
+			randmutg(M)
+	if (M.dna.GetSEState(COUGHBLOCK))
+		M.disabilities |= COUGHING
+		M << "\red You start coughing."
+	if (M.dna.GetSEState(CLUMSYBLOCK))
+		M << "\red You feel lightheaded."
+		M.mutations.Add(CLUMSY)
+	if (M.dna.GetSEState(TWITCHBLOCK))
+		M.disabilities |= TOURETTES
+		M << "\red You twitch."
+	if (M.dna.GetSEState(XRAYBLOCK))
+		if(probinj(30,inj) || (XRAY in old_mutations))
+			M << "\blue The walls suddenly disappear."
+//			M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
+//			M.see_in_dark = 8
+//			M.see_invisible = 2
+			M.mutations.Add(XRAY)
+	if (M.dna.GetSEState(NERVOUSBLOCK))
+		M.disabilities |= NERVOUS
+		M << "\red You feel nervous."
+	if (M.dna.GetSEState(FIREBLOCK))
+		if(probinj(30,inj) || (COLD_RESISTANCE in old_mutations))
+			M << "\blue Your body feels warm."
+			M.mutations.Add(COLD_RESISTANCE)
+	if (M.dna.GetSEState(BLINDBLOCK))
+		M.sdisabilities |= BLIND
+		M << "\red You can't seem to see anything."
+	if (M.dna.GetSEState(TELEBLOCK))
+		if(probinj(15,inj) || (TK in old_mutations))
+			M << "\blue You feel smarter."
+			M.mutations.Add(TK)
+	if (M.dna.GetSEState(DEAFBLOCK))
+		M.sdisabilities |= DEAF
+		M.ear_deaf = 1
+		M << "\red Its kinda quiet.."
+	if (M.dna.GetSEState(GLASSESBLOCK))
+		M.disabilities |= NEARSIGHTED
+		M << "Your eyes feel weird..."
+
+	/* If you want the new mutations to work, UNCOMMENT THIS.
+	if(istype(M, /mob/living/carbon))
+		for (var/datum/mutations/mut in global_mutations)
+			mut.check_mutation(M)
+	*/
+
+//////////////////////////////////////////////////////////// Monkey Block
+	if (M.dna.GetSEState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human))
+	// human > monkey
+		var/mob/living/carbon/human/H = M
+		H.monkeyizing = 1
+		var/list/implants = list() //Try to preserve implants.
+		for(var/obj/item/weapon/implant/W in H)
+			implants += W
+			W.loc = null
+
+		if(!connected)
+			for(var/obj/item/W in (H.contents-implants))
+				if (W==H.w_uniform) // will be teared
+					continue
+				H.drop_from_inventory(W)
+			M.monkeyizing = 1
+			M.canmove = 0
+			M.icon = null
+			M.invisibility = 101
+			var/atom/movable/overlay/animation = new( M.loc )
+			animation.icon_state = "blank"
+			animation.icon = 'icons/mob/mob.dmi'
+			animation.master = src
+			flick("h2monkey", animation)
+			sleep(48)
+			del(animation)
+
+
+		var/mob/living/carbon/monkey/O = null
+		if(H.species.primitive)
+			O = new H.species.primitive(src)
+		else
+			H.gib() //Trying to change the species of a creature with no primitive var set is messy.
+			return
+
+		if(M)
+			if (M.dna)
+				O.dna = M.dna
+				M.dna = null
+
+			if (M.suiciding)
+				O.suiciding = M.suiciding
+				M.suiciding = null
+
+
+		for(var/datum/disease/D in M.viruses)
+			O.viruses += D
+			D.affected_mob = O
+			M.viruses -= D
+
+
+		for(var/obj/T in (M.contents-implants))
+			del(T)
+
+		O.loc = M.loc
+
+		if(M.mind)
+			M.mind.transfer_to(O)	//transfer our mind to the cute little monkey
+
+		if (connected) //inside dna thing
+			var/obj/machinery/dna_scannernew/C = connected
+			O.loc = C
+			C.occupant = O
+			connected = null
+		O.real_name = text("monkey ([])",copytext(md5(M.real_name), 2, 6))
+		O.take_overall_damage(M.getBruteLoss() + 40, M.getFireLoss())
+		O.adjustToxLoss(M.getToxLoss() + 20)
+		O.adjustOxyLoss(M.getOxyLoss())
+		O.stat = M.stat
+		O.a_intent = "hurt"
+		for (var/obj/item/weapon/implant/I in implants)
+			I.loc = O
+			I.implanted = O
+//		O.update_icon = 1	//queue a full icon update at next life() call
+		del(M)
+		return
+
+	if (!M.dna.GetSEState(MONKEYBLOCK) && !istype(M, /mob/living/carbon/human))
+	// monkey > human,
+		var/mob/living/carbon/monkey/Mo = M
+		Mo.monkeyizing = 1
+		var/list/implants = list() //Still preserving implants
+		for(var/obj/item/weapon/implant/W in Mo)
+			implants += W
+			W.loc = null
+		if(!connected)
+			for(var/obj/item/W in (Mo.contents-implants))
+				Mo.drop_from_inventory(W)
+			M.monkeyizing = 1
+			M.canmove = 0
+			M.icon = null
+			M.invisibility = 101
+			var/atom/movable/overlay/animation = new( M.loc )
+			animation.icon_state = "blank"
+			animation.icon = 'icons/mob/mob.dmi'
+			animation.master = src
+			flick("monkey2h", animation)
+			sleep(48)
+			del(animation)
+
+		var/mob/living/carbon/human/O = new( src )
+		if(Mo.greaterform)
+			O.set_species(Mo.greaterform)
+
+		if (M.dna.GetUIState(DNA_UI_GENDER))
+			O.gender = FEMALE
+		else
+			O.gender = MALE
+
+		if (M)
+			if (M.dna)
+				O.dna = M.dna
+				M.dna = null
+
+			if (M.suiciding)
+				O.suiciding = M.suiciding
+				M.suiciding = null
+
+		for(var/datum/disease/D in M.viruses)
+			O.viruses += D
+			D.affected_mob = O
+			M.viruses -= D
+
+		//for(var/obj/T in M)
+		//	del(T)
+
+		O.loc = M.loc
+
+		if(M.mind)
+			M.mind.transfer_to(O)	//transfer our mind to the human
+
+		if (connected) //inside dna thing
+			var/obj/machinery/dna_scannernew/C = connected
+			O.loc = C
+			C.occupant = O
+			connected = null
+
+		var/i
+		while (!i)
+			var/randomname
+			if (O.gender == MALE)
+				randomname = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
+			else
+				randomname = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names)))
+			if (findname(randomname))
+				continue
+			else
+				O.real_name = randomname
+				i++
+		O.UpdateAppearance()
+		O.take_overall_damage(M.getBruteLoss(), M.getFireLoss())
+		O.adjustToxLoss(M.getToxLoss())
+		O.adjustOxyLoss(M.getOxyLoss())
+		O.stat = M.stat
+		for (var/obj/item/weapon/implant/I in implants)
+			I.loc = O
+			I.implanted = O
+//		O.update_icon = 1	//queue a full icon update at next life() call
+		del(M)
+		return
+//////////////////////////////////////////////////////////// Monkey Block
+	if(M)
+		M.update_icon = 1	//queue a full icon update at next life() call
+	return null
+/////////////////////////// DNA MISC-PROCS

code/game/dna/dna_modifier.dm

@@ -302,19 +302,19 @@
 		return
 	return
 
-/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(var/buffer)
+/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(var/list/buffer)
 	var/list/arr = list()
-	for(var/i = 1, i <= length(buffer)/3, i++)
-		arr += "[i]:[copytext(buffer,i*3-2,i*3+1)]"
+	for(var/i = 1, i <= buffer.len, i++)
+		arr += "[i]:[EncodeDNABlock(buffer[i])]"
 	return arr
 
-/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/weapon/dnainjector/I, var/blk, var/buffer)
+/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/weapon/dnainjector/I, var/blk, var/list/buffer)
 	var/pos = findtext(blk,":")
 	if(!pos) return 0
 	var/id = text2num(copytext(blk,1,pos))
 	if(!id) return 0
 	I.block = id
-	I.dna = copytext(buffer,id*3-2,id*3+1)
+	I.dna = list(buffer[id])
 	return 1
 
 /obj/machinery/computer/scan_consolenew/attackby(obj/item/W as obj, mob/user as mob)
@@ -571,10 +571,7 @@
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
 	if (href_list["pulseUIRadiation"])
-		var/block
-		var/newblock
-		var/tstructure2
-		block = getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),src.selected_ui_subblock,1)
+		var/block = src.connected.occupant.dna.GetUISubBlock(src.selected_ui_block,src.selected_ui_subblock)
 
 		irradiating = src.radiation_duration
 		var/lock_state = src.connected.locked
@@ -590,13 +587,8 @@
 
 		if (prob((80 + (src.radiation_duration / 2))))
 			block = miniscrambletarget(num2text(selected_ui_target), src.radiation_intensity, src.radiation_duration)
-			newblock = null
-			if (src.selected_ui_subblock == 1) newblock = block + getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),2,1) + getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),3,1)
-			if (src.selected_ui_subblock == 2) newblock = getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),1,1) + block + getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),3,1)
-			if (src.selected_ui_subblock == 3) newblock = getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),1,1) + getblock(getblock(src.connected.occupant.dna.uni_identity,src.selected_ui_block,DNA_BLOCK_SIZE),2,1) + block
-			tstructure2 = setblock(src.connected.occupant.dna.uni_identity, src.selected_ui_block, newblock,DNA_BLOCK_SIZE)
-			src.connected.occupant.dna.uni_identity = tstructure2
-			updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
+			src.connected.occupant.dna.SetUISubBlock(src.selected_ui_block,src.selected_ui_subblock,block)
+			src.connected.occupant.UpdateAppearance()
 			src.connected.occupant.radiation += (src.radiation_intensity+src.radiation_duration)
 		else
 			if	(prob(20+src.radiation_intensity))
@@ -604,7 +596,7 @@
 				domutcheck(src.connected.occupant,src.connected)
 			else
 				randmuti(src.connected.occupant)
-				updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
+				src.connected.occupant.UpdateAppearance()
 			src.connected.occupant.radiation += ((src.radiation_intensity*2)+src.radiation_duration)
 		src.connected.locked = lock_state
 		return 1 // return 1 forces an update to all Nano uis attached to src
@@ -635,12 +627,7 @@
 		return 1 // return 1 forces an update to all Nano uis attached to src
 
 	if (href_list["pulseSERadiation"])
-		var/block
-		var/newblock
-		var/tstructure2
-		var/oldblock
-
-		block = getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),src.selected_se_subblock,1)
+		var/block = src.connected.occupant.dna.GetSESubBlock(src.selected_se_block,src.selected_se_subblock)
 
 		irradiating = src.radiation_duration
 		var/lock_state = src.connected.locked
@@ -653,40 +640,26 @@
 
 		if(src.connected.occupant)
 			if (prob((80 + (src.radiation_duration / 2))))
-				if ((src.selected_se_block != 2 || src.selected_se_block != 12 || src.selected_se_block != 8 || src.selected_se_block || 10) && prob (20))
-					oldblock = src.selected_se_block
-					block = miniscramble(block, src.radiation_intensity, src.radiation_duration)
-					newblock = null
+				// FIXME: Find out what these corresponded to and change them to the WHATEVERBLOCK they need to be.
+				//if ((src.selected_se_block != 2 || src.selected_se_block != 12 || src.selected_se_block != 8 || src.selected_se_block || 10) && prob (20))
+				var/real_SE_block=selected_se_block
+				block = miniscramble(block, src.radiation_intensity, src.radiation_duration)
+				if(prob(20))
 					if (src.selected_se_block > 1 && src.selected_se_block < STRUCDNASIZE/2)
-						src.selected_se_block++
+						real_SE_block++
 					else if (src.selected_se_block > STRUCDNASIZE/2 && src.selected_se_block < STRUCDNASIZE)
-						src.selected_se_block--
-					if (src.selected_se_subblock == 1) newblock = block + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),2,1) + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),3,1)
-					if (src.selected_se_subblock == 2) newblock = getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),1,1) + block + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),3,1)
-					if (src.selected_se_subblock == 3) newblock = getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),1,1) + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),2,1) + block
-					tstructure2 = setblock(src.connected.occupant.dna.struc_enzymes, src.selected_se_block, newblock,DNA_BLOCK_SIZE)
-					src.connected.occupant.dna.struc_enzymes = tstructure2
-					domutcheck(src.connected.occupant,src.connected)
-					src.connected.occupant.radiation += (src.radiation_intensity+src.radiation_duration)
-					src.selected_se_block = oldblock
-				else
-				//
-					block = miniscramble(block, src.radiation_intensity, src.radiation_duration)
-					newblock = null
-					if (src.selected_se_subblock == 1) newblock = block + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),2,1) + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),3,1)
-					if (src.selected_se_subblock == 2) newblock = getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),1,1) + block + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),3,1)
-					if (src.selected_se_subblock == 3) newblock = getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),1,1) + getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.selected_se_block,DNA_BLOCK_SIZE),2,1) + block
-					tstructure2 = setblock(src.connected.occupant.dna.struc_enzymes, src.selected_se_block, newblock,DNA_BLOCK_SIZE)
-					src.connected.occupant.dna.struc_enzymes = tstructure2
-					domutcheck(src.connected.occupant,src.connected)
-					src.connected.occupant.radiation += (src.radiation_intensity+src.radiation_duration)
+						real_SE_block--
+
+				connected.occupant.dna.SetSESubBlock(real_SE_block,selected_se_subblock,block)
+				domutcheck(src.connected.occupant,src.connected)
+				src.connected.occupant.radiation += (src.radiation_intensity+src.radiation_duration)
 			else
 				if	(prob(80-src.radiation_duration))
 					randmutb(src.connected.occupant)
 					domutcheck(src.connected.occupant,src.connected)
 				else
 					randmuti(src.connected.occupant)
-					updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
+					src.connected.occupant.UpdateAppearance()
 				src.connected.occupant.radiation += ((src.radiation_intensity*2)+src.radiation_duration)
 		src.connected.locked = lock_state
 		return 1 // return 1 forces an update to all Nano uis attached to src
@@ -724,8 +697,8 @@
 				return
 			src.disk.loc = get_turf(src)
 			src.disk = null
-			return 1		
-		
+			return 1
+
 		// All bufferOptions from here on require a bufferId
 		if (!href_list["bufferId"])
 			return 0
@@ -738,7 +711,7 @@
 		if (bufferOption == "saveUI")
 			if(src.connected.occupant && src.connected.occupant.dna)
 				src.buffers[bufferId]["ue"] = 0
-				src.buffers[bufferId]["data"] = src.connected.occupant.dna.uni_identity
+				src.buffers[bufferId]["data"] = src.connected.occupant.dna.UI
 				if (!istype(src.connected.occupant,/mob/living/carbon/human))
 					src.buffers[bufferId]["owner"] = src.connected.occupant.name
 				else
@@ -749,7 +722,7 @@
 
 		if (bufferOption == "saveUIAndUE")
 			if(src.connected.occupant && src.connected.occupant.dna)
-				src.buffers[bufferId]["data"] = src.connected.occupant.dna.uni_identity
+				src.buffers[bufferId]["data"] = src.connected.occupant.dna.UI
 				if (!istype(src.connected.occupant,/mob/living/carbon/human))
 					src.buffers[bufferId]["owner"] = src.connected.occupant.name
 				else
@@ -762,7 +735,7 @@
 		if (bufferOption == "saveSE")
 			if(src.connected.occupant && src.connected.occupant.dna)
 				src.buffers[bufferId]["ue"] = 0
-				src.buffers[bufferId]["data"] = src.connected.occupant.dna.struc_enzymes
+				src.buffers[bufferId]["data"] = src.connected.occupant.dna.SE
 				if (!istype(src.connected.occupant,/mob/living/carbon/human))
 					src.buffers[bufferId]["owner"] = src.connected.occupant.name
 				else
@@ -801,10 +774,10 @@
 				if (src.buffers[bufferId]["ue"])
 					src.connected.occupant.real_name = src.buffers[bufferId]["owner"]
 					src.connected.occupant.name = src.buffers[bufferId]["owner"]
-				src.connected.occupant.dna.uni_identity = src.buffers[bufferId]["data"]
-				updateappearance(src.connected.occupant,src.connected.occupant.dna.uni_identity)
+				src.connected.occupant.UpdateAppearance(src.buffers[bufferId]["data"])
 			else if (src.buffers[bufferId]["type"] == "se")
-				src.connected.occupant.dna.struc_enzymes = src.buffers[bufferId]["data"]
+				src.connected.occupant.dna.SE = src.buffers[bufferId]["data"]
+				src.connected.occupant.dna.UpdateSE()
 				domutcheck(src.connected.occupant,src.connected)
 			src.connected.occupant.radiation += rand(20,50)
 			return 1
@@ -856,7 +829,7 @@
 			src.disk.owner = src.buffers[bufferId]["owner"]
 			src.disk.name = "data disk - '[src.buffers[bufferId]["owner"]]'"
 			//src.temphtml = "Data saved."
-			return 1		
+			return 1
 
 
 /////////////////////////// DNA MACHINES

code/game/gamemodes/changeling/changeling_powers.dm

@@ -187,7 +187,7 @@
 	src.dna = chosen_dna
 	src.real_name = chosen_dna.real_name
 	src.flavor_text = ""
-	updateappearance(src, src.dna.uni_identity)
+	src.UpdateAppearance()
 	domutcheck(src, null)
 
 	src.verbs -= /mob/proc/changeling_transform
@@ -314,7 +314,7 @@
 			W.layer = initial(W.layer)
 
 	var/mob/living/carbon/human/O = new /mob/living/carbon/human( src )
-	if (isblockon(getblock(C.dna.uni_identity, 11,3),11))
+	if (C.dna.GetUIState(DNA_UI_GENDER))
 		O.gender = FEMALE
 	else
 		O.gender = MALE
@@ -327,7 +327,7 @@
 
 	O.loc = C.loc
 
-	updateappearance(O,O.dna.uni_identity)
+	O.UpdateAppearance()
 	domutcheck(O, null)
 	O.setToxLoss(C.getToxLoss())
 	O.adjustBruteLoss(C.getBruteLoss())
@@ -719,7 +719,7 @@ var/list/datum/dna/hivemind_bank = list()
 	T.visible_message("<span class='warning'>[T] transforms!</span>")
 	T.dna = chosen_dna
 	T.real_name = chosen_dna.real_name
-	updateappearance(T, T.dna.uni_identity)
+	T.UpdateAppearance()
 	domutcheck(T, null)
 	feedback_add_details("changeling_powers","TS")
 	return 1

code/game/gamemodes/events.dm

@@ -163,8 +163,8 @@
 				continue
 			var/datum/disease/dnaspread/D = new
 			D.strain_data["name"] = H.real_name
-			D.strain_data["UI"] = H.dna.uni_identity
-			D.strain_data["SE"] = H.dna.struc_enzymes
+			D.strain_data["UI"] = H.dna.UI
+			D.strain_data["SE"] = H.dna.SE
 			D.carrier = 1
 			D.holder = H
 			D.affected_mob = H

code/game/gamemodes/nuclear/nuclear.dm

@@ -209,9 +209,7 @@
 
 	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform)
 	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(synd_mob), slot_shoes)
-	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(synd_mob), slot_wear_suit)
 	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(synd_mob), slot_gloves)
-	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(synd_mob), slot_head)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id)
 	if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back)
 	if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back)
@@ -221,6 +219,26 @@
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/c20r(synd_mob), slot_belt)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
+
+	if(synd_mob.species)
+		var/race = synd_mob.species.name
+
+		if(race == "Unathi")
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/unathi(synd_mob), slot_wear_suit)
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/unathi(synd_mob), slot_head)
+		else if(race == "Tajaran")
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/tajara(synd_mob), slot_wear_suit)
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/tajara(synd_mob), slot_head)
+		else if(race == "Skrell")
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/skrell(synd_mob), slot_wear_suit)
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/skrell(synd_mob), slot_head)
+		else
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/human(synd_mob), slot_wear_suit)
+			synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/human(synd_mob), slot_head)
+	else
+		synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/human(synd_mob), slot_wear_suit)
+		synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/human(synd_mob), slot_head)
+
 	var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob)
 	E.imp_in = synd_mob
 	E.implanted = 1

code/game/gamemodes/setupgame.dm

@@ -1,10 +1,27 @@
+/////////////////////////
+// (mostly) DNA2 SETUP
+/////////////////////////
+
+// Randomize block, assign a reference name, and optionally define difficulty (by making activation zone smaller or bigger) 
+// The name is used on /vg/ for species with predefined genetic traits,
+//  and for the DNA panel in the player panel.
+/proc/getAssignedBlock(var/name,var/list/blocksLeft, var/activity_bounds=DNA_DEFAULT_BOUNDS)
+	var/assigned = pick(blocksLeft)
+	blocksLeft.Remove(assigned)
+	assigned_blocks[assigned]=name
+	dna_activity_bounds[assigned]=activity_bounds
+	//testing("[name] assigned to block #[assigned].")
+	return assigned
+
 /proc/setupgenetics()
 
 	if (prob(50))
+		// Currently unused.  Will revisit. - N3X
 		BLOCKADD = rand(-300,300)
 	if (prob(75))
 		DIFFMUT = rand(0,20)
 
+	/* Old, for reference (so I don't accidentally activate something) - N3X
 	var/list/avnums = new/list()
 	var/tempnum
 
@@ -41,11 +58,50 @@
 	tempnum = pick(avnums)
 	avnums.Remove(tempnum)
 	BLINDBLOCK = tempnum
+	*/
+	var/list/numsToAssign=new()
+	for(var/i=1;i<STRUCDNASIZE;i++)
+		numsToAssign += i
+
+	//testing("Assigning DNA blocks:")
+
+	// Standard muts, imported from older code above.
+	BLINDBLOCK         = getAssignedBlock("BLIND",         numsToAssign)
+	DEAFBLOCK          = getAssignedBlock("DEAF",          numsToAssign)
+	HULKBLOCK          = getAssignedBlock("HULK",          numsToAssign, DNA_HARD_BOUNDS)
+	TELEBLOCK          = getAssignedBlock("TELE",          numsToAssign, DNA_HARD_BOUNDS)
+	FIREBLOCK          = getAssignedBlock("FIRE",          numsToAssign, DNA_HARDER_BOUNDS)
+	XRAYBLOCK          = getAssignedBlock("XRAY",          numsToAssign, DNA_HARDER_BOUNDS)
+	CLUMSYBLOCK        = getAssignedBlock("CLUMSY",        numsToAssign)
+	FAKEBLOCK          = getAssignedBlock("FAKE",          numsToAssign)
+	
+	// UNUSED!
+	//COUGHBLOCK         = getAssignedBlock("COUGH",         numsToAssign)
+	//GLASSESBLOCK       = getAssignedBlock("GLASSES",       numsToAssign)
+	//EPILEPSYBLOCK      = getAssignedBlock("EPILEPSY",      numsToAssign)
+	//TWITCHBLOCK        = getAssignedBlock("TWITCH",        numsToAssign)
+	//NERVOUSBLOCK       = getAssignedBlock("NERVOUS",       numsToAssign)
+
+	// Bay muts (UNUSED)
+	//HEADACHEBLOCK      = getAssignedBlock("HEADACHE",      numsToAssign)
+	//NOBREATHBLOCK      = getAssignedBlock("NOBREATH",      numsToAssign, DNA_HARD_BOUNDS)
+	//REMOTEVIEWBLOCK    = getAssignedBlock("REMOTEVIEW",    numsToAssign, DNA_HARDER_BOUNDS)
+	//REGENERATEBLOCK    = getAssignedBlock("REGENERATE",    numsToAssign, DNA_HARDER_BOUNDS)
+	//INCREASERUNBLOCK   = getAssignedBlock("INCREASERUN",   numsToAssign, DNA_HARDER_BOUNDS)
+	//REMOTETALKBLOCK    = getAssignedBlock("REMOTETALK",    numsToAssign, DNA_HARDER_BOUNDS)
+	//MORPHBLOCK         = getAssignedBlock("MORPH",         numsToAssign, DNA_HARDER_BOUNDS)
+	//COLDBLOCK          = getAssignedBlock("COLD",          numsToAssign)
+	//HALLUCINATIONBLOCK = getAssignedBlock("HALLUCINATION", numsToAssign)
+	//NOPRINTSBLOCK      = getAssignedBlock("NOPRINTS",      numsToAssign, DNA_HARD_BOUNDS)
+	//SHOCKIMMUNITYBLOCK = getAssignedBlock("SHOCKIMMUNITY", numsToAssign)
+	//SMALLSIZEBLOCK     = getAssignedBlock("SMALLSIZE",     numsToAssign, DNA_HARD_BOUNDS)
+
+
 
 
 	// HIDDEN MUTATIONS / SUPERPOWERS INITIALIZTION
 
-/*
+	/*
 	for(var/x in typesof(/datum/mutations) - /datum/mutations)
 		var/datum/mutations/mut = new x
 
@@ -62,7 +118,7 @@
 
 
 		global_mutations += mut// add to global mutations list!
-*/
+	*/
 
 
 /proc/setupfactions()

code/game/jobs/job/medical.dm

@@ -15,7 +15,7 @@
 	minimal_access = list(access_medical, access_morgue, access_genetics, access_heads,
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
 			access_keycard_auth, access_sec_doors, access_psychiatrist)
-	minimal_player_age = 7
+	minimal_player_age = 10
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0

code/game/jobs/job/security.dm

@@ -60,7 +60,7 @@
 	selection_color = "#ffeeee"
 	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels)
-	minimal_player_age = 7
+	minimal_player_age = 5
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -100,7 +100,7 @@
 	access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 	minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 	alt_titles = list("Forensic Technician")
-	minimal_player_age = 7
+	minimal_player_age = 3
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
@@ -146,7 +146,7 @@
 	selection_color = "#ffeeee"
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels)
-	minimal_player_age = 7
+	minimal_player_age = 3
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)

code/game/jobs/job/silicon.dm

@@ -8,7 +8,7 @@
 	selection_color = "#ccffcc"
 	supervisors = "your laws"
 	req_admin_notify = 1
-	minimal_player_age = 30
+	minimal_player_age = 7
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -25,7 +25,7 @@
 	spawn_positions = 2
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"
-	minimal_player_age = 21
+	minimal_player_age = 1
 	alt_titles = list("Android", "Robot")
 
 	equip(var/mob/living/carbon/human/H)

code/game/machinery/atmoalter/canister.dm

@@ -255,6 +255,8 @@ Release Pressure: <A href='?src=\ref[src];pressure_adj=-1000'>-</A> <A href='?sr
 
 		if (href_list["remove_tank"])
 			if(holding)
+				if(istype(holding, /obj/item/weapon/tank))
+					holding.manipulated_by = usr.real_name
 				holding.loc = loc
 				holding = null
 

code/game/machinery/autolathe.dm

@@ -57,7 +57,7 @@ var/global/list/autolathe_recipes_hidden = list( \
 		new /obj/item/weapon/weldingtool/largetank(), \
 		new /obj/item/weapon/handcuffs(), \
 		new /obj/item/ammo_magazine/a357(), \
-		new /obj/item/ammo_magazine/c45(), \
+		new /obj/item/ammo_magazine/c45m(), \
 		new /obj/item/ammo_casing/shotgun(), \
 		new /obj/item/ammo_casing/shotgun/dart(), \
 		/* new /obj/item/weapon/shield/riot(), */ \

code/game/machinery/cloning.dm

@@ -116,7 +116,7 @@
 //Clonepod
 
 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/ui, var/se, var/mindref, var/datum/species/mrace, var/languages)
+/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/list/ui, var/list/se, var/mindref, var/datum/species/mrace, var/languages)
 	if(mess || attempting)
 		return 0
 	var/datum/mind/clonemind = locate(mindref)
@@ -184,10 +184,10 @@
 		H.dna = new /datum/dna()
 		H.dna.real_name = H.real_name
 	if(ui)
-		H.dna.uni_identity = ui
-		updateappearance(H, ui)
+		H.UpdateAppearance(ui)
 	if(se)
-		H.dna.struc_enzymes = se
+		H.dna.SE = se
+		H.dna.UpdateSE()
 		randmutb(H) //Sometimes the clones come out wrong.
 
 	H.f_style = "Shaved"

code/game/machinery/computer/HolodeckControl.dm

@@ -532,6 +532,12 @@
 		w_class = 2
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		user << "\blue [src] can now be concealed."
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
 	add_fingerprint(user)
 	return
 

code/game/machinery/computer/cloning.dm

@@ -368,8 +368,8 @@
 	R.fields["ckey"] = subject.ckey
 	R.fields["name"] = subject.real_name
 	R.fields["id"] = copytext(md5(subject.real_name), 2, 6)
-	R.fields["UI"] = subject.dna.uni_identity
-	R.fields["SE"] = subject.dna.struc_enzymes
+	R.fields["UI"] = subject.dna.UI
+	R.fields["SE"] = subject.dna.SE
 	R.fields["languages"] = subject.languages
 
 	//Add an implant if needed

code/game/machinery/cryo.dm

@@ -5,7 +5,7 @@
 	density = 1
 	anchored = 1.0
 	layer = 2.8
-	
+
 	var/on = 0
 	var/temperature_archived
 	var/mob/living/carbon/occupant = null
@@ -68,7 +68,7 @@
   * ui_interact is currently defined for /atom/movable
   *
   * @param user /mob The mob who is interacting with this ui
-  * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main")  
+  * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main")
   * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui
   *
   * @return nothing
@@ -79,7 +79,7 @@
 		return
 
 	// this is the data which will be sent to the ui
-	var/data[0]	
+	var/data[0]
 	data["isOperating"] = on
 	data["hasOccupant"] = occupant ? 1 : 0
 
@@ -115,7 +115,7 @@
 	else if(air_contents.temperature > 225)
 		data["cellTemperatureStatus"] = "average"
 
-	data["isBeakerLoaded"] = beaker ? 1 : 0	
+	data["isBeakerLoaded"] = beaker ? 1 : 0
 	/* // Removing beaker contents list from front-end, replacing with a total remaining volume
 	var beakerContents[0]
 	if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
@@ -130,12 +130,12 @@
 		if (beaker.reagents && beaker.reagents.reagent_list.len)
 			for(var/datum/reagent/R in beaker.reagents.reagent_list)
 				data["beakerVolume"] += R.volume
-	
+
 	if (!ui) // no ui has been passed, so we'll search for one
 	{
 		ui = nanomanager.get_open_ui(user, src, ui_key)
-	}	
-	if (!ui) 
+	}
+	if (!ui)
 		// the ui does not exist, so we'll create a new one
 		ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410)
 		// When the UI is first opened this is the data it will use
@@ -159,7 +159,7 @@
 	if(href_list["switchOn"])
 		on = 1
 		update_icon()
-		
+
 	if(href_list["switchOff"])
 		on = 0
 		update_icon()
@@ -168,12 +168,12 @@
 		if(beaker)
 			beaker.loc = get_step(loc, SOUTH)
 			beaker = null
-			
+
 	if(href_list["ejectOccupant"])
 		if(!occupant || isslime(usr) || ispAI(usr))
 			return 0 // don't update UIs attached to this object
 		go_out()
-	
+
 	add_fingerprint(usr)
 	return 1 // update UIs attached to this object
 
@@ -268,15 +268,15 @@
 		occupant.client.eye = occupant.client.mob
 		occupant.client.perspective = MOB_PERSPECTIVE
 	occupant.loc = get_step(loc, SOUTH)	//this doesn't account for walls or anything, but i don't forsee that being a problem.
-	if (occupant.bodytemperature < 261 && occupant.bodytemperature > 140) //Patch by Aranclanos to stop people from taking burn damage after being ejected
-		occupant.bodytemperature = 261
+	if (occupant.bodytemperature < 261 && occupant.bodytemperature >= 70) //Patch by Aranclanos to stop people from taking burn damage after being ejected
+		occupant.bodytemperature = 261									  // Changed to 70 from 140 by Zuhayr due to reoccurance of bug.
 //	occupant.metabslow = 0
 	occupant = null
 	update_icon()
 	return
 /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob)
 	if (!istype(M))
-		usr << "\red <B>The cryo cell cannot handle such liveform!</B>"
+		usr << "\red <B>The cryo cell cannot handle such a lifeform!</B>"
 		return
 	if (occupant)
 		usr << "\red <B>The cryo cell is already occupied!</B>"

code/game/machinery/cryopod.dm

@@ -0,0 +1,388 @@
+/*
+ * Cryogenic refrigeration unit. Basically a despawner.
+ * Stealing a lot of concepts/code from sleepers due to massive laziness.
+ * The despawn tick will only fire if it's been more than time_till_despawned ticks
+ * since time_entered, which is world.time when the occupant moves in.
+ * ~ Zuhayr
+ */
+
+//Used for logging people entering cryosleep and important items they are carrying.
+var/global/list/frozen_crew = list()
+var/global/list/frozen_items = list()
+
+//Main cryopod console.
+
+/obj/machinery/computer/cryopod
+	name = "cryogenic oversight console"
+	desc = "An interface between crew and the cryogenic storage oversight systems."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "cellconsole"
+	circuit = "/obj/item/weapon/circuitboard/cryopodcontrol"
+	var/mode = null
+
+/obj/machinery/computer/cryopod/attack_paw()
+	src.attack_hand()
+
+/obj/machinery/computer/cryopod/attack_ai()
+	src.attack_hand()
+
+obj/machinery/computer/cryopod/attack_hand(mob/user = usr)
+	if(stat & (NOPOWER|BROKEN))
+		return
+
+	user.set_machine(src)
+	src.add_fingerprint(usr)
+
+	var/dat
+
+	if (!( ticker ))
+		return
+
+	dat += "<hr/><br/><b>Cryogenic Oversight Control</b><br/>"
+	dat += "<i>Welcome, [user.real_name].</i><br/><br/><hr/>"
+	dat += "<a href='?src=\ref[src];log=1'>View storage log</a>.<br>"
+	dat += "<a href='?src=\ref[src];item=1'>Recover object</a>.<br>"
+	dat += "<a href='?src=\ref[src];allitems=1'>Recover all objects</a>.<br>"
+	dat += "<a href='?src=\ref[src];crew=1'>Revive crew</a>.<br/><hr/>"
+
+	user << browse(dat, "window=cryopod_console")
+	onclose(user, "cryopod_console")
+
+obj/machinery/computer/cryopod/Topic(href, href_list)
+
+	if(..())
+		return
+
+	var/mob/user = usr
+
+	src.add_fingerprint(user)
+
+	if(href_list["log"])
+
+		var/dat = "<b>Recently stored crewmembers</b><br/><hr/><br/>"
+		for(var/person in frozen_crew)
+			dat += "[person]<br/>"
+		dat += "<hr/>"
+
+		user << browse(dat, "window=cryolog")
+
+	else if(href_list["item"])
+
+		if(frozen_items.len == 0)
+			user << "\blue There is nothing to recover from storage."
+			return
+
+		var/obj/item/I = input(usr, "Please choose which object to retrieve.","Object recovery",null) as obj in frozen_items
+
+		if(!I || frozen_items.len == 0)
+			user << "\blue There is nothing to recover from storage."
+			return
+
+		visible_message("\blue The console beeps happily as it disgorges \the [I].", 3)
+
+		I.loc = get_turf(src)
+		frozen_items -= I
+
+	else if(href_list["allitems"])
+
+		if(frozen_items.len == 0)
+			user << "\blue There is nothing to recover from storage."
+			return
+
+		visible_message("\blue The console beeps happily as it disgorges the desired objects.", 3)
+
+		for(var/obj/item/I in frozen_items)
+			I.loc = get_turf(src)
+			frozen_items -= I
+
+	else if(href_list["crew"])
+
+		user << "\red Functionality unavailable at this time."
+
+	src.updateUsrDialog()
+	return
+
+/obj/item/weapon/circuitboard/cryopodcontrol
+	name = "Circuit board (Cryogenic Oversight Console)"
+	build_path = "/obj/machinery/computer/cryopod"
+	origin_tech = "programming=3"
+
+//Decorative structures to go alongside cryopods.
+/obj/structure/cryofeed
+
+	name = "\improper cryogenic feed"
+	desc = "A bewildering tangle of machinery and pipes."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "cryo_rear"
+	anchored = 1
+
+	var/orient_right = null //Flips the sprite.
+
+/obj/structure/cryofeed/right
+	orient_right = 1
+	icon_state = "cryo_rear-r"
+
+/obj/structure/cryofeed/New()
+
+	if(orient_right)
+		icon_state = "cryo_rear-r"
+	else
+		icon_state = "cryo_rear"
+	..()
+
+//Cryopods themselves.
+/obj/machinery/cryopod
+	name = "\improper cryogenic freezer"
+	desc = "A man-sized pod for entering suspended animation."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "body_scanner_0"
+	density = 1
+	anchored = 1
+
+	var/mob/occupant = null      // Person waiting to be despawned.
+	var/orient_right = null      // Flips the sprite.
+	var/time_till_despawn = 9000 // 15 minutes-ish safe period before being despawned.
+	var/time_entered = 0         // Used to keep track of the safe period.
+	var/obj/item/device/radio/intercom/announce //
+
+	// These items are preserved when the process() despawn proc occurs.
+	var/list/preserve_items = list(
+		/obj/item/weapon/hand_tele,
+		/obj/item/weapon/card/id/captains_spare,
+		/obj/item/device/aicard,
+		/obj/item/device/mmi,
+		/obj/item/device/paicard,
+		/obj/item/weapon/gun,
+		/obj/item/weapon/pinpointer,
+		/obj/item/clothing/suit,
+		/obj/item/clothing/shoes/magboots,
+		/obj/item/blueprints,
+		/obj/item/clothing/head/helmet/space/
+	)
+
+/obj/machinery/cryopod/right
+	orient_right = 1
+	icon_state = "body_scanner_0-r"
+
+/obj/machinery/cryopod/New()
+
+	announce = new /obj/item/device/radio/intercom(src)
+
+	if(orient_right)
+		icon_state = "body_scanner_0-r"
+	else
+		icon_state = "body_scanner_0"
+	..()
+
+//Lifted from Unity stasis.dm and refactored. ~Zuhayr
+/obj/machinery/cryopod/process()
+	if(occupant)
+
+		//Allow a ten minute gap between entering the pod and actually despawning.
+		if(world.time - time_entered < time_till_despawn)
+			return
+
+		if(!occupant.client && occupant.stat<2) //Occupant is living and has no client.
+
+			//Delete all items not on the preservation list and drop all others into the pod.
+			for(var/obj/item/W in occupant)
+				occupant.drop_from_inventory(W)
+				W.loc = src
+
+				var/preserve = null
+				for(var/T in preserve_items)
+					if(istype(W,T))
+						preserve = 1
+						break
+
+				if(!preserve)
+					del(W)
+				else
+					frozen_items += W
+
+			var/job = occupant.mind.assigned_role
+			var/role = occupant.mind.special_role
+
+			job_master.FreeRole(job)
+
+			if(role == "traitor" || role == "MODE")
+				del(occupant.mind.objectives)
+				occupant.mind.special_role = null
+			else
+				if(ticker.mode.name == "AutoTraitor")
+					var/datum/game_mode/traitor/autotraitor/current_mode = ticker.mode
+					current_mode.possible_traitors.Remove(occupant)
+
+			// Delete them from datacore.
+			for(var/datum/data/record/R in data_core.medical)
+				if ((R.fields["name"] == occupant.real_name))
+					del(R)
+			for(var/datum/data/record/T in data_core.security)
+				if ((T.fields["name"] == occupant.real_name))
+					del(T)
+			for(var/datum/data/record/G in data_core.general)
+				if ((G.fields["name"] == occupant.real_name))
+					del(G)
+
+			if(orient_right)
+				icon_state = "body_scanner_0-r"
+			else
+				icon_state = "body_scanner_0"
+
+			//TODO: Check objectives/mode, update new targets if this mob is the target, spawn new antags?
+
+			//This should guarantee that ghosts don't spawn.
+			occupant.ckey = null
+
+			//Make an announcement and log the person entering storage.
+			frozen_crew += "[occupant.real_name]"
+
+			announce.autosay("[occupant.real_name] has entered long-term storage.", "Cryogenic Oversight")
+			visible_message("\blue The crypod hums and hisses as it moves [occupant.real_name] into storage.", 3)
+
+			// Delete the mob.
+			del(occupant)
+			occupant = null
+
+
+	return
+
+
+/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+
+	if(istype(G, /obj/item/weapon/grab))
+
+		if(occupant)
+			user << "\blue The cryo pod is in use."
+			return
+
+		if(!ismob(G:affecting))
+			return
+
+		var/willing = null //We don't want to allow people to be forced into despawning.
+		var/mob/M = G:affecting
+
+		if(M.client)
+			if(alert(M,"Would you like to enter cryosleep?",,"Yes","No") == "Yes")
+				if(!M || !G || !G:affecting) return
+				willing = 1
+		else
+			willing = 1
+
+		if(willing)
+
+			visible_message("[user] starts putting [G:affecting:name] into the cryo pod.", 3)
+
+			if(do_after(user, 20))
+				if(!M || !G || !G:affecting) return
+
+				M.loc = src
+
+				if(M.client)
+					M.client.perspective = EYE_PERSPECTIVE
+					M.client.eye = src
+
+			if(orient_right)
+				icon_state = "body_scanner_1-r"
+			else
+				icon_state = "body_scanner_1"
+
+			M << "\blue You feel cool air surround you. You go numb as your senses turn inward."
+			M << "\blue <b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b>"
+			occupant = M
+			time_entered = world.time
+
+			// Book keeping!
+			log_admin("[key_name_admin(M)] has entered a stasis pod.")
+			message_admins("\blue [key_name_admin(M)] has entered a stasis pod.")
+
+			//Despawning occurs when process() is called with an occupant without a client.
+			src.add_fingerprint(M)
+
+/obj/machinery/cryopod/verb/eject()
+	set name = "Eject Pod"
+	set category = "Object"
+	set src in oview(1)
+	if(usr.stat != 0)
+		return
+
+	if(orient_right)
+		icon_state = "body_scanner0-r"
+	else
+		icon_state = "body_scanner0"
+
+	src.go_out()
+	add_fingerprint(usr)
+	return
+
+/obj/machinery/cryopod/verb/move_inside()
+	set name = "Enter Pod"
+	set category = "Object"
+	set src in oview(1)
+
+	if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr)))
+		return
+
+	if(src.occupant)
+		usr << "\blue <B>The cryo pod is in use.</B>"
+		return
+
+	for(var/mob/living/carbon/slime/M in range(1,usr))
+		if(M.Victim == usr)
+			usr << "You're too busy getting your life sucked out of you."
+			return
+
+	visible_message("[usr] starts climbing into the cryo pod.", 3)
+
+	if(do_after(usr, 20))
+
+		if(!usr || !usr.client)
+			return
+
+		if(src.occupant)
+			usr << "\blue <B>The cryo pod is in use.</B>"
+			return
+
+		usr.stop_pulling()
+		usr.client.perspective = EYE_PERSPECTIVE
+		usr.client.eye = src
+		usr.loc = src
+		src.occupant = usr
+
+		if(orient_right)
+			icon_state = "body_scanner_1-r"
+		else
+			icon_state = "body_scanner_1"
+
+		usr << "\blue You feel cool air surround you. You go numb as your senses turn inward."
+		usr << "\blue <b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b>"
+		occupant = usr
+		time_entered = world.time
+
+		src.add_fingerprint(usr)
+
+	return
+
+/obj/machinery/cryopod/proc/go_out()
+
+	if(!occupant)
+		return
+
+	if(occupant.client)
+		occupant.client.eye = src.occupant.client.mob
+		occupant.client.perspective = MOB_PERSPECTIVE
+
+	occupant.loc = get_turf(src)
+	occupant = null
+
+	if(orient_right)
+		icon_state = "body_scanner_0-r"
+	else
+		icon_state = "body_scanner_0"
+
+	return
+
+
+//Attacks/effects.
+/obj/machinery/cryopod/blob_act()
+	return //Sorta gamey, but we don't really want these to be destroyed.

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -16,6 +16,13 @@
 	icon_state = "ash"
 	anchored = 1
 
+/obj/effect/decal/cleanable/ash/attack_hand(mob/user as mob)
+	user << "<span class='notice'>[src] sifts through your fingers.</span>"
+	var/turf/simulated/floor/F = get_turf(src)
+	if (istype(F))
+		F.dirt += 4
+	del(src)
+
 /obj/effect/decal/cleanable/greenglow
 
 	New()

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

@@ -1042,6 +1042,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		if(5)
 			if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
+				if(istype(A, /obj/item/weapon/tank))
+					var/obj/item/weapon/tank/t = A
+					t.manipulated_by = user.real_name
 				var/obj/icon = A
 				for (var/mob/O in viewers(user, null))
 					O << "\red [user] has used [src] on \icon[icon] [A]"

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

@@ -285,7 +285,7 @@
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.shoes && !(H.wear_suit.body_parts_covered & FEET))
+			if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
 				var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
 				if(affecting.status & ORGAN_ROBOT)
 					return

code/game/objects/items/toys.dm

@@ -337,6 +337,12 @@
 			src.icon_state = "sword0"
 			src.item_state = "sword0"
 			src.w_class = 2
+
+		if(istype(user,/mob/living/carbon/human))
+			var/mob/living/carbon/human/H = user
+			H.update_inv_l_hand()
+			H.update_inv_r_hand()
+
 		src.add_fingerprint(user)
 		return
 

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

@@ -203,23 +203,12 @@
 	
 /obj/item/weapon/card/id/syndicate/New(mob/user as mob)
 	..()
-	var/t = reject_bad_name(input(user, "What name would you like to put on this card?\nNode:  You can change this later by clicking on the ID card while it's in your hand.", "Agent card name", ishuman(user) ? user.real_name : user.name))
-	if(!t) 
-		alert("Invalid name.")
-		if(!registered_name) 
-			registered_name = ishuman(user) ? user.real_name : user.name
+	if(!isnull(user)) // Runtime prevention on laggy starts or where users log out because of lag at round start.
+		registered_name = ishuman(user) ? user.real_name : user.name
 	else
-		registered_name = t
-	var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
-	if(!u)
-		alert("Invalid assignment.")
-		assignment = "Assistant"
-	else
-		assignment = u
-	name = "[registered_name]'s ID Card ([assignment])"
-	user << "\blue You successfully forge the ID card."
-	registered_user = user
-	
+		registered_name = "Agent Card"
+	assignment = "Agent"
+	name = "[registered_name]'s ID Card ([assignment])"		
 
 /obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
@@ -239,7 +228,7 @@
 			return
 		src.registered_name = t
 
-		var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
+		var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Agent")),1,MAX_MESSAGE_LEN)
 		if(!u)
 			alert("Invalid assignment.")
 			src.registered_name = ""
@@ -250,7 +239,7 @@
 		registered_user = user
 	else if(!registered_user || registered_user == user)
 
-		if(!registered_user) registered_user = user  // First one to pick it up is the owner if there is ever a wild case New() doens't work.
+		if(!registered_user) registered_user = user  // 
 
 		switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
 			if("Rename")
@@ -263,7 +252,6 @@
 				var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
 				if(!u)
 					alert("Invalid assignment.")
-					src.registered_name = ""
 					return
 				src.assignment = u
 				src.name = "[src.registered_name]'s ID Card ([src.assignment])"

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "dnainjector"
 	var/dnatype = null
-	var/dna = null
+	var/list/dna = null
 	var/block = null
 	var/owner = null
 	var/ue = null
@@ -21,6 +21,34 @@
 	return attack_hand(user)
 
 
+/obj/item/weapon/dnainjector/proc/GetState(var/selblock=0)
+	var/real_block
+	if(!selblock)
+		real_block=block
+		selblock=1
+	else
+		real_block=selblock
+	var/list/BOUNDS = GetDNABounds(real_block)
+	return dna[selblock] > BOUNDS[DNA_ON_LOWERBOUND]
+
+/obj/item/weapon/dnainjector/proc/SetState(var/on, var/selblock=0)
+	var/real_block
+	if(!selblock)
+		real_block=block
+		selblock=1
+	else
+		real_block=selblock
+	var/list/BOUNDS=GetDNABounds(real_block)
+	var/val
+	if(on)
+		val=rand(BOUNDS[DNA_ON_LOWERBOUND],BOUNDS[DNA_ON_UPPERBOUND])
+	else
+		val=rand(BOUNDS[DNA_OFF_LOWERBOUND],BOUNDS[DNA_OFF_UPPERBOUND])
+	dna[selblock]=val
+
+/obj/item/weapon/dnainjector/proc/GetValue(var/block=1)
+	return dna[block]
+
 /obj/item/weapon/dnainjector/proc/inject(mob/M as mob, mob/user as mob)
 	if(istype(M,/mob/living))
 		M.radiation += rand(5,20)
@@ -28,29 +56,23 @@
 	if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
 		if (dnatype == "ui")
 			if (!block) //isolated block?
+				M.UpdateAppearance(dna)
 				if (ue) //unique enzymes? yes
-					M.dna.uni_identity = dna
-					updateappearance(M, M.dna.uni_identity)
 					M.real_name = ue
 					M.name = ue
-					uses--
-				else //unique enzymes? no
-					M.dna.uni_identity = dna
-					updateappearance(M, M.dna.uni_identity)
-					uses--
+				uses--
 			else
-				M.dna.uni_identity = setblock(M.dna.uni_identity,block,dna,3)
-				updateappearance(M, M.dna.uni_identity)
+				M.dna.SetUIValue(block,src.GetValue())
+				M.UpdateAppearance()
 				uses--
 		if (dnatype == "se")
 			if (!block) //isolated block?
-				M.dna.struc_enzymes = dna
-				domutcheck(M, null)
-				uses--
+				M.dna.SE = dna
+				M.dna.UpdateSE()
 			else
-				M.dna.struc_enzymes = setblock(M.dna.struc_enzymes,block,dna,3)
-				domutcheck(M, null,1)
-				uses--
+				M.dna.SetSEValue(block,src.GetValue())
+			domutcheck(M, null, block!=null)
+			uses--
 			if(prob(5))
 				trigger_side_effect(M)
 
@@ -86,7 +108,10 @@
 					inuse = 0
 				M.requests += O
 				if (dnatype == "se")
-					if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
+					// So you're checking for 14, and yet MONKEYBLOCK is 27 in globals.dm,
+                    //  and domutcheck checks MONKEYBLOCK...?  wat. - N3X
+					//if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
+					if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human) )
 						msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 					else
 	//					message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name]")
@@ -108,7 +133,9 @@
 					user << "\red Apparently it didn't work."
 					return
 				if (dnatype == "se")
-					if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
+                    // And again... ?
+					//if (isblockon(getblock(dna, 14,3),14) && istype(M, /mob/living/carbon/human))
+					if (GetState(MONKEYBLOCK) && istype(M, /mob/living/carbon/human))
 						message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] \red(MONKEY)")
 						log_game("[key_name(user)] injected [key_name(M)] with the [name] (MONKEY)")
 					else
@@ -135,21 +162,21 @@
 
 
 
-/obj/item/weapon/dnainjector/antihulk
-	name = "DNA-Injector (Anti-Hulk)"
-	desc = "Cures green skin."
+/obj/item/weapon/dnainjector/hulkmut
+	name = "DNA-Injector (Hulk)"
+	desc = "This will make you big and strong, but give you a bad skin condition."
 	dnatype = "se"
-	dna = "708"
+	dna = list(4090)
 	//block = 2
 	New()
 		..()
 		block = HULKBLOCK
 
-/obj/item/weapon/dnainjector/hulkmut
-	name = "DNA-Injector (Hulk)"
-	desc = "This will make you big and strong, but give you a bad skin condition."
+/obj/item/weapon/dnainjector/antihulk
+	name = "DNA-Injector (Anti-Hulk)"
+	desc = "Cures green skin."
 	dnatype = "se"
-	dna = "FED"
+	dna = list(1)
 	//block = 2
 	New()
 		..()
@@ -159,7 +186,7 @@
 	name = "DNA-Injector (Xray)"
 	desc = "Finally you can see what the Captain does."
 	dnatype = "se"
-	dna = "FED"
+	dna = list(4090)
 	//block = 8
 	New()
 		..()
@@ -169,60 +196,298 @@
 	name = "DNA-Injector (Anti-Xray)"
 	desc = "It will make you see harder."
 	dnatype = "se"
-	dna = "708"
+	dna = list(1)
 	//block = 8
 	New()
 		..()
 		block = XRAYBLOCK
 
+/obj/item/weapon/dnainjector/firemut
+	name = "DNA-Injector (Fire)"
+	desc = "Gives you fire."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 10
+	New()
+		..()
+		block = FIREBLOCK
+
+/obj/item/weapon/dnainjector/antifire
+	name = "DNA-Injector (Anti-Fire)"
+	desc = "Cures fire."
+	dnatype = "se"
+	dna = list(1)
+	//block = 10
+	New()
+		..()
+		block = FIREBLOCK
+
+/obj/item/weapon/dnainjector/telemut
+	name = "DNA-Injector (Tele.)"
+	desc = "Super brain man!"
+	dnatype = "se"
+	dna = list(4090)
+	//block = 12
+	New()
+		..()
+		block = TELEBLOCK
+
+/obj/item/weapon/dnainjector/antitele
+	name = "DNA-Injector (Anti-Tele.)"
+	desc = "Will make you not able to control your mind."
+	dnatype = "se"
+	dna = list(1)
+	//block = 12
+	New()
+		..()
+		block = TELEBLOCK
+
+/obj/item/weapon/dnainjector/nobreath
+	name = "DNA-Injector (No Breath)"
+	desc = "Hold your breath and count to infinity."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = NOBREATHBLOCK
+
+/obj/item/weapon/dnainjector/antinobreath
+	name = "DNA-Injector (Anti-No Breath)"
+	desc = "Hold your breath and count to 100."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = NOBREATHBLOCK
+
+/obj/item/weapon/dnainjector/remoteview
+	name = "DNA-Injector (Remote View)"
+	desc = "Stare into the distance for a reason."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = REMOTEVIEWBLOCK
+
+/obj/item/weapon/dnainjector/antiremoteview
+	name = "DNA-Injector (Anti-Remote View)"
+	desc = "Cures green skin."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = REMOTEVIEWBLOCK
+
+/obj/item/weapon/dnainjector/regenerate
+	name = "DNA-Injector (Regeneration)"
+	desc = "Healthy but hungry."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = REGENERATEBLOCK
+
+/obj/item/weapon/dnainjector/antiregenerate
+	name = "DNA-Injector (Anti-Regeneration)"
+	desc = "Sickly but sated."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = REGENERATEBLOCK
+
+/obj/item/weapon/dnainjector/runfast
+	name = "DNA-Injector (Increase Run)"
+	desc = "Running Man."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = INCREASERUNBLOCK
+
+/obj/item/weapon/dnainjector/antirunfast
+	name = "DNA-Injector (Anti-Increase Run)"
+	desc = "Walking Man."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = INCREASERUNBLOCK
+
+/obj/item/weapon/dnainjector/morph
+	name = "DNA-Injector (Morph)"
+	desc = "A total makeover."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = MORPHBLOCK
+
+/obj/item/weapon/dnainjector/antimorph
+	name = "DNA-Injector (Anti-Morph)"
+	desc = "Cures identity crisis."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = MORPHBLOCK
+/*
+/obj/item/weapon/dnainjector/cold
+	name = "DNA-Injector (Cold)"
+	desc = "Feels a bit chilly."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = COLDBLOCK
+
+/obj/item/weapon/dnainjector/anticold
+	name = "DNA-Injector (Anti-Cold)"
+	desc = "Feels room-temperature."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = COLDBLOCK
+*/
+/obj/item/weapon/dnainjector/noprints
+	name = "DNA-Injector (No Prints)"
+	desc = "Better than a pair of budget insulated gloves."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = NOPRINTSBLOCK
+
+/obj/item/weapon/dnainjector/antinoprints
+	name = "DNA-Injector (Anti-No Prints)"
+	desc = "Not quite as good as a pair of budget insulated gloves."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = NOPRINTSBLOCK
+
+/obj/item/weapon/dnainjector/insulation
+	name = "DNA-Injector (Shock Immunity)"
+	desc = "Better than a pair of real insulated gloves."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = SHOCKIMMUNITYBLOCK
+
+/obj/item/weapon/dnainjector/antiinsulation
+	name = "DNA-Injector (Anti-Shock Immunity)"
+	desc = "Not quite as good as a pair of real insulated gloves."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = SHOCKIMMUNITYBLOCK
+
+/obj/item/weapon/dnainjector/midgit
+	name = "DNA-Injector (Small Size)"
+	desc = "Makes you shrink."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = SMALLSIZEBLOCK
+
+/obj/item/weapon/dnainjector/antimidgit
+	name = "DNA-Injector (Anti-Small Size)"
+	desc = "Makes you grow. But not too much."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = SMALLSIZEBLOCK
+
 /////////////////////////////////////
 /obj/item/weapon/dnainjector/antiglasses
 	name = "DNA-Injector (Anti-Glasses)"
 	desc = "Toss away those glasses!"
 	dnatype = "se"
-	dna = "708"
-	block = 1
+	dna = list(1)
+	//block = 1
+	New()
+		..()
+		block = GLASSESBLOCK
 
 /obj/item/weapon/dnainjector/glassesmut
 	name = "DNA-Injector (Glasses)"
 	desc = "Will make you need dorkish glasses."
 	dnatype = "se"
-	dna = "BD6"
-	block = 1
+	dna = list(4090)
+	//block = 1
+	New()
+		..()
+		block = GLASSESBLOCK
 
 /obj/item/weapon/dnainjector/epimut
 	name = "DNA-Injector (Epi.)"
 	desc = "Shake shake shake the room!"
 	dnatype = "se"
-	dna = "FA0"
-	block = 3
+	dna = list(4090)
+	//block = 3
+	New()
+		..()
+		block = HEADACHEBLOCK
 
 /obj/item/weapon/dnainjector/antiepi
 	name = "DNA-Injector (Anti-Epi.)"
 	desc = "Will fix you up from shaking the room."
 	dnatype = "se"
-	dna = "708"
-	block = 3
-////////////////////////////////////
+	dna = list(1)
+	//block = 3
+	New()
+		..()
+		block = HEADACHEBLOCK
+
 /obj/item/weapon/dnainjector/anticough
 	name = "DNA-Injector (Anti-Cough)"
 	desc = "Will stop that awful noise."
 	dnatype = "se"
-	dna = "708"
-	block = 5
+	dna = list(1)
+	//block = 5
+	New()
+		..()
+		block = COUGHBLOCK
 
 /obj/item/weapon/dnainjector/coughmut
 	name = "DNA-Injector (Cough)"
 	desc = "Will bring forth a sound of horror from your throat."
 	dnatype = "se"
-	dna = "BD6"
-	block = 5
+	dna = list(4090)
+	//block = 5
+	New()
+		..()
+		block = COUGHBLOCK
 
 /obj/item/weapon/dnainjector/clumsymut
 	name = "DNA-Injector (Clumsy)"
 	desc = "Makes clumsy minions."
 	dnatype = "se"
-	dna = "FA0"
+	dna = list(4090)
 	//block = 6
 	New()
 		..()
@@ -232,7 +497,7 @@
 	name = "DNA-Injector (Anti-Clumy)"
 	desc = "Cleans up confusion."
 	dnatype = "se"
-	dna = "708"
+	dna = list(1)
 	//block = 6
 	New()
 		..()
@@ -242,55 +507,47 @@
 	name = "DNA-Injector (Anti-Tour.)"
 	desc = "Will cure tourrets."
 	dnatype = "se"
-	dna = "708"
-	block = 7
+	dna = list(1)
+	//block = 7
+	New()
+		..()
+		block = TWITCHBLOCK
 
 /obj/item/weapon/dnainjector/tourmut
 	name = "DNA-Injector (Tour.)"
 	desc = "Gives you a nasty case off tourrets."
 	dnatype = "se"
-	dna = "BD6"
-	block = 7
+	dna = list(4090)
+	//block = 7
+	New()
+		..()
+		block = TWITCHBLOCK
 
 /obj/item/weapon/dnainjector/stuttmut
 	name = "DNA-Injector (Stutt.)"
 	desc = "Makes you s-s-stuttterrr"
 	dnatype = "se"
-	dna = "FA0"
-	block = 9
+	dna = list(4090)
+	//block = 9
+	New()
+		..()
+		block = NERVOUSBLOCK
 
 /obj/item/weapon/dnainjector/antistutt
 	name = "DNA-Injector (Anti-Stutt.)"
 	desc = "Fixes that speaking impairment."
 	dnatype = "se"
-	dna = "708"
-	block = 9
-
-/obj/item/weapon/dnainjector/antifire
-	name = "DNA-Injector (Anti-Fire)"
-	desc = "Cures fire."
-	dnatype = "se"
-	dna = "708"
-	//block = 10
+	dna = list(1)
+	//block = 9
 	New()
 		..()
-		block = FIREBLOCK
-
-/obj/item/weapon/dnainjector/firemut
-	name = "DNA-Injector (Fire)"
-	desc = "Gives you fire."
-	dnatype = "se"
-	dna = "FED"
-	//block = 10
-	New()
-		..()
-		block = FIREBLOCK
+		block = NERVOUSBLOCK
 
 /obj/item/weapon/dnainjector/blindmut
 	name = "DNA-Injector (Blind)"
 	desc = "Makes you not see anything."
 	dnatype = "se"
-	dna = "FA0"
+	dna = list(4090)
 	//block = 11
 	New()
 		..()
@@ -300,37 +557,17 @@
 	name = "DNA-Injector (Anti-Blind)"
 	desc = "ITS A MIRACLE!!!"
 	dnatype = "se"
-	dna = "708"
+	dna = list(1)
 	//block = 11
 	New()
 		..()
 		block = BLINDBLOCK
 
-/obj/item/weapon/dnainjector/antitele
-	name = "DNA-Injector (Anti-Tele.)"
-	desc = "Will make you not able to control your mind."
-	dnatype = "se"
-	dna = "708"
-	//block = 12
-	New()
-		..()
-		block = TELEBLOCK
-
-/obj/item/weapon/dnainjector/telemut
-	name = "DNA-Injector (Tele.)"
-	desc = "Super brain man!"
-	dnatype = "se"
-	dna = "FED"
-	//block = 12
-	New()
-		..()
-		block = TELEBLOCK
-
 /obj/item/weapon/dnainjector/deafmut
 	name = "DNA-Injector (Deaf)"
 	desc = "Sorry, what did you say?"
 	dnatype = "se"
-	dna = "FA0"
+	dna = list(4090)
 	//block = 13
 	New()
 		..()
@@ -340,22 +577,48 @@
 	name = "DNA-Injector (Anti-Deaf)"
 	desc = "Will make you hear once more."
 	dnatype = "se"
-	dna = "708"
+	dna = list(1)
 	//block = 13
 	New()
 		..()
 		block = DEAFBLOCK
 
+/obj/item/weapon/dnainjector/hallucination
+	name = "DNA-Injector (Halluctination)"
+	desc = "What you see isn't always what you get."
+	dnatype = "se"
+	dna = list(4090)
+	//block = 2
+	New()
+		..()
+		block = HALLUCINATIONBLOCK
+
+/obj/item/weapon/dnainjector/antihallucination
+	name = "DNA-Injector (Anti-Hallucination)"
+	desc = "What you see is what you get."
+	dnatype = "se"
+	dna = list(1)
+	//block = 2
+	New()
+		..()
+		block = HALLUCINATIONBLOCK
+
 /obj/item/weapon/dnainjector/h2m
 	name = "DNA-Injector (Human > Monkey)"
 	desc = "Will make you a flea bag."
 	dnatype = "se"
-	dna = "FA0"
-	block = 14
+	dna = list(4090)
+	//block = 14
+	New()
+		..()
+		block = MONKEYBLOCK
 
 /obj/item/weapon/dnainjector/m2h
 	name = "DNA-Injector (Monkey > Human)"
 	desc = "Will make you...less hairy."
 	dnatype = "se"
-	dna = "708"
-	block = 14
+	dna = list(1)
+	//block = 14
+	New()
+		..()
+		block = MONKEYBLOCK

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

@@ -32,6 +32,12 @@
 		..()
 		usr << text("The service panel is [src.open ? "open" : "closed"].")
 
+	attack_alien(mob/user as mob)
+		return attack_hand(user)
+
+	attack_paw(mob/user as mob)
+		return attack_hand(user)
+
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(locked)
 			if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))

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

@@ -40,6 +40,7 @@
 		w_class = 4
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		user << "\blue [src] is now active."
+
 	else
 		force = 3
 		if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
@@ -49,6 +50,12 @@
 		w_class = 2
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		user << "\blue [src] can now be concealed."
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
 	add_fingerprint(user)
 	return
 
@@ -137,6 +144,12 @@
 		w_class = 2
 		force = 3//not so robust now
 		attack_verb = list("hit", "punched")
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
 	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 	add_fingerprint(user)
 
@@ -242,11 +255,18 @@
 		w_class = 4
 		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		user << "\blue [src] is now active."
+
 	else
 		force = 3
 		icon_state = "eshield[active]"
 		w_class = 1
 		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		user << "\blue [src] can now be concealed."
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
 	add_fingerprint(user)
 	return

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

@@ -15,7 +15,8 @@
 	var/distribute_pressure = ONE_ATMOSPHERE
 	var/integrity = 3
 	var/volume = 70
-
+	var/manipulated_by = null		//Used by _onclick/hud/screen_objects.dm internals to determine if someone has messed with our tank or not.
+						//If they have and we haven't scanned it with the PDA or gas analyzer then we might just breath whatever they put in it.
 /obj/item/weapon/tank/New()
 	..()
 
@@ -86,7 +87,7 @@
 			O << "\red [user] has used [W] on \icon[icon] [src]"
 
 		var/pressure = air_contents.return_pressure()
-
+		manipulated_by = user.real_name			//This person is aware of the contents of the tank.
 		var/total_moles = air_contents.total_moles()
 
 		user << "\blue Results of analysis of \icon[icon]"
@@ -261,4 +262,4 @@
 			integrity--
 
 	else if(integrity < 3)
-		integrity++
+		integrity++

code/game/objects/structures/grille.dm

@@ -145,9 +145,9 @@
 					return
 			var/obj/structure/window/WD
 			if(istype(W,/obj/item/stack/sheet/rglass))
-				WD = new/obj/structure/window(loc,1) //reinforced window
+				WD = new/obj/structure/window/reinforced(loc) //reinforced window
 			else
-				WD = new/obj/structure/window(loc,0) //normal window
+				WD = new/obj/structure/window/basic(loc) //normal window
 			WD.dir = dir_to_set
 			WD.ini_dir = dir_to_set
 			WD.anchored = 0
@@ -155,6 +155,7 @@
 			var/obj/item/stack/ST = W
 			ST.use(1)
 			user << "<span class='notice'>You place the [WD] on [src].</span>"
+			WD.update_icon()
 		return
 //window placing end
 

code/game/objects/structures/tables_racks.dm

@@ -46,6 +46,10 @@
 	density = 0
 	del(src)
 
+/obj/structure/rack/proc/destroy()
+	new parts(loc)
+	density = 0
+	del(src)
 
 /obj/structure/table/update_icon()
 	spawn(2) //So it properly updates when deleting
@@ -423,6 +427,8 @@
 	set desc = "Flips a non-reinforced table"
 	set category = "Object"
 	set src in oview(1)
+	if(ismouse(usr))
+		return
 	if (!can_touch(usr))
 		return
 	if(!flip(get_cardinal_dir(usr,src)))
@@ -570,6 +576,7 @@
 	flags = FPRINT
 	anchored = 1.0
 	throwpass = 1	//You can throw objects over this, despite it's density.
+	var/parts = /obj/item/weapon/rack_parts
 
 /obj/structure/rack/ex_act(severity)
 	switch(severity)
@@ -632,33 +639,22 @@
 	if(HULK in user.mutations)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		new /obj/item/weapon/rack_parts(loc)
-		density = 0
-		del(src)
-
+		destroy()
 
 /obj/structure/rack/attack_paw(mob/user)
 	if(HULK in user.mutations)
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		new /obj/item/weapon/rack_parts(loc)
-		density = 0
-		del(src)
-
+		destroy()
 
 /obj/structure/rack/attack_alien(mob/user)
 	visible_message("<span class='danger'>[user] slices [src] apart!</span>")
-	new /obj/item/weapon/rack_parts(loc)
-	density = 0
-	del(src)
-
+	destroy()
 
 /obj/structure/rack/attack_animal(mob/living/simple_animal/user)
 	if(user.wall_smash)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		new /obj/item/weapon/rack_parts(loc)
-		density = 0
-		del(src)
+		destroy()
 
 /obj/structure/rack/attack_tk() // no telehulk sorry
 	return

code/game/objects/structures/window.dm

@@ -9,7 +9,7 @@
 	flags = ON_BORDER
 	var/health = 14.0
 	var/ini_dir = null
-	var/state = 0
+	var/state = 2
 	var/reinf = 0
 	var/basestate
 	var/shardtype = /obj/item/weapon/shard
@@ -338,6 +338,7 @@
 	spawn(2)
 		if(!src) return
 		if(!is_fulltile())
+			icon_state = "[basestate]"
 			return
 		var/junction = 0 //will be used to determine from which side the window is connected to other windows
 		if(anchored)

code/game/turfs/simulated.dm

@@ -20,12 +20,16 @@
 
 	if (istype(A,/mob/living/carbon))
 		var/mob/living/carbon/M = A
-		if(M.lying)	return
+		if(M.lying)        return
 		dirt++
-		if (dirt > 40)
-			dirt = 0
-			if (!locate(/obj/effect/decal/cleanable/dirt, src))
-				new/obj/effect/decal/cleanable/dirt(src)
+		var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, src)
+		if (dirt >= 30)
+			if (!dirtoverlay)
+				dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
+				dirtoverlay.alpha = 15
+			else if (dirt > 30)
+				dirtoverlay.alpha = min(dirtoverlay.alpha+20, 255)
+
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
 

code/modules/admin/admin_investigate.dm

@@ -26,12 +26,12 @@
 	F << "<small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
 
 //ADMINVERBS
-/client/proc/investigate_show( subject in list("hrefs","notes","singulo") )
+/client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)	return
 	switch(subject)
-		if("singulo")			//general one-round-only stuff
+		if("singulo", "telesci")			//general one-round-only stuff
 			var/F = investigate_subject2file(subject)
 			if(!F)
 				src << "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>"

code/modules/admin/verbs/randomverbs.dm

@@ -447,9 +447,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(record_found)//Pull up their name from database records if they did have a mind.
 		new_character.dna = new()//Let's first give them a new DNA.
 		new_character.dna.unique_enzymes = record_found.fields["b_dna"]//Enzymes are based on real name but we'll use the record for conformity.
-		new_character.dna.struc_enzymes = record_found.fields["enzymes"]//This is the default of enzymes so I think it's safe to go with.
-		new_character.dna.uni_identity = record_found.fields["identity"]//DNA identity is carried over.
-		updateappearance(new_character,new_character.dna.uni_identity)//Now we configure their appearance based on their unique identity, same as with a DNA machine or somesuch.
+		new_character.dna.SE = record_found.fields["enzymes"]//This is the default of enzymes so I think it's safe to go with.
+		new_character.dna.UpdateSE()
+		new_character.UpdateAppearance(record_found.fields["identity"])//Now we configure their appearance based on their unique identity, same as with a DNA machine or somesuch.
 	else//If they have no records, we just do a random DNA for them, based on their random appearance/savefile.
 		new_character.dna.ready_dna(new_character)
 

code/modules/assembly/mousetrap.dm

@@ -45,6 +45,7 @@
 			visible_message("\red <b>SPLAT!</b>")
 			M.splat()
 		playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+		layer = MOB_LAYER - 0.2
 		armed = 0
 		update_icon()
 		pulse(0)
@@ -112,4 +113,16 @@
 
 /obj/item/device/assembly/mousetrap/armed
 	icon_state = "mousetraparmed"
-	armed = 1
+	armed = 1
+
+
+/obj/item/device/assembly/mousetrap/verb/hide_under()
+	set src in oview(1)
+	set name = "Hide"
+	set category = "Object"
+
+	if(usr.stat)
+		return
+
+	layer = TURF_LAYER+0.2
+	usr << "<span class='notice'>You hide [src].</span>"

code/modules/client/preferences.dm

@@ -44,6 +44,8 @@ datum/preferences
 	var/be_special = 0					//Special role selection
 	var/UI_style = "Midnight"
 	var/toggles = TOGGLES_DEFAULT
+	var/UI_style_color = "#ffffff"
+	var/UI_style_alpha = 255
 
 	//character preferences
 	var/real_name						//our character's name
@@ -241,6 +243,9 @@ datum/preferences
 
 		dat += "<br>"
 		dat += "<b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
+		dat += "<b>Custom UI</b>(recommended for White UI):<br>"
+		dat += "-Color: <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'><tr><td>__</td></tr></table><br>"
+		dat += "-Alpha(transparence): <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(toggles & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
 		dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(toggles & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
 		dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
@@ -1117,9 +1122,21 @@ datum/preferences
 								UI_style = "Orange"
 							if("Orange")
 								UI_style = "old"
+							if("old")
+								UI_style = "White"
 							else
 								UI_style = "Midnight"
 
+					if("UIcolor")
+						var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!") as color|null
+						if(!UI_style_color_new) return
+						UI_style_color = UI_style_color_new
+
+					if("UIalpha")
+						var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
+						if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+						UI_style_alpha = UI_style_alpha_new
+								
 					if("be_special")
 						var/num = text2num(href_list["num"])
 						be_special ^= (1<<num)

code/modules/client/preferences_savefile.dm

@@ -1,5 +1,5 @@
 #define SAVEFILE_VERSION_MIN	8
-#define SAVEFILE_VERSION_MAX	10
+#define SAVEFILE_VERSION_MAX	11
 
 //handles converting savefiles to new formats
 //MAKE SURE YOU KEEP THIS UP TO DATE!
@@ -54,14 +54,18 @@
 	S["be_special"]			>> be_special
 	S["default_slot"]		>> default_slot
 	S["toggles"]			>> toggles
+	S["UI_style_color"]		>> UI_style_color
+	S["UI_style_alpha"]		>> UI_style_alpha
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
 	lastchangelog	= sanitize_text(lastchangelog, initial(lastchangelog))
-	UI_style		= sanitize_inlist(UI_style, list("Midnight","Orange","old"), initial(UI_style))
+	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight","Orange","old"), initial(UI_style))
 	be_special		= sanitize_integer(be_special, 0, 65535, initial(be_special))
 	default_slot	= sanitize_integer(default_slot, 1, MAX_SAVE_SLOTS, initial(default_slot))
 	toggles			= sanitize_integer(toggles, 0, 65535, initial(toggles))
+	UI_style_color	= sanitize_hexcolor(UI_style_color, initial(UI_style_color))
+	UI_style_alpha	= sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha))
 
 	return 1
 
@@ -80,6 +84,8 @@
 	S["be_special"]			<< be_special
 	S["default_slot"]		<< default_slot
 	S["toggles"]			<< toggles
+	S["UI_style_color"]		<< UI_style_color
+	S["UI_style_alpha"]		<< UI_style_alpha
 
 	return 1
 

code/modules/client/preferences_toggles.dm

@@ -107,10 +107,12 @@
 	set desc = "Toggles seeing Local OutOfCharacter chat"
 	prefs.toggles ^= CHAT_LOOC
 	prefs.save_preferences()
+
 	src << "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel."
 	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
+
 /client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
 	set name = "Hear/Silence Ambience"
 	set category = "Preferences"
@@ -135,4 +137,42 @@
 	prefs.be_special ^= role_flag
 	prefs.save_preferences()
 	src << "You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible)."
-	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/change_ui()
+	set name = "Change UI"
+	set category = "Preferences"
+	set desc = "Configure your user interface"
+
+	if(!ishuman(usr))
+		usr << "This only for human"
+		return
+
+	var/UI_style_new = input(usr, "Select a style, we recommend White for customization") in list("White", "Midnight", "Orange", "old")
+	if(!UI_style_new) return
+
+	var/UI_style_alpha_new = input(usr, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
+	if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+
+	var/UI_style_color_new = input(usr, "Choose your UI color, dark colors are not recommended!") as color|null
+	if(!UI_style_color_new) return
+
+	//update UI
+	var/list/icons = usr.hud_used.adding + usr.hud_used.other +usr.hud_used.hotkeybuttons
+	icons.Add(usr.zone_sel)
+
+	for(var/obj/screen/I in icons)
+		if(I.color && I.alpha)
+			I.icon = ui_style2icon(UI_style_new)
+			I.color = UI_style_color_new
+			I.alpha = UI_style_alpha_new
+
+
+
+	if(alert("Like it? Save changes?",,"Yes", "No") == "Yes")
+		prefs.UI_style = UI_style_new
+		prefs.UI_style_alpha = UI_style_alpha_new
+		prefs.UI_style_color = UI_style_color_new
+		prefs.save_preferences()
+		usr << "UI was saved"

code/modules/clothing/under/jobs/security.dm

@@ -80,7 +80,7 @@
 	item_color = "polsuit"
 
 /obj/item/clothing/under/det/slob/verb/rollup()
-	set name = "Roll suit sleevels"
+	set name = "Roll suit sleeves"
 	set category = "Object"
 	set src in usr
 	item_color = item_color == "polsuit" ? "polsuit_rolled" : "polsuit"

code/modules/detectivework/scanner.dm

@@ -70,6 +70,7 @@
 			return
 		if(istype(A,/obj/machinery/computer/forensic_scanning)) //breaks shit.
 			return
+
 		if(istype(A,/obj/item/weapon/f_card))
 			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
 			flick("forensic0",src)
@@ -77,9 +78,8 @@
 
 		add_fingerprint(user)
 
-
-		//Special case for blood splaters.
-		if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
+		//Special case for blood splatters, runes and gibs.
+		if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable/blood/gibs))
 			if(!isnull(A.blood_DNA))
 				for(var/blood in A.blood_DNA)
 					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"

code/modules/events/disease_outbreak.dm

@@ -30,8 +30,8 @@
 				continue
 			var/datum/disease/dnaspread/D = new
 			D.strain_data["name"] = H.real_name
-			D.strain_data["UI"] = H.dna.uni_identity
-			D.strain_data["SE"] = H.dna.struc_enzymes
+			D.strain_data["UI"] = H.dna.UI
+			D.strain_data["SE"] = H.dna.SE
 			D.carrier = 1
 			D.holder = H
 			D.affected_mob = H

code/modules/mining/mine_turfs.dm

@@ -5,6 +5,7 @@
 #define ARTIFACT_SPAWN_CHANCE 20
 
 /datum/controller/game_controller/var/list/artifact_spawning_turfs = list()
+/var/global/list/artifact_spawn = list() // Runtime fix for geometry loading before controller is instantiated.
 
 /turf/simulated/mineral //wall piece
 	name = "Rock"
@@ -129,7 +130,7 @@
 			//dont create artifact machinery in animal or plant digsites, or if we already have one
 			if(!artifact_find && digsite != 1 && digsite != 2 && prob(ARTIFACT_SPAWN_CHANCE))
 				artifact_find = new()
-				master_controller.artifact_spawning_turfs.Add(src)
+				artifact_spawn.Add(src)
 
 		if(!src.geological_data)
 			src.geological_data = new/datum/geosample(src)

code/modules/mob/abilities.dm

@@ -0,0 +1,35 @@
+/*
+Creature-level abilities.
+*/
+
+/var/global/list/ability_verbs = list(	)
+
+/*
+
+ Example ability:
+
+/client/proc/test_ability()
+
+	set category = "Ability"
+	set name = "Test ability"
+	set desc = "An ability for testing."
+
+	// Check if the client has a mob and if the mob is valid and alive.
+	if(!mob || !istype(mob,/mob/living) || mob.stat)
+		src << "\red You must be corporeal and alive to do that."
+		return 0
+
+	//Handcuff check.
+	if(mob.restrained())
+		src << "\red You cannot do this while restrained."
+		return 0
+
+	if(istype(mob,/mob/living/carbon))
+		var/mob/living/carbon/M = mob
+		if(M.handcuffed)
+			src << "\red You cannot do this while cuffed."
+			return 0
+
+	src << "\blue You perform an ability."
+
+*/

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

@@ -446,6 +446,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Become mouse"
 	set category = "Ghost"
 
+	if(config.disable_player_mice)
+		src << "<span class='warning'>Spawning as a mouse is currently disabled.</span>"
+		return
+
 	var/timedifference = world.time - client.time_died_as_mouse
 	if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
 		var/timedifference_text
@@ -453,6 +457,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		src << "<span class='warning'>You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.</span>"
 		return
 
+	var/response = alert(src, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?","Squeek!","Nope!")
+	if(response != "Squeek!") return  //Hit the wrong key...again.
+
+
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
 	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
@@ -467,6 +475,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		src << "<span class='warning'>Unable to find any unwelded vents to spawn mice at.</span>"
 
 	if(host)
+		if(config.uneducated_mice)
+			host.universal_understand = 0
 		host.ckey = src.ckey
 		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
 

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

@@ -67,8 +67,11 @@
 		G.process()
 
 	if(!client && stat == CONSCIOUS)
-		if(prob(33) && canmove && isturf(loc))
+
+		if(prob(33) && canmove && isturf(loc) && !pulledby) //won't move if being pulled
+
 			step(src, pick(cardinal))
+
 		if(prob(1))
 			emote(pick("scratch","jump","roll","tail"))
 

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

@@ -47,8 +47,10 @@
 			gender = pick(MALE, FEMALE)
 		dna = new /datum/dna( null )
 		dna.real_name = real_name
-		dna.uni_identity = "00600200A00E0110148FC01300B009"
-		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+		dna.ResetSE()
+		dna.ResetUI()
+		//dna.uni_identity = "00600200A00E0110148FC01300B009"
+		//dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
 		dna.unique_enzymes = md5(name)
 				//////////blah
 		var/gendervar

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

@@ -37,6 +37,8 @@
 
 	var/flags = 0       // Various specific features.
 
+	var/list/abilities = list()	// For species-derived or admin-given powers
+
 /datum/species/human
 	name = "Human"
 	language = "Sol Common"
@@ -44,6 +46,9 @@
 
 	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR
 
+	//If you wanted to add a species-level ability:
+	/*abilities = list(/client/proc/test_ability)*/
+
 /datum/species/unathi
 	name = "Unathi"
 	icobase = 'icons/mob/human_races/r_lizard.dmi'

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

@@ -1161,6 +1161,9 @@
 			var/turf/tile = loc
 			if(isturf(tile))
 				tile.clean_blood()
+				if (istype(tile, /turf/simulated))
+					var/turf/simulated/S = tile
+					S.dirt = 0
 				for(var/A in tile)
 					if(istype(A, /obj/effect))
 						if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))

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

@@ -27,6 +27,7 @@
 	minbodytemp = 223		//Below -50 Degrees Celcius
 	maxbodytemp = 323	//Above 50 Degrees Celcius
 	universal_speak = 0
+	universal_understand = 1
 
 /mob/living/simple_animal/mouse/Life()
 	..()
@@ -50,6 +51,7 @@
 
 /mob/living/simple_animal/mouse/New()
 	..()
+	name = "[name] ([rand(1, 1000)])"
 	if(!body_color)
 		body_color = pick( list("brown","gray","white") )
 	icon_state = "mouse_[body_color]"
@@ -63,6 +65,7 @@
 	src.stat = DEAD
 	src.icon_dead = "mouse_[body_color]_splat"
 	src.icon_state = "mouse_[body_color]_splat"
+	layer = MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time
 
@@ -179,6 +182,7 @@
 	..()
 
 /mob/living/simple_animal/mouse/Die()
+	layer = MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time
 	..()

code/modules/mob/login.dm

@@ -24,6 +24,7 @@
 						log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
 
 /mob/Login()
+
 	player_list |= src
 	update_Login_details()
 	world.update_status()
@@ -44,4 +45,13 @@
 		client.eye = src
 		client.perspective = MOB_PERSPECTIVE
 
+	//Clear ability list and update from mob.
+	client.verbs -= ability_verbs
 
+	if(abilities)
+		client.verbs |= abilities
+
+	if(istype(src,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = src
+		if(H.species && H.species.abilities)
+			client.verbs |= H.species.abilities

code/modules/mob/mob_defines.dm

@@ -84,10 +84,11 @@
 	var/lastpuke = 0
 	var/unacidable = 0
 	var/small = 0
-	var/list/pinned = list()            //List of things pinning this creature to walls (see living_defense.dm)
-	var/list/embedded = list()          //Embedded items, since simple mobs don't have organs.
+	var/list/pinned = list()            // List of things pinning this creature to walls (see living_defense.dm)
+	var/list/embedded = list()          // Embedded items, since simple mobs don't have organs.
 	var/list/languages = list()         // For speaking/listening.
-	var/list/speak_emote = list("says") //Verbs used when speaking. Defaults to 'say' if speak_emote is null.
+	var/list/abilities = list()         // For species-derived or admin-given powers.
+	var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null.
 
 	var/name_archive //For admin things like possession
 
@@ -206,6 +207,7 @@
 
 	//Whether or not mobs can understand other mobtypes. These stay in /mob so that ghosts can hear everything.
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
+	var/universal_understand = 0 // Set to 1 to enable the mob to understand everyone, not necessarily speak
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
 

code/modules/mob/new_player/new_player.dm

@@ -391,9 +391,13 @@
 		new_character.dna.b_type = client.prefs.b_type
 
 		if(client.prefs.disabilities)
-			new_character.dna.struc_enzymes = setblock(new_character.dna.struc_enzymes,GLASSESBLOCK,toggledblock(getblock(new_character.dna.struc_enzymes,GLASSESBLOCK,3)),3)
+			// Set defer to 1 if you add more crap here so it only recalculates struc_enzymes once. - N3X
+			new_character.dna.SetSEState(GLASSESBLOCK,1,0) 
 			new_character.disabilities |= NEARSIGHTED
 
+		// And uncomment this, too.
+		//new_character.dna.UpdateSE()
+
 		new_character.key = key		//Manually transfer the key to log them in
 
 		return new_character

code/modules/mob/new_player/sprite_accessories.dm

@@ -7,7 +7,7 @@
 	Enjoy! - Doohl
 
 
-	Notice: This all gets automatically compiled in a list in dna.dm, so you do not
+	Notice: This all gets automatically compiled in a list in dna2.dm, so you do not
 	have to define any UI values for sprite accessories manually for hair and facial
 	hair. Just add in new hair types and the game will naturally adapt.
 

code/modules/mob/say.dm

@@ -66,7 +66,7 @@
 	if(!other)
 		return 1
 	//Universal speak makes everything understandable, for obvious reasons.
-	else if(other.universal_speak || src.universal_speak)
+	else if(other.universal_speak || src.universal_speak || src.universal_understand)
 		return 1
 	else if (src.stat == 2)
 		return 1
@@ -83,11 +83,11 @@
 		else
 			return 0
 
-	else if(other.universal_speak || src.universal_speak)
+	else if(other.universal_speak || src.universal_speak || src.universal_understand)
 		return 1
 	else if(isAI(src) && ispAI(other))
 		return 1
-	else if (istype(other, src.type) || istype(src, other.type))
+	else if (istype(other, src.type) || istype(src, other.type))
 		return 1
 	return 0
 

code/modules/mob/transform_procs.dm

@@ -30,8 +30,10 @@
 	O = new species.primitive(loc)
 
 	O.dna = dna
-	O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00"
-	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+	//O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00"
+	//O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+	O.dna.SetSEState(MONKEYBLOCK,1)
+	O.loc = loc
 	O.viruses = viruses
 	O.a_intent = "hurt"
 

code/modules/organs/organ_external.dm

@@ -875,8 +875,8 @@ obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
 
 	H.regenerate_icons()
 
-	H.stat = 2
-	H.death()
+	brainmob.stat = 2
+	brainmob.death()
 
 obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
 	brainmob = new(src)

code/modules/paperwork/folders.dm

@@ -61,7 +61,7 @@
 
 		if(href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
-			if(P)
+			if(P && P.loc == src)
 				P.loc = usr.loc
 				usr.put_in_hands(P)
 

code/modules/projectiles/ammunition/boxes.dm

@@ -14,7 +14,7 @@
 	multiple_sprites = 1
 
 
-/obj/item/ammo_magazine/c45
+/obj/item/ammo_magazine/c45m
 	name = "magazine (.45)"
 	icon_state = "45"
 	ammo_type = "/obj/item/ammo_casing/c45"

code/modules/projectiles/guns/projectile.dm

@@ -51,6 +51,9 @@
 	if(istype(A, /obj/item/ammo_magazine))
 		if((load_method == MAGAZINE) && loaded.len)	return
 		var/obj/item/ammo_magazine/AM = A
+		if(AM.stored_ammo.len <= 0)
+			user << "<span class='warning'>The magazine is empty!</span>"
+			return
 		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
 			if(loaded.len >= max_shells)
 				break
@@ -93,6 +96,7 @@
 			AM.loc = get_turf(src)
 			empty_mag = null
 			update_icon()
+			AM.update_icon()
 			user << "\blue You unload magazine from \the [src]!"
 	else
 		user << "\red Nothing loaded in \the [src]!"

code/modules/projectiles/guns/projectile/revolver.dm

@@ -54,7 +54,7 @@
 					caliber = "357"
 					desc = "The barrel and chamber assembly seems to have been modified."
 					user << "<span class='warning'>You reinforce the barrel of [src]! Now it will fire .357 rounds.</span>"
-			else
+			else if (caliber == "357")
 				user << "<span class='notice'>You begin to revert the modifications to [src].</span>"
 				if(loaded.len)
 					afterattack(user, user)	//and again
@@ -89,6 +89,7 @@
 	if(!loaded.len && empty_mag)
 		empty_mag.loc = get_turf(src.loc)
 		empty_mag = null
+		user << "<span class='notice'>The Magazine falls out and clatters on the floor!</span>"
 	return
 
 

code/modules/projectiles/targeting.dm

@@ -269,6 +269,7 @@ client/proc/add_gun_icons()
 		screen += usr.gun_run_icon
 
 client/proc/remove_gun_icons()
+	if(isnull(usr)) return 1 // Runtime prevention on N00k agents spawning with SMG
 	screen -= usr.item_use_icon
 	screen -= usr.gun_move_icon
 	if (target_can_move)

code/modules/reagents/Chemistry-Machinery.dm

@@ -10,10 +10,10 @@
 	icon_state = "dispenser"
 	use_power = 0
 	idle_power_usage = 40
-	var/ui_name = "Chem Dispenser 5000" 
+	var/ui_name = "Chem Dispenser 5000"
 	var/energy = 100
 	var/max_energy = 100
-	var/amount = 30	
+	var/amount = 30
 	var/accept_glass = 0
 	var/beaker = null
 	var/recharged = 0
@@ -434,7 +434,6 @@
 				reagents.clear_reagents()
 				icon_state = "mixer0"
 		else if (href_list["createpill"] || href_list["createpill_multiple"])
-
 			var/count = 1
 
 			if(reagents.total_volume/count < 1) //Sanity checking.
@@ -448,12 +447,11 @@
 
 			var/amount_per_pill = reagents.total_volume/count
 			if (amount_per_pill > 50) amount_per_pill = 50
-
+
 			var/name = reject_bad_text(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)"))
 
 			if(reagents.total_volume/count < 1) //Sanity checking.
 				return
-            
 			while (count--)
 				var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src.loc)
 				if(!name) name = reagents.get_master_reagent_name()

code/modules/reagents/Chemistry-Reagents.dm

@@ -906,6 +906,9 @@ datum
 
 					for(var/mob/living/carbon/slime/M in T)
 						M.adjustToxLoss(rand(5,10))
+			reaction_turf(var/turf/simulated/S, var/volume)
+				if(volume >= 1)
+					S.dirt = 0
 
 			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 				if(iscarbon(M))
@@ -1480,7 +1483,7 @@ datum
 					if(prob(98))	randmutb(M)
 					else			randmutg(M)
 					domutcheck(M, null)
-					updateappearance(M,M.dna.uni_identity)
+					M.UpdateAppearance()
 				return
 			on_mob_life(var/mob/living/carbon/M)
 				if(!istype(M))	return

code/modules/reagents/Chemistry-Recipes.dm

@@ -477,14 +477,14 @@ datum
 		potassium_chloride
 			name = "Potassium Chloride"
 			id = "potassium_chloride"
-			id = "potassium_chloride"
+			result = "potassium_chloride"
 			required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
 			result_amount = 2
 
 		potassium_chlorophoride
 			name = "Potassium Chlorophoride"
 			id = "potassium_chlorophoride"
-			id = "potassium_chlorophoride"
+			result = "potassium_chlorophoride"
 			required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloral_hydrate" = 1)
 			result_amount = 4
 

code/modules/reagents/reagent_containers/glass.dm

@@ -66,7 +66,8 @@
 		update_icon()
 
 	afterattack(obj/target, mob/user , flag)
-		if (!is_open_container())
+
+		if (!is_open_container() || !flag)
 			return
 
 		for(var/type in src.can_be_placed_into)

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -114,6 +114,11 @@ var/list/valid_secondary_effect_types = list(\
 #define TRIGGER_NITRO 12
 
 /obj/machinery/artifact/process()
+
+	var/turf/L = loc
+	if(isnull(L) || !istype(L)) 	// We're inside a container or on null turf, either way stop processing effects
+		return
+
 	if(my_effect)
 		my_effect.process()
 	if(secondary_effect)

code/modules/research/xenoarchaeology/geosample.dm

@@ -126,14 +126,15 @@
 		artifact_distance = rand()
 		artifact_id = container.artifact_find.artifact_id
 	else
-		for(var/turf/simulated/mineral/T in master_controller.artifact_spawning_turfs)
-			if(T.artifact_find)
-				var/cur_dist = get_dist(container, T) * 2
-				if( (artifact_distance < 0 || cur_dist < artifact_distance) && cur_dist <= T.artifact_find.artifact_detect_range )
-					artifact_distance = cur_dist + rand() * 2 - 1
-					artifact_id = T.artifact_find.artifact_id
-			else
-				master_controller.artifact_spawning_turfs.Remove(T)
+		if(master_controller) //Sanity check due to runtimes ~Z
+			for(var/turf/simulated/mineral/T in master_controller.artifact_spawning_turfs)
+				if(T.artifact_find)
+					var/cur_dist = get_dist(container, T) * 2
+					if( (artifact_distance < 0 || cur_dist < artifact_distance) && cur_dist <= T.artifact_find.artifact_detect_range )
+						artifact_distance = cur_dist + rand() * 2 - 1
+						artifact_id = T.artifact_find.artifact_id
+				else
+					master_controller.artifact_spawning_turfs.Remove(T)
 
 /*
 #undef FIND_PLANT

code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm

@@ -36,13 +36,14 @@
 	last_scan_time = world.time
 	nearest_artifact_distance = -1
 	var/turf/cur_turf = get_turf(src)
-	for(var/turf/simulated/mineral/T in master_controller.artifact_spawning_turfs)
-		if(T.artifact_find)
-			if(T.z == cur_turf.z)
-				var/cur_dist = get_dist(cur_turf, T) * 2
-				if( (nearest_artifact_distance < 0 || cur_dist < nearest_artifact_distance) && cur_dist <= T.artifact_find.artifact_detect_range )
-					nearest_artifact_distance = cur_dist + rand() * 2 - 1
-					nearest_artifact_id = T.artifact_find.artifact_id
-		else
-			master_controller.artifact_spawning_turfs.Remove(T)
+	if(master_controller) //Sanity check due to runtimes ~Z
+		for(var/turf/simulated/mineral/T in master_controller.artifact_spawning_turfs)
+			if(T.artifact_find)
+				if(T.z == cur_turf.z)
+					var/cur_dist = get_dist(cur_turf, T) * 2
+					if( (nearest_artifact_distance < 0 || cur_dist < nearest_artifact_distance) && cur_dist <= T.artifact_find.artifact_detect_range )
+						nearest_artifact_distance = cur_dist + rand() * 2 - 1
+						nearest_artifact_id = T.artifact_find.artifact_id
+			else
+				master_controller.artifact_spawning_turfs.Remove(T)
 	cur_turf.visible_message("<span class='info'>[src] clicks.</span>")

code/modules/surgery/headreattach.dm

@@ -177,7 +177,8 @@
 		target.updatehealth()
 		target.UpdateDamageIcon()
 		var/obj/item/weapon/organ/head/B = tool
-		B.brainmob.mind.transfer_to(target)
+		if (B.brainmob.mind)
+			B.brainmob.mind.transfer_to(target)
 		del(B)
 
 

code/modules/telesci/telesci_computer.dm

@@ -84,6 +84,8 @@
 	interact(user)
 
 /obj/machinery/computer/telescience/interact(mob/user)
+	user.machine = src
+	in_use = 1
 
 	var/t = "<div class='statusDisplay'>[temp_msg]</div><BR>"
 	t += "<A href='?src=\ref[src];setrotation=1'>Set Bearing</A>"
@@ -301,9 +303,10 @@
 		temp_msg = "NOTICE:<BR>Bluespace crystals ejected."
 
 	updateDialog()
+	return 1
 
 /obj/machinery/computer/telescience/proc/recalibrate()
 	teles_left = rand(30, 40)
 	angle_off = rand(-25, 25)
 	power_off = rand(-4, 0)
-	rotation_off = rand(-10, 10)
+	rotation_off = rand(-10, 10)

code/modules/virus2/effect.dm

@@ -209,8 +209,7 @@
 	stage = 3
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob.dna.check_integrity()
-		var/newdna = setblock(mob.dna.struc_enzymes,REMOTETALKBLOCK,toggledblock(getblock(mob.dna.struc_enzymes,REMOTETALKBLOCK,3)),3)
-		mob.dna.struc_enzymes = newdna
+		mob.dna.SetSEState(REMOTETALKBLOCK,1)
 		domutcheck(mob, null)
 
 /datum/disease2/effect/mind

maps/tgstation2.dmm

@@ -927,7 +927,7 @@
 "arQ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "arR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "arS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 1; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
-"arT" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"arT" = (/turf/simulated/wall/r_wall,/area/crew_quarters/fitness)
 "arU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "arV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "arW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
@@ -964,12 +964,12 @@
 "asB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Dorm Two"})
 "asC" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/crew_quarters/sleep)
 "asD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep)
-"asE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin One"})
-"asF" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin One"})
-"asG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin One"})
-"asH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin Two"})
-"asI" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin Two"})
-"asJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/fitness)
+"asE" = (/turf/simulated/wall/r_wall,/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"asF" = (/obj/machinery/door/airlock/glass{name = "Cryogenic Storage"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"asG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/fitness)
+"asH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"asI" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"asJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/cryopod,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
 "asK" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/crew_quarters/fitness)
 "asL" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/fitness)
 "asM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/fitness)
@@ -1002,15 +1002,15 @@
 "atn" = (/turf/simulated/wall,/area/crew_quarters/sleep{name = "Dorm Two"})
 "ato" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters/sleep)
 "atp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters/sleep)
-"atq" = (/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin One"})
-"atr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/structure/stool/bed,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin One"})
-"ats" = (/obj/machinery/light/small{dir = 1},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin One"})
-"att" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin One"})
-"atu" = (/turf/simulated/wall,/area/crew_quarters/sleep{name = "Cabin Two"})
-"atv" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin Two"})
-"atw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin Two"})
-"atx" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/effect/decal/cleanable/cobweb2,/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin Two"})
-"aty" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/fitness)
+"atq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cryofeed,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"atr" = (/obj/machinery/computer/cryopod{density = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"ats" = (/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"att" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall/r_wall,/area/crew_quarters/fitness)
+"atu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/structure/cryofeed/right,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"atv" = (/obj/machinery/requests_console{department = "Crew Quarters"; pixel_y = 30},/obj/machinery/camera/xray{c_tag = "Dormitories"},/obj/machinery/cryopod/right,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"atw" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"atx" = (/obj/machinery/cryopod,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"aty" = (/obj/structure/cryofeed,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
 "atz" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters/fitness)
 "atA" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness)
 "atB" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/closet/athletic_mixed,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness)
@@ -1047,12 +1047,8 @@
 "aug" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep{name = "Dorm Two"})
 "auh" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
 "aui" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/crew_quarters/sleep)
-"auj" = (/turf/simulated/floor/wood{icon_state = "wood-broken4"},/area/crew_quarters/sleep{name = "Cabin One"})
-"auk" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin One"})
-"aul" = (/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor/wood{icon_state = "wood-broken3"},/area/crew_quarters/sleep{name = "Cabin One"})
-"aum" = (/turf/simulated/floor/wood{icon_state = "wood-broken6"},/area/crew_quarters/sleep{name = "Cabin Two"})
-"aun" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin Two"})
-"auo" = (/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor/wood{icon_state = "wood-broken"},/area/crew_quarters/sleep{name = "Cabin Two"})
+"auj" = (/obj/machinery/cryopod/right,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
+"auk" = (/obj/structure/cryofeed/right,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/sleep{name = "\improper Cryogenic Storage"})
 "aup" = (/obj/machinery/power/apc{dir = 8; name = "Fitness Room APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness)
 "auq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 2; icon_state = "whitecorner"},/area/crew_quarters/fitness)
 "aur" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/crew_quarters/fitness)
@@ -1094,8 +1090,6 @@
 "avb" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "avc" = (/obj/machinery/atmospherics/pipe/manifold{pipe_color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/sleep{name = "Dorm Two"})
 "avd" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
-"ave" = (/obj/machinery/door/airlock{id_tag = "Dorm5"; name = "Cabin 1"},/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin One"})
-"avf" = (/obj/machinery/door/airlock{id_tag = "Dorm6"; name = "Cabin 2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep{name = "Cabin Two"})
 "avg" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness)
 "avh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/fitness)
 "avi" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/fitness)
@@ -1132,11 +1126,7 @@
 "avN" = (/obj/machinery/door/airlock{id_tag = "Dorm3"; name = "Dorm 3"},/turf/simulated/floor/carpet{icon_state = "carpet8-0"},/area/crew_quarters/sleep{name = "Dorm Two"})
 "avO" = (/turf/simulated/floor{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters/sleep)
 "avP" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep)
-"avQ" = (/obj/machinery/requests_console{department = "Crew Quarters"; pixel_y = 30},/obj/machinery/camera/xray{c_tag = "Dormitories"},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep)
 "avR" = (/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep)
-"avS" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep)
-"avT" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/sleep)
-"avU" = (/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters/sleep)
 "avV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/fitness)
 "avW" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness)
 "avX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/crew_quarters/fitness)
@@ -1846,7 +1836,7 @@
 "aJz" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple{pipe_color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aJA" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aJB" = (/obj/structure/table/woodentable,/obj/item/weapon/nullrod,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/item/device/eftpos{eftpos_name = "Chapel EFTPOS scanner"},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
-"aJC" = (/obj/structure/closet/coffin,/obj/machinery/door/window/eastleft{dir = 8; name = "Coffin Storage"; req_access_txt = "22"},/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "chapel"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
+"aJC" = (/obj/structure/closet/coffin,/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "chapel"; name = "Privacy Shutters"; opacity = 0},/obj/machinery/door/window/eastleft{dir = 8; name = "Coffin Storage"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aJD" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
 "aJE" = (/obj/structure/table,/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
 "aJF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/chapel/main)
@@ -10446,14 +10436,14 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaafaaaaaaaafaoWaaaaaaaaaaafaaaaaaaaaampaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafapxaqcaqdapxapxaqeapEaqfapEapEapEapEapEapEapEapEapEapEapEaqgapEaqhapEaqiapEapEapEaleaqjaqkaqlaqmapOaqnapSaqoaqpaqqaqraqsaqtaquaqvaqwalNalNalNajhalOalOalOalOalOaaaaaaaaaaaaaaaaaaalPaafaojaojaojaojaojaafaoPaafaojaojaojaojaojaafalPaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalPaafaolaolaolaolaolaafaoWaafaolaolaolaolaolaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapxaqxaqyaqzaqAaqBaqCaqDaqEaqEaqEaqEaqEaqEaqEaqFaqGaqHaqGaqIaqJaqKaqLaqMaqNaqLaqOaleapiapiapiapiapiapiaqPaqQaqRaqSaqTaqUaqVajhalNaqWaqXalNaaaaaaaaaalOalOalOaaaaaaaaaaaaaaaaaaaaaalPaafaoMaoNaoNaoNaoNaoOaoPaoQaoRaoRaoRaoRaoSaafalPaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqYaqZaqYaaaaaaaaaaaaaaaaaaaaaalPaafaoTaoUaoUaoUaoUaoVaoWaoXaoYaoYaoYaoYaoZaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapxapaaraapxarbarbarcardarbarbarbarearearearfargarearearhariarjarkalNarlalNarmalNalNarnajhajhajhajhajharoaqQarparqarqarqarrarsartaruarvalNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalPaafapvapvapvapvapvaafaoPaafapvapvapvapvapvaafalPaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafarwarxarwaaaaaaaaaaaaaaaaaaaaaalPaafapwapwapwapwapwaafaoWaafapwapwapwapwapwaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaagapxaryapbapxarEatVatXatWatZatYarbarFarGarHarIarJarKarLarMapEarNarOarParQarRarRarRarRarRarSarRarRarRarTarUarVarWarXarYarZasaasbascasdasealNaafasfasgasgashasgasgasiaaaaaaaaaaaaaaaalQaaaaaaaaaaafaaaaaaaaaaoPaaaaaaaaaaafaaaaaaaaaalQaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasjaskaslaaaasmasnasoaaaaafaspaqYaspaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaafaaaaaaaaaaoWaaaaaaaaaaafaaaaaaaaaalQaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafapxapxapxapxapbapxarEarAatXatWassasrarbastarIarIarIarJasuasvaswasxasyalNaszasAasBasBasBasBasCasDasEasFasEasGasHasHasIasHasJasKasLasMasNasOasPasPasPasQasRasRasRasRasRasQasPaaaaaaaaaaaaalPaafaojaojaojaojaojaafaoPaafaojaojaojaojaojaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasSasTasUasTasSasVasWasVasSaafaspasXasYaaaaaaaaaaaaaaaaaaaaaalPaafaolaolaolaolaolaafaoWaafaolaolaolaolaolaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafapxasZataapxapbapxauParAatXatWauOauNarbatearIatfatfarJatgasvapAapEathalNatiatjatkatlatmatnatoatpatqatratsattatuatvatwatxatyatzatAatBatCatDatEatFasPatGasRasRasRasRasRasQasPaafaaaaaaaaaalQaafaoMaoNaoNaoNaoNaoOaoPaoQaoRaoRaoRaoRaoSaafalPaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHasTatIasTatHasVatJasVatHatKatLatMatNatOatOatPatKatKaafaaaalPaafaoTaoUaoUaoUaoUaoVaoWaoXaoYaoYaoYaoYaoZaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafapxatQatRatSatTatUbBqavDavCavBauQarzarbauaaubaucaucaudaueasvapAapEarNalNatiatjaufaugatmatnauhauiatqaujaukaulatuaumaunauoasPaupauqaurausautauuauvauwauxasRasRasRasRasRauyasPasPasPaaaaaaalQaaaapvapvapvapvapvaafaoPaafapvapvapvapvapvaaaampaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHauzauAauBatHauCauDauEatHaqYaqYauFauGauHauIauJauKatKaaaaaaampaaaapwapwapwapwapwaafaoWaafapwapwapwapwapwaaaalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaagapxauLapaapxauMapxarBarAarDarCasqarEarbauRauSauTauTauUauVauWauXauYauZavaavbavcaufatlatmatnavdauiatqatqaveatqatuatuavfatuasPavgavhaviaviavjavkavlavmavnasRasRasRasRasRavoavpavqavraaaaaaalQaaaaafaaaaafaafaaaaaaaoPaaaaaaaafaaaaaaaafaaaalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHavsavtavuatHavsavtavuatHavvavwavxavxavxavxavyavzarwaaaaaaalPaaaaafaaaaafaafaaaaaaavAaaaaaaaafaaaaaaaafaaaalPaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaagapxapxapxapxauMapxatcatbatbatbatbatdatbavEavFavFavFavFavGavHavIapEavJalNavKasAavLatlavMavNavdavOavPavQavRavRavSavTavRavUavVavWavXavYavYavYavYavZawaawbasRasRasRasRasRawbawcawdaweaaaaaaalQalQalPaaaaaaaafaaaaaaaoPaaaaafaafaafaafalPalPalPaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaasSatHawfawgasSatHawfawgasSatKawhatKatKatKatKatKawiaspaaaaaaalPalPalPaaaaaaaafaaaawjawkawjaafaafaafaafalPalPalPaafapxapxapxapxawlawmawmawmawmawmawmawmawnapxapxawoawpawqapxawrawsawtawuawvawwawwawwawwawwawxawwawyawzawAawAawBawBawCawDawEawFaqvawGawHawIawJawKatnavdawLawLawLawMawMawNawOawLawLawPawQawRavYavYavYavYawSawTawUasRasRasRasRasRawUawVawdaweaaaaaaaaaaaaaafaafaaaaafaaaaaaawWaaaaaaaafaaaaaaaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawXawYawYawYawZaxaawYawYaxbaxcaxdaxbaxbaxbaxeatKaxfaspaaaaafaafaaaaaaaaaaaaaafaaaaxgaxhaxiaafaaaaafaaaaaaaaaaaaaaaapxapaapaaxjapaapaapaapaapaapaapaapaaxkaxlaxmaxnaxnaxnaxnaxnaxnaxoaxpaxqaxraxraxraxraxsaxtaxraxuaxvaxsaxraxraxraxraxwaxxaxyaxzaxAavcatnatnatnatnauhaxBawLawOawMaxCawMaxDaxEaxFaxGaxHaxIavYavYavYavYawSaxJaxKasRasRasRasRasRaxLaxMaxNaxOaaaaaaaaaaaaaaaaafaaaaafaaaaxPaxQaxPaaaaafaaaaaaaafaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafarwarxarwaaaaaaaaaaaaaaaaaaaaaalPaafapwapwapwapwapwaafaoWaafapwapwapwapwapwaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaagapxaryapbapxarEatVatXatWatZatYarbarFarGarHarIarJarKarLarMapEarNarOarParQarRarRarRarRarRarSarRarRarRarRarUarVarWarXarYarZasaasbascasdasealNaafasfasgasgashasgasgasiaaaaaaaaaaaaaaaalQaaaaaaaaaaafaaaaaaaaaaoPaaaaaaaaaaafaaaaaaaaaalQaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasjaskaslaaaasmasnasoaaaaafaspaqYaspaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaafaaaaaaaaaaoWaaaaaaaaaaafaaaaaaaaaalQaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafapxapxapxapxapbapxarEarAatXatWassasrarbastarIarIarIarJasuasvaswasxasyalNaszasAasBasBasBasBasCasDasHasIasHasHasHasHasIasHasGasKasLasMasNasOasPasPasPasQasRasRasRasRasRasQasPaaaaaaaaaaaaalPaafaojaojaojaojaojaafaoPaafaojaojaojaojaojaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaajiajiajiajiajiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasSasTasUasTasSasVasWasVasSaafaspasXasYaaaaaaaaaaaaaaaaaaaaaalPaafaolaolaolaolaolaafaoWaafaolaolaolaolaolaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafapxasZataapxapbapxauParAatXatWauOauNarbatearIatfatfarJatgasvapAapEathalNatiatjatkatlatmatnatoatpasEatuatvatwatratsasJatqattatzatAatBatCatDatEatFasPatGasRasRasRasRasRasQasPaafaaaaaaaaaalQaafaoMaoNaoNaoNaoNaoOaoPaoQaoRaoRaoRaoRaoSaafalPaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHasTatIasTatHasVatJasVatHatKatLatMatNatOatOatPatKatKaafaaaalPaafaoTaoUaoUaoUaoUaoVaoWaoXaoYaoYaoYaoYaoZaafalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafapxatQatRatSatTatUbBqavDavCavBauQarzarbauaaubaucaucaudaueasvapAapEarNalNatiatjaufaugatmatnauhauiasEaukaujatsatsatsatxatyarTaupauqaurausautauuauvauwauxasRasRasRasRasRauyasPasPasPaaaaaaalQaaaapvapvapvapvapvaafaoPaafapvapvapvapvapvaaaampaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHauzauAauBatHauCauDauEatHaqYaqYauFauGauHauIauJauKatKaaaaaaampaaaapwapwapwapwapwaafaoWaafapwapwapwapwapwaaaalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaagapxauLapaapxauMapxarBarAarDarCasqarEarbauRauSauTauTauUauVauWauXauYauZavaavbavcaufatlatmatnavdauiasEasEasEasFasFasFasEasEarTavgavhaviaviavjavkavlavmavnasRasRasRasRasRavoavpavqavraaaaaaalQaaaaafaaaaafaafaaaaaaaoPaaaaaaaafaaaaaaaafaaaalPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHavsavtavuatHavsavtavuatHavvavwavxavxavxavxavyavzarwaaaaaaalPaaaaafaaaaafaafaaaaaaavAaaaaaaaafaaaaaaaafaaaalPaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaagapxapxapxapxauMapxatcatbatbatbatbatdatbavEavFavFavFavFavGavHavIapEavJalNavKasAavLatlavMavNavdavOavRavPavRavRavRavRavRauiavVavWavXavYavYavYavYavZawaawbasRasRasRasRasRawbawcawdaweaaaaaaalQalQalPaaaaaaaafaaaaaaaoPaaaaafaafaafaafalPalPalPaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaasSatHawfawgasSatHawfawgasSatKawhatKatKatKatKatKawiaspaaaaaaalPalPalPaaaaaaaafaaaawjawkawjaafaafaafaafalPalPalPaafapxapxapxapxawlawmawmawmawmawmawmawmawnapxapxawoawpawqapxawrawsawtawuawvawwawwawwawwawwawxawwawyawzawAawAawBawBawCawDawEawFaqvawGawHawIawJawKatnavdawLawLawLawMawMawNawOawLauiawPawQawRavYavYavYavYawSawTawUasRasRasRasRasRawUawVawdaweaaaaaaaaaaaaaafaafaaaaafaaaaaaawWaaaaaaaafaaaaaaaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawXawYawYawYawZaxaawYawYaxbaxcaxdaxbaxbaxbaxeatKaxfaspaaaaafaafaaaaaaaaaaaaaafaaaaxgaxhaxiaafaaaaafaaaaaaaaaaaaaaaapxapaapaaxjapaapaapaapaapaapaapaapaaxkaxlaxmaxnaxnaxnaxnaxnaxnaxoaxpaxqaxraxraxraxraxsaxtaxraxuaxvaxsaxraxraxraxraxwaxxaxyaxzaxAavcatnatnatnatnauhaxBawLawOawMaxCawMaxDaxEauiaxGaxHaxIavYavYavYavYawSaxJaxKasRasRasRasRasRaxLaxMaxNaxOaaaaaaaaaaaaaaaaafaaaaafaaaaxPaxQaxPaaaaafaaaaaaaafaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxRaxSaxTaxUaxVaxTaxTaxWaxUaxTaxXaxYaxZaxZayaatKaxfatLaafaafaaaaaaaaaaaaaaaaafaybaycaydayeayfaaaaafaaaaaaaaaaaaaaaapxapaapxaygayhayiayiayiayiayiayiayiayjaygaykaylaylaylaylaylaylaylaymaynaxrayoaypayqayraysaytayuayvaywayxaypayyaxrayzapEayAalNayBatjatkatlatmatnavdayCayDaxFaxFayEayFayGayHayIavVayJayKayLayMayMayNayOayPayQasRasRasRasRasRayRasPasPasPaaaaaaaaaaaaaafaafaafaafaaaaySayTaySaaaaafaaaaaaaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafatHayUayVayUayWaxTaxTayXayUayVayUayYaxSaxVayZatKaxfatKatKazaatOatOatOatOatPatKazbazcazdazeazbapxapxawoawpawqapxapxapxapaaryaygaaaaafaaaaafaaaaafaaaaafaaaaygaykaylazfazgazhaziazjaylaymapaaxrazkazkazlazmaznazoazpazqazrazsaztaztaxrayzapEazualNayBatjaufatlatmatnauhazvazwazxazyazzazAazBazBazCazBasPazDazEazFazGazHazIasPazJasRasRasRasRasRazKasPaafaaaaaaaaaaaaaaaaafaafaaaaafazLazMazNazOazPaafaaaaaaaafaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafazQasSazRavtazSazTazUazVazWazSavtazXazYasSazZaAaatKaAbaAcaAcaAcaAcaAcaAcavzaAdaAeazbaAfaAgaAhazbaAiapaapaapaapaapaapaapaapaaAjaygaafaAkaAkaAkaAkaAkaAkaAkaafaygaykaylaAlaAmaAnaAoaAlaylaymaApaxraxraxraxraAqaAraypaAsaAraAtaxraxraxraxrayzapEaAualNayBatjaufatlatmatnavdaAvazBazBazBazBazBazBaAwaAxaAyazBasPasPasPasPaAzasPasPazKasRasRasRasRasRazKasPaaaaaaaaaaaaaaeaaaaaaaaaaaaaafaAAaABaACaADaAAaafaaaaaaaafaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa