Recommits storage

code/modules/admin/admin.dm

@@ -1,7 +1,7 @@
 
 var/global/BSACooldown = 0
 var/global/floorIsLava = 0
-
+var/global/nologevent = 0
 
 ////////////////////////////////
 /proc/message_admins(var/msg)
@@ -13,12 +13,13 @@ var/global/floorIsLava = 0
 
 /proc/msg_admin_attack(var/text) //Toggleable Attack Messages
 	log_attack(text)
-	var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
-	for(var/client/C in admins)
-		if(R_ADMIN & C.holder.rights)
-			if(C.prefs.toggles & CHAT_ATTACKLOGS)
-				var/msg = rendered
-				C << msg
+	if(!nologevent)
+		var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK:</span> <span class=\"message\">[text]</span></span>"
+		for(var/client/C in admins)
+			if(R_ADMIN & C.holder.rights)
+				if(!istype(C, /mob/living))
+					var/msg = rendered
+					C << msg
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////Panels

code/modules/admin/admin_verbs.dm

@@ -49,7 +49,7 @@ var/list/admin_verbs_admin = list(
 	/client/proc/admin_memo,			/*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
 	/client/proc/dsay,					/*talk in deadchat using our ckey/fakekey*/
 	/client/proc/toggleprayers,			/*toggles prayers on/off*/
-	/client/proc/toggle_hear_radio,		/*toggles whether we hear the radio*/
+//	/client/proc/toggle_hear_radio,		/*toggles whether we hear the radio*/
 	/client/proc/investigate_show,		/*various admintools for investigation. Such as a singulo grief-log*/
 	/client/proc/secrets,
 	/datum/admins/proc/toggleooc,		/*toggles ooc on/off for everyone*/
@@ -161,7 +161,7 @@ var/list/admin_verbs_hideable = list(
 	/client/proc/deadmin_self,
 //	/client/proc/deadchat,
 	/client/proc/toggleprayers,
-	/client/proc/toggle_hear_radio,
+//	/client/proc/toggle_hear_radio,
 	/datum/admins/proc/show_traitor_panel,
 	/datum/admins/proc/toggleenter,
 	/datum/admins/proc/toggleguests,
@@ -450,7 +450,7 @@ var/list/admin_verbs_mentor = list(
 	var/new_ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color|null
 	if(new_ooccolor)
 		prefs.ooccolor = new_ooccolor
-		prefs.save_preferences()
+		prefs.save_preferences(src)
 	feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
 
@@ -551,8 +551,8 @@ var/list/admin_verbs_mentor = list(
 
 /client/proc/give_disease(mob/T as mob in mob_list) // -- Giacom
 	set category = "Fun"
-	set name = "Give Disease"
-	set desc = "Gives a Disease to a mob."
+	set name = "Give Disease (old)"
+	set desc = "Gives a (tg-style) Disease to a mob."
 	var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in diseases
 	if(!D) return
 	T.contract_disease(new D, 1)
@@ -560,6 +560,34 @@ var/list/admin_verbs_mentor = list(
 	log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")
 	message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1)
 
+/client/proc/give_disease2(mob/T as mob in mob_list) // -- Giacom
+	set category = "Fun"
+	set name = "Give Disease"
+	set desc = "Gives a Disease to a mob."
+
+	var/datum/disease2/disease/D = new /datum/disease2/disease()
+
+	var/greater = ((input("Is this a lesser or greater disease?", "Give Disease") in list("Lesser", "Greater")) == "Greater")
+
+	D.makerandom(greater)
+	if (!greater)
+		D.infectionchance = 1
+
+	D.infectionchance = input("How virulent is this disease? (1-100)", "Give Disease", D.infectionchance) as num
+
+	if(istype(T,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = T
+		if (H.species)
+			D.affected_species = list(H.species.name)
+	if(istype(T,/mob/living/carbon/monkey))
+		var/mob/living/carbon/monkey/M = T
+		D.affected_species = list(M.greaterform)
+	infect_virus2(T,D,1)
+
+	feedback_add_details("admin_verb","GD2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	log_admin("[key_name(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].")
+	message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].", 1)
+
 /client/proc/make_sound(var/obj/O in world) // -- TLE
 	set category = "Special Verbs"
 	set name = "Make Sound"

code/modules/admin/player_panel.dm

@@ -452,6 +452,22 @@
 					dat += "<tr><td><i>Head not found!</i></td></tr>"
 			dat += "</table>"
 
+		if(ticker.mode.name == "nations")
+			dat += "</table><br><table><tr><td><B>Flags(s)</B></td></tr>"
+			for(var/obj/item/flag/nation/N in world)
+				dat += "<tr><td>[N.name], "
+				var/atom/flag_loc = N.loc
+				while(!istype(flag_loc, /turf))
+					if(istype(flag_loc, /mob))
+						var/mob/M = flag_loc
+						dat += "carried by <a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> "
+					if(istype(flag_loc, /obj))
+						var/obj/O = flag_loc
+						dat += "in \a [O.name] "
+					flag_loc = flag_loc.loc
+				dat += "in [flag_loc.loc] at ([flag_loc.x], [flag_loc.y], [flag_loc.z])</td></tr>"
+			dat += "</table>"
+
 		if(ticker.mode.changelings.len)
 			dat += check_role_table("Changelings", ticker.mode.changelings, src)
 

code/modules/admin/verbs/onlyone.dm

@@ -49,6 +49,7 @@
 		H.equip_to_slot_or_del(W, slot_wear_id)
 		H.regenerate_icons()
 
-	message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1)
+	message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
+	nologevent = 1
 	log_admin("[key_name(usr)] used there can be only one.")
 	world << sound('sound/music/highlander.ogg')

code/modules/admin/verbs/onlyoneteam.dm

@@ -55,7 +55,8 @@
 			W.registered_name = H.real_name
 			H.equip_to_slot_or_del(W, slot_wear_id)
 			H.regenerate_icons()
-	message_admins("\blue [key_name_admin(usr)] used DODGEBAWWWWWWWL!", 1)
+	message_admins("\blue [key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
+	nologevent = 1
 	log_admin("[key_name(usr)] used dodgeball.")
 	world << sound('sound/music/nowyouman.ogg')
 

code/modules/assembly/igniter.dm

@@ -4,6 +4,7 @@
 	icon_state = "igniter"
 	m_amt = 500
 	g_amt = 50
+	w_amt = 10
 	origin_tech = "magnets=1"
 
 	describe()
@@ -13,6 +14,16 @@
 		if(!..())	return 0//Cooldown check
 		var/turf/location = get_turf(loc)
 		if(location)	location.hotspot_expose(1000,1000)
+		if (istype(src.loc,/obj/item/device/assembly_holder))
+			if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
+				var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
+				if (tank)
+					tank.explode()
+
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
+
 		return 1
 
 

code/modules/client/client procs.dm

@@ -218,9 +218,10 @@
 
 	send_resources()
 
+/*
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
 		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
-
+*/
 
 	//////////////
 	//DISCONNECT//

code/modules/client/preferences.dm

@@ -30,9 +30,9 @@ var/const/MAX_SAVE_SLOTS = 10
 
 datum/preferences
 	//doohickeys for savefiles
-	var/path
+//	var/path
 	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used
-	var/savefile_version = 0
+//	var/savefile_version = 0
 
 	//non-preference stuff
 	var/warns = 0
@@ -41,7 +41,7 @@ datum/preferences
 	var/last_id
 
 	//game-preferences
-	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
+//	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
 	var/ooccolor = "#b82e00"
 	var/be_special = 0					//Special role selection
 	var/UI_style = "Midnight"
@@ -108,10 +108,10 @@ datum/preferences
 	var/list/organ_data = list()
 
 	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
-	var/accent = "en-us"
-	var/voice = "m1"
-	var/pitch = 50
-	var/talkspeed = 175
+//	var/accent = "en-us"
+//	var/voice = "m1"
+//	var/pitch = 50
+//	var/talkspeed = 175
 	var/flavor_text = ""
 	var/med_record = ""
 	var/sec_record = ""
@@ -136,9 +136,9 @@ datum/preferences
 	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
 	if(istype(C))
 		if(!IsGuestKey(C.key))
-			load_path(C.ckey)
-			if(load_preferences())
-				if(load_character())
+//			load_path(C.ckey)
+			if(load_preferences(C))
+				if(load_character(C))
 					return
 	gender = pick(MALE, FEMALE)
 	real_name = random_name(gender)
@@ -153,21 +153,17 @@ datum/preferences
 
 		dat += "<a href='?_src_=prefs;preference=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Character Settings</a>"
 		dat += "<a href='?_src_=prefs;preference=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>Game Preferences</a>"
-		if(!path)
-			dat += "Please create an account to save your preferences."
-
 		dat += "</center>"
 		dat += "<HR>"
 
 		switch(current_tab)
 			if (0) // Character Settings#
-				if(path)
-					dat += "<center>"
-					dat += "Slot <b>[slot_name]</b> - "
-					dat += "<a href=\"byond://?src=\ref[user];preference=open_load_dialog\">Load slot</a> - "
-					dat += "<a href=\"byond://?src=\ref[user];preference=save\">Save slot</a> - "
-					dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
-					dat += "</center>"
+				dat += "<center>"
+				dat += "Slot <b>[slot_name]</b> - "
+				dat += "<a href=\"byond://?src=\ref[user];preference=open_load_dialog\">Load slot</a> - "
+				dat += "<a href=\"byond://?src=\ref[user];preference=save\">Save slot</a> - "
+				dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
+				dat += "</center>"
 				dat += "<center><h2>Occupation Choices</h2>"
 				dat += "<a href='?_src_=prefs;preference=job;task=menu'>Set Occupation Preferences</a><br></center>"
 				dat += "<h2>Identity</h2>"
@@ -186,17 +182,15 @@ datum/preferences
 				dat += "<br>"
 				dat += "Species: <a href='?_src_=prefs;preference=species;task=input'>[species]</a><br>"
 				dat += "Secondary Language:<br><a href='?_src_=prefs;preference=language;task=input'>[language]</a><br>"
-/*				dat += "Accent: <a href='?_src_=prefs;preference=accent;task=input'>[accent]</a><br>"
-				dat += "Voice: <a href='?_src_=prefs;preference=voice;task=input'>[voice]</a><br>"
-				dat += "Pitch: <a href='?_src_=prefs;preference=pitch;task=input'>[pitch]</a><br>"
-				dat += "Talking Speed: <a href='?_src_=prefs;preference=talkspeed;task=input'>[talkspeed]</a><br>"*/
 				dat += "Blood Type: <a href='?_src_=prefs;preference=b_type;task=input'>[b_type]</a><br>"
-				dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
+				if(species == "Human")
+					dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
 		//		dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
 				dat += "<br><b>Handicaps</b><br>"
 				dat += "\t<a href='?_src_=prefs;preference=disabilities'><b>\[Set Disabilities\]</b></a><br>"
 				dat += "Limbs: <a href='?_src_=prefs;preference=limbs;task=input'>Adjust</a><br>"
-				dat += "Internal Organs: <a href='?_src_=prefs;preference=organs;task=input'>Adjust</a><br>"
+				if(species != "Slime People" && species != "Machine")
+					dat += "Internal Organs: <a href='?_src_=prefs;preference=organs;task=input'>Adjust</a><br>"
 
 				//display limbs below
 				var/ind = 0
@@ -302,8 +296,9 @@ datum/preferences
 				dat += "<br><b>Eyes</b><br>"
 				dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]'><tr><td>__</td></tr></table></font><br>"
 
-				dat += "<br><b>Body Color</b><br>"
-				dat += "<a href='?_src_=prefs;preference=skin;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin)]'><tr><td>__</td></tr></table></font>"
+				if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
+					dat += "<br><b>Body Color</b><br>"
+					dat += "<a href='?_src_=prefs;preference=skin;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin)]'><tr><td>__</td></tr></table></font>"
 
 				dat += "</td></tr></table><hr><center>"
 
@@ -316,7 +311,6 @@ datum/preferences
 				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>[(sound & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(sound & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
-				dat += "<b>Hear player voices:</b> <a href='?_src_=prefs;preference=player_voices'><b>[(sound & SOUND_VOICES) ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Randomized Character Slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "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>"
 				dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
@@ -358,7 +352,7 @@ datum/preferences
 		popup.set_content(dat)
 		popup.open(0)
 
-	proc/SetChoices(mob/user, limit = 14, list/splitJobs = list("Chief Engineer","Head of Security"), width = 610, height = 650)
+	proc/SetChoices(mob/user, limit = 14, list/splitJobs = list("Chief Engineer","Research Director"), width = 610, height = 650)
 		if(!job_master)
 			return
 
@@ -1124,23 +1118,6 @@ datum/preferences
 							undershirt = undershirt_options.Find(new_undershirt)
 						ShowChoices(user)
 
-					if("accent")
-						var/new_accent = input(user, "Choose your accent. en-us:American, en:British, en-sc:Scottish, mb-de4-en:German, mb-fr1-en:French", "Character Preference") as null|anything in list("en-us", "en", "en-sc","mb-de4-en","mb-fr1-en")
-						if(new_accent)
-							accent = new_accent
-					if("voice")
-						var/new_voice = input(user, "Choose your voice. f:Female, m:Male", "Character Preference") as null|anything in list("f1","m1","f2","m2","f3","m3","f4","m4","f5","m5","m6","m7")
-						if(new_voice)
-							voice = new_voice
-					if("pitch")
-						var/new_pitch = input(user, "Choose your character's voice pitch:\n(0-99) Default is 50.", "Character Preference") as num|null
-						if(new_pitch)
-							pitch = max(min( round(text2num(new_pitch)), 99),0)
-					if("talkspeed")
-						var/new_talkspeed = input(user, "Choose your character's voice talk speed:\n(140-240) Default is 175.", "Character Preference") as num|null
-						if(new_talkspeed)
-							talkspeed = max(min( round(text2num(new_talkspeed)), 240),140)
-
 					if("eyes")
 						var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference") as color|null
 						if(new_eyes)
@@ -1329,16 +1306,16 @@ datum/preferences
 					if("ghost_radio")
 						toggles ^= CHAT_GHOSTRADIO
 
-					if("player_voices")
-						sound ^= SOUND_VOICES
+					if("ghost_radio")
+						toggles ^= CHAT_GHOSTRADIO
 
 					if("save")
-						save_preferences()
-						save_character()
+						save_preferences(user)
+						save_character(user)
 
 					if("reload")
-						load_preferences()
-						load_character()
+						load_preferences(user)
+						load_character(user)
 
 					if("open_load_dialog")
 						if(!IsGuestKey(user.key))
@@ -1348,7 +1325,7 @@ datum/preferences
 						close_load_dialog(user)
 
 					if("changeslot")
-						load_character(text2num(href_list["num"]))
+						load_character(user,text2num(href_list["num"]))
 						close_load_dialog(user)
 
 					if("tab")
@@ -1438,6 +1415,17 @@ datum/preferences
 		if(disabilities & DISABILITY_FLAG_DEAF)
 			character.sdisabilities|=DEAF
 
+		// Wheelchair necessary?
+		var/datum/organ/external/l_foot = character.get_organ("l_foot")
+		var/datum/organ/external/r_foot = character.get_organ("r_foot")
+		if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
+			var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair (character.loc)
+			character.buckled = W
+			character.update_canmove()
+			W.dir = character.dir
+			W.buckled_mob = character
+			W.add_fingerprint(character)
+
 		if(underwear > underwear_m.len || underwear < 1)
 			underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES
 		character.underwear = underwear
@@ -1457,25 +1445,35 @@ datum/preferences
 				character.gender = MALE
 
 	proc/open_load_dialog(mob/user)
+
+		var/DBQuery/query = dbcon.NewQuery("SELECT slot,real_name FROM characters WHERE ckey='[user.ckey]' ORDER BY slot")
+
 		var/dat = "<body>"
 		dat += "<tt><center>"
+		dat += "<b>Select a character slot to load</b><hr>"
+		var/name
 
-		var/savefile/S = new /savefile(path)
-		if(S)
-			dat += "<b>Select a character slot to load</b><hr>"
-			var/name
-			for(var/i=1, i<=MAX_SAVE_SLOTS, i++)
-				S.cd = "/character[i]"
-				S["real_name"] >> name
-				if(!name)	name = "Character[i]"
-				if(i==default_slot)
-					name = "<b>[name]</b>"
-				dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
+		for(var/i=1, i<=MAX_SAVE_SLOTS, i++)
+			if(!query.Execute())
+				var/err = query.ErrorMsg()
+				log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+				message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+				return
+			while(query.NextRow())
+				if(i==text2num(query.item[1]))
+					name =  query.item[2]
+			if(!name)	name = "Character[i]"
+			if(i==default_slot)
+				name = "<b>[name]</b>"
+			dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
+			name = null
 
 		dat += "<hr>"
 		dat += "<a href='byond://?src=\ref[user];preference=close_load_dialog'>Close</a><br>"
 		dat += "</center></tt>"
-		user << browse(dat, "window=saves;size=300x390")
-
+//		user << browse(dat, "window=saves;size=300x390")
+		var/datum/browser/popup = new(user, "saves", "<div align='center'>Character Saves</div>", 300, 390)
+		popup.set_content(dat)
+		popup.open(0)
 	proc/close_load_dialog(mob/user)
 		user << browse(null, "window=saves")

code/modules/client/preferences_mysql.dm

@@ -0,0 +1,215 @@
+/datum/preferences/proc/load_preferences(client/C)
+
+	var/DBQuery/query = dbcon.NewQuery("SELECT ooccolor,UI_style,UI_style_color,UI_style_alpha,be_special,default_slot,toggles,sound,randomslot,volume FROM erro_player WHERE ckey='[C.ckey]'")
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during loading player preferences. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during loading player preferences. Error : \[[err]\]\n")
+		return
+
+
+	//general preferences
+	while(query.NextRow())
+		ooccolor = query.item[1]
+		UI_style = query.item[2]
+		UI_style_color = query.item[3]
+		UI_style_alpha = text2num(query.item[4])
+		be_special = text2num(query.item[5])
+		default_slot = text2num(query.item[6])
+		toggles = text2num(query.item[7])
+		sound = text2num(query.item[8])
+		randomslot = text2num(query.item[9])
+		volume = text2num(query.item[10])
+
+	//Sanitize
+	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
+//	lastchangelog	= sanitize_text(lastchangelog, initial(lastchangelog))
+	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight"), 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))
+	sound			= sanitize_integer(sound, 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))
+	randomslot		= sanitize_integer(randomslot, 0, 1, initial(randomslot))
+	volume			= sanitize_integer(volume, 0, 100, initial(volume))
+	return 1
+
+/datum/preferences/proc/save_preferences(client/C)
+
+	var/DBQuery/query = dbcon.NewQuery("UPDATE erro_player SET ooccolor='[ooccolor]',UI_style='[UI_style]',UI_style_color='[UI_style_color]',UI_style_alpha='[UI_style_alpha]',be_special='[be_special]',default_slot='[default_slot]',toggles='[toggles]',sound='[sound]',randomslot='[randomslot]',volume='[volume]' WHERE ckey='[C.ckey]'")
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during saving player preferences. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during saving player preferences. Error : \[[err]\]\n")
+		return
+	return 1
+
+/datum/preferences/proc/load_character(client/C,slot)
+
+	if(!slot)	slot = default_slot
+	slot = sanitize_integer(slot, 1, MAX_SAVE_SLOTS, initial(default_slot))
+	if(slot != default_slot)
+		default_slot = slot
+		var/DBQuery/firstquery = dbcon.NewQuery("UPDATE erro_player SET default_slot=[slot] WHERE ckey='[C.ckey]'")
+		firstquery.Execute()
+
+	var/DBQuery/query = dbcon.NewQuery("SELECT * FROM characters WHERE ckey='[C.ckey]' AND slot='[slot]'")
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+		return
+
+	while(query.NextRow())
+		//Character
+		metadata = query.item[4]
+		real_name = query.item[5]
+		be_random_name = text2num(query.item[6])
+		gender = query.item[7]
+		age = text2num(query.item[8])
+		species = query.item[9]
+		language = query.item[10]
+
+		//colors to be consolidated into hex strings (requires some work with dna code)
+		r_hair = text2num(query.item[11])
+		g_hair = text2num(query.item[12])
+		b_hair = text2num(query.item[13])
+		r_facial = text2num(query.item[14])
+		g_facial = text2num(query.item[15])
+		b_facial = text2num(query.item[16])
+		s_tone = text2num(query.item[17])
+		r_skin = text2num(query.item[18])
+		g_skin = text2num(query.item[19])
+		b_skin = text2num(query.item[20])
+		h_style = query.item[21]
+		f_style = query.item[22]
+		r_eyes = text2num(query.item[23])
+		g_eyes = text2num(query.item[24])
+		b_eyes = text2num(query.item[25])
+		underwear = text2num(query.item[26])
+		undershirt = text2num(query.item[27])
+		backbag = text2num(query.item[28])
+		b_type = query.item[29]
+
+
+		//Jobs
+		alternate_option = text2num(query.item[30])
+		job_civilian_high = text2num(query.item[31])
+		job_civilian_med = text2num(query.item[32])
+		job_civilian_low = text2num(query.item[33])
+		job_medsci_high = text2num(query.item[34])
+		job_medsci_med = text2num(query.item[35])
+		job_medsci_low = text2num(query.item[36])
+		job_engsec_high = text2num(query.item[37])
+		job_engsec_med = text2num(query.item[38])
+		job_engsec_low = text2num(query.item[39])
+		job_karma_high = text2num(query.item[40])
+		job_karma_med = text2num(query.item[41])
+		job_karma_low = text2num(query.item[42])
+
+		//Miscellaneous
+		flavor_text = query.item[43]
+		med_record = query.item[44]
+		sec_record = query.item[45]
+		gen_record = query.item[46]
+		be_special = text2num(query.item[47])
+		disabilities = text2num(query.item[48])
+		player_alt_titles = params2list(query.item[49])
+		organ_data = params2list(query.item[50])
+
+		nanotrasen_relation = query.item[51]
+
+	//Sanitize
+	metadata		= sanitize_text(metadata, initial(metadata))
+	real_name		= reject_bad_name(real_name)
+	if(isnull(species)) species = "Human"
+	if(isnull(language)) language = "None"
+	if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
+	if(!real_name) real_name = random_name(gender,species)
+	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
+	gender			= sanitize_gender(gender)
+	age				= sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
+	r_hair			= sanitize_integer(r_hair, 0, 255, initial(r_hair))
+	g_hair			= sanitize_integer(g_hair, 0, 255, initial(g_hair))
+	b_hair			= sanitize_integer(b_hair, 0, 255, initial(b_hair))
+	r_facial		= sanitize_integer(r_facial, 0, 255, initial(r_facial))
+	g_facial		= sanitize_integer(g_facial, 0, 255, initial(g_facial))
+	b_facial		= sanitize_integer(b_facial, 0, 255, initial(b_facial))
+	s_tone			= sanitize_integer(s_tone, -185, 34, initial(s_tone))
+	r_skin			= sanitize_integer(r_skin, 0, 255, initial(r_skin))
+	g_skin			= sanitize_integer(g_skin, 0, 255, initial(g_skin))
+	b_skin			= sanitize_integer(b_skin, 0, 255, initial(b_skin))
+	h_style			= sanitize_inlist(h_style, hair_styles_list, initial(h_style))
+	f_style			= sanitize_inlist(f_style, facial_hair_styles_list, initial(f_style))
+	r_eyes			= sanitize_integer(r_eyes, 0, 255, initial(r_eyes))
+	g_eyes			= sanitize_integer(g_eyes, 0, 255, initial(g_eyes))
+	b_eyes			= sanitize_integer(b_eyes, 0, 255, initial(b_eyes))
+	underwear		= sanitize_integer(underwear, 1, underwear_m.len, initial(underwear))
+	undershirt		= sanitize_integer(undershirt, 1, undershirt_t.len, initial(undershirt))
+	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
+	b_type			= sanitize_text(b_type, initial(b_type))
+
+	alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))
+	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
+	job_civilian_med = sanitize_integer(job_civilian_med, 0, 65535, initial(job_civilian_med))
+	job_civilian_low = sanitize_integer(job_civilian_low, 0, 65535, initial(job_civilian_low))
+	job_medsci_high = sanitize_integer(job_medsci_high, 0, 65535, initial(job_medsci_high))
+	job_medsci_med = sanitize_integer(job_medsci_med, 0, 65535, initial(job_medsci_med))
+	job_medsci_low = sanitize_integer(job_medsci_low, 0, 65535, initial(job_medsci_low))
+	job_engsec_high = sanitize_integer(job_engsec_high, 0, 65535, initial(job_engsec_high))
+	job_engsec_med = sanitize_integer(job_engsec_med, 0, 65535, initial(job_engsec_med))
+	job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))
+	job_karma_high = sanitize_integer(job_karma_high, 0, 65535, initial(job_karma_high))
+	job_karma_med = sanitize_integer(job_karma_med, 0, 65535, initial(job_karma_med))
+	job_karma_low = sanitize_integer(job_karma_low, 0, 65535, initial(job_karma_low))
+	disabilities = sanitize_integer(disabilities, 0, 65535, initial(disabilities))
+	be_special = sanitize_integer(be_special, 0, 65535, initial(be_special))
+
+//	if(isnull(disabilities)) disabilities = 0
+	if(!player_alt_titles) player_alt_titles = new()
+	if(!organ_data) src.organ_data = list()
+
+	return 1
+
+/datum/preferences/proc/save_character(client/C)
+	var/organlist
+	var/playertitlelist
+	if(!isemptylist(organ_data))
+		organlist = list2params(organ_data)
+	if(!isemptylist(player_alt_titles))
+		playertitlelist = list2params(player_alt_titles)
+
+	var/DBQuery/firstquery = dbcon.NewQuery("SELECT slot FROM characters WHERE ckey='[C.ckey]' ORDER BY slot")
+	firstquery.Execute()
+	while(firstquery.NextRow())
+		if(text2num(firstquery.item[1]) == default_slot)
+			var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sanitizeSQL(metadata)]',real_name='[sanitizeSQL(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sanitizeSQL(species)]',language='[sanitizeSQL(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sanitizeSQL(h_style)]',facial_style_name='[sanitizeSQL(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_civilian_high='[job_civilian_high]',job_civilian_med='[job_civilian_med]',job_civilian_low='[job_civilian_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sanitizeSQL(flavor_text)]',med_record='[sanitizeSQL(med_record)]',sec_record='[sanitizeSQL(sec_record)]',gen_record='[sanitizeSQL(gen_record)]',player_alt_titles='[sanitizeSQL(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
+			if(!query.Execute())
+				var/err = query.ErrorMsg()
+				log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
+				message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
+				return
+			return 1
+	var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_civilian_high,job_civilian_med,job_civilian_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,nanotrasen_relation) VALUES ('[C.ckey]','[default_slot]','[sanitizeSQL(metadata)]','[sanitizeSQL(real_name)]','[be_random_name]','[gender]','[age]','[sanitizeSQL(species)]','[sanitizeSQL(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sanitizeSQL(h_style)]','[sanitizeSQL(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_civilian_high]','[job_civilian_med]','[job_civilian_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sanitizeSQL(flavor_text)]','[sanitizeSQL(med_record)]','[sanitizeSQL(sec_record)]','[sanitizeSQL(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[nanotrasen_relation]')")
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
+		return
+	return 1
+
+/datum/preferences/proc/random_character(client/C)
+	var/DBQuery/query = dbcon.NewQuery("SELECT slot FROM characters WHERE ckey='[C.ckey]' ORDER BY slot")
+
+	while(query.NextRow())
+	var/list/saves = list()
+	for(var/i=1, i<=MAX_SAVE_SLOTS, i++)
+		if(i==text2num(query.item[1]))
+			saves += i
+
+	if(!saves.len)
+		load_character(C)
+		return 0
+	load_character(C,pick(saves))
+	return 1

code/modules/client/preferences_savefile.dm

@@ -31,6 +31,7 @@
 	path = "data/player_saves/[copytext(ckey,1,2)]/[ckey]/[filename]"
 	savefile_version = SAVEFILE_VERSION_MAX
 
+/*
 /datum/preferences/proc/load_preferences()
 	if(!path)				return 0
 	if(!fexists(path))		return 0
@@ -95,6 +96,7 @@
 	S["volume"]				<< volume
 	return 1
 
+
 //saving volume changes
 /datum/preferences/proc/save_volume()
 	if(!path)				return 0
@@ -104,6 +106,7 @@
 
 	S["volume"]				<< volume
 	return 1
+*/
 
 /datum/preferences/proc/load_save(dir)
 	var/savefile/S = new /savefile(path)
@@ -244,7 +247,7 @@
 	S.cd = pick(saves)
 	load_save(S.cd)
 	return 1
-
+/*
 /datum/preferences/proc/load_character(slot)
 	if(!path)				return 0
 	if(!fexists(path))		return 0
@@ -258,7 +261,7 @@
 		S["default_slot"] << slot
 	S.cd = "/character[slot]"
 	load_save(S.cd)
-/* Now loaded by proc load_save(S.cd)
+ Now loaded by proc load_save(S.cd)
 	//Character
 	S["OOC_Notes"]			>> metadata
 	S["real_name"]			>> real_name
@@ -360,7 +363,7 @@
 	if(!player_alt_titles) player_alt_titles = new()
 	if(!organ_data) src.organ_data = list()
 	//if(!skin_style) skin_style = "Default"
-*/
+
 	return 1
 
 /datum/preferences/proc/save_character()
@@ -430,7 +433,7 @@
 	//S["skin_style"]			<< skin_style
 
 	return 1
-
+*/
 
 #undef SAVEFILE_VERSION_MAX
 #undef SAVEFILE_VERSION_MIN

code/modules/client/preferences_toggles.dm

@@ -5,7 +5,7 @@
 	set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs"
 	prefs.toggles ^= CHAT_GHOSTEARS
 	src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"]."
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/verb/toggle_ghost_sight()
@@ -14,7 +14,7 @@
 	set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs"
 	prefs.toggles ^= CHAT_GHOSTSIGHT
 	src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"]."
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/verb/toggle_ghost_radio()
@@ -23,16 +23,15 @@
 	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
 	prefs.toggles ^= CHAT_GHOSTRADIO
 	src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]."
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	feedback_add_details("admin_verb","TGR")
 
-/client/proc/toggle_hear_radio()
+/client/verb/toggle_hear_radio()
 	set name = "Show/Hide RadioChatter"
 	set category = "Preferences"
 	set desc = "Toggle seeing radiochatter from radios and speakers"
-	if(!holder) return
 	prefs.toggles ^= CHAT_RADIO
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers"
 	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -42,7 +41,7 @@
 	set desc = "Toggle hearing a notification when admin PMs are recieved"
 	if(!holder)	return
 	prefs.sound ^= SOUND_ADMINHELP
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	usr << "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive."
 	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -51,7 +50,7 @@
 	set category = "Preferences"
 	set desc ="Toggles seeing deadchat"
 	prefs.toggles ^= CHAT_DEAD
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 
 	if(src.holder)
 		src << "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat."
@@ -65,7 +64,7 @@
 	set category = "Preferences"
 	set desc = "Toggles seeing prayers"
 	prefs.toggles ^= CHAT_PRAYER
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	src << "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat."
 	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -74,7 +73,7 @@
 	set category = "Preferences"
 	set desc = "Toggles hearing the GameLobby music"
 	prefs.sound ^= SOUND_LOBBY
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	if(prefs.sound & SOUND_LOBBY)
 		src << "You will now hear music in the game lobby."
 		if(istype(mob, /mob/new_player))
@@ -85,6 +84,7 @@
 			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jamsz
 	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/*
 /client/verb/togglevoices()
 	set name = "Toggle player voices"
 	set category = "Preferences"
@@ -93,13 +93,14 @@
 	prefs.save_preferences()
 	src << "You will [(prefs.sound & SOUND_VOICES) ? "now" : "no longer"] hear voices of players around you, or your own voice."
 	feedback_add_details("admin_verb","TVoice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+*/
 
 /client/verb/togglemidis()
 	set name = "Hear/Silence Midis"
 	set category = "Preferences"
 	set desc = "Toggles hearing sounds uploaded by admins"
 	prefs.sound ^= SOUND_MIDI
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	if(prefs.sound & SOUND_MIDI)
 		src << "You will now hear any sounds uploaded by admins."
 	else
@@ -114,7 +115,7 @@
 	set category = "Preferences"
 	set desc = "Toggles seeing OutOfCharacter chat"
 	prefs.toggles ^= CHAT_OOC
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	src << "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel."
 	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -124,7 +125,7 @@
 	set category = "Preferences"
 	set desc = "Toggles seeing Local OutOfCharacter chat"
 	prefs.toggles ^= CHAT_LOOC
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	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!
 
@@ -134,7 +135,7 @@
 	set category = "Preferences"
 	set desc = "Toggles hearing ambient sound effects"
 	prefs.sound ^= SOUND_AMBIENCE
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	if(prefs.sound & SOUND_AMBIENCE)
 		src << "You will now hear ambient sounds."
 	else
@@ -151,7 +152,7 @@
 	var/role_flag = be_special_flags[role]
 	if(!role_flag)	return
 	prefs.be_special ^= role_flag
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	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!
 
@@ -187,7 +188,7 @@
 		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()
+		prefs.save_preferences(src)
 		usr << "UI was saved"
 
 /client/verb/toggle_media()
@@ -196,7 +197,7 @@
 	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
 
 	prefs.sound ^= SOUND_STREAMING
-	prefs.save_preferences()
+	prefs.save_preferences(src)
 	usr << "You will [(prefs.toggles & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media."
 	// Restart.
 	media.stop_music()

code/modules/clothing/clothing.dm

@@ -5,6 +5,10 @@
 //BS12: Species-restricted clothing check.
 /obj/item/clothing/mob_can_equip(M as mob, slot)
 
+	//if we can equip the item anyway, don't bother with species_restricted (aslo cuts down on spam)
+	if (!..())
+		return 0
+
 	if(species_restricted && istype(M,/mob/living/carbon/human))
 
 		var/wearable = null
@@ -26,7 +30,7 @@
 				M << "\red Your species cannot wear [src]."
 				return 0
 
-	return ..()
+	return 1
 
 //Ears: currently only used for headsets and earmuffs
 /obj/item/clothing/ears

code/modules/clothing/gloves/boxing.dm

@@ -3,18 +3,25 @@
 	desc = "Because you really needed another excuse to punch your crewmates."
 	icon_state = "boxing"
 	item_state = "boxing"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 
 /obj/item/clothing/gloves/boxing/green
 	icon_state = "boxinggreen"
 	item_state = "boxinggreen"
+	species_fit = list("Vox")
 
 /obj/item/clothing/gloves/boxing/blue
 	icon_state = "boxingblue"
 	item_state = "boxingblue"
+	species_fit = list("Vox")
 
 /obj/item/clothing/gloves/boxing/yellow
 	icon_state = "boxingyellow"
 	item_state = "boxingyellow"
+	species_fit = list("Vox")
 
 /obj/item/clothing/gloves/white
 	name = "white gloves"
@@ -22,6 +29,7 @@
 	icon_state = "latex"
 	item_state = "lgloves"
 	_color="mime"
+	species_fit = list("Vox")
 
 	redcoat
 		_color = "redcoat"		//Exists for washing machines. Is not different from white gloves in any way.

code/modules/clothing/gloves/color.dm

@@ -6,6 +6,10 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	_color="yellow"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 
 	power
 		var/next_shock = 0
@@ -17,7 +21,10 @@
 	item_state = "ygloves"
 	siemens_coefficient = 1			//Set to a default of 1, gets overridden in New()
 	permeability_coefficient = 0.05
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 	_color="yellow"
 
 	New()
@@ -29,7 +36,10 @@
 	icon_state = "black"
 	item_state = "bgloves"
 	_color="brown"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
 	heat_protection = HANDS
@@ -51,21 +61,30 @@
 	icon_state = "orange"
 	item_state = "orangegloves"
 	_color="orange"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/red
 	name = "red gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "red"
 	item_state = "redgloves"
 	_color = "red"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/rainbow
 	name = "rainbow gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "rainbow"
 	item_state = "rainbowgloves"
 	_color = "rainbow"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 	clown
 		_color = "clown"
 
@@ -75,28 +94,40 @@
 	icon_state = "blue"
 	item_state = "bluegloves"
 	_color="blue"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/purple
 	name = "purple gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "purple"
 	item_state = "purplegloves"
 	_color="purple"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/green
 	name = "green gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "green"
 	item_state = "greengloves"
 	_color="green"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/grey
 	name = "grey gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "gray"
 	item_state = "graygloves"
 	_color="grey"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 	rd
 		_color = "director"			//Exists for washing machines. Is not different from gray gloves in any way.
 
@@ -109,13 +140,19 @@
 	icon_state = "lightbrown"
 	item_state = "lightbrowngloves"
 	_color="light brown"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 /obj/item/clothing/gloves/brown
 	name = "brown gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "brown"
 	item_state = "browngloves"
 	_color="brown"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		)
 	cargo
 		_color = "cargo"				//Exists for washing machines. Is not different from brown gloves in any way.

code/modules/clothing/gloves/miscellaneous.dm

@@ -1,62 +1,91 @@
-/obj/item/clothing/gloves/captain
-	desc = "Regal blue gloves, with a nice gold trim. Swanky."
-	name = "captain's gloves"
-	icon_state = "captain"
-	item_state = "egloves"
-	_color = "captain"
-	cold_protection = HANDS
-	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
-	heat_protection = HANDS
-	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
-
-/obj/item/clothing/gloves/cyborg
-	desc = "beep boop borp"
-	name = "cyborg gloves"
-	icon_state = "black"
-	item_state = "r_hands"
-	siemens_coefficient = 1.0
-
-/obj/item/clothing/gloves/swat
-	desc = "These tactical gloves are somewhat fire and impact-resistant."
-	name = "\improper SWAT Gloves"
-	icon_state = "black"
-	item_state = "swat_gl"
-	siemens_coefficient = 0.6
-	permeability_coefficient = 0.05
-
-	cold_protection = HANDS
-	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
-	heat_protection = HANDS
-	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
-
-/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
-	desc = "These tactical gloves are somewhat fire and impact resistant."
-	name = "combat gloves"
-	icon_state = "black"
-	item_state = "swat_gl"
-	siemens_coefficient = 0
-	permeability_coefficient = 0.05
-	cold_protection = HANDS
-	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
-	heat_protection = HANDS
-	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
-
-/obj/item/clothing/gloves/latex
-	name = "latex gloves"
-	desc = "Sterile latex gloves."
-	icon_state = "latex"
-	item_state = "lgloves"
-	siemens_coefficient = 0.30
-	permeability_coefficient = 0.01
-	_color="white"
-
-	cmo
-		_color = "medical"		//Exists for washing machines. Is not different from latex gloves in any way.
-
-/obj/item/clothing/gloves/botanic_leather
-	desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
-	name = "botanist's leather gloves"
-	icon_state = "leather"
-	item_state = "ggloves"
-	permeability_coefficient = 0.9
-	siemens_coefficient = 0.9
+/obj/item/clothing/gloves/captain
+	desc = "Regal blue gloves, with a nice gold trim. Swanky."
+	name = "captain's gloves"
+	icon_state = "captain"
+	item_state = "egloves"
+	_color = "captain"
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+/obj/item/clothing/gloves/cyborg
+	desc = "beep boop borp"
+	name = "cyborg gloves"
+	icon_state = "black"
+	item_state = "r_hands"
+	siemens_coefficient = 1.0
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+/obj/item/clothing/gloves/swat
+	desc = "These tactical gloves are somewhat fire and impact-resistant."
+	name = "\improper SWAT Gloves"
+	icon_state = "black"
+	item_state = "swat_gl"
+	siemens_coefficient = 0.6
+	permeability_coefficient = 0.05
+
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
+	desc = "These tactical gloves are somewhat fire and impact resistant."
+	name = "combat gloves"
+	icon_state = "black"
+	item_state = "swat_gl"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+/obj/item/clothing/gloves/latex
+	name = "latex gloves"
+	desc = "Sterile latex gloves."
+	icon_state = "latex"
+	item_state = "lgloves"
+	siemens_coefficient = 0.30
+	permeability_coefficient = 0.01
+	_color="white"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+	cmo
+		_color = "medical"		//Exists for washing machines. Is not different from latex gloves in any way.
+
+/obj/item/clothing/gloves/botanic_leather
+	desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
+	name = "botanist's leather gloves"
+	icon_state = "leather"
+	item_state = "ggloves"
+	permeability_coefficient = 0.9
+	siemens_coefficient = 0.9
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
+/obj/item/clothing/gloves/batmangloves
+	desc = "Used for handling all things bat related."
+	name = "batgloves"
+	icon_state = "bmgloves"
+	item_state = "bmgloves"
+	_color="bmgloves"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)

code/modules/clothing/gloves/ninja.dm

@@ -19,7 +19,10 @@
 	var/candrain = 0
 	var/mindrain = 200
 	var/maxdrain = 400
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
 /*
 	This runs the gamut of what ninja gloves can do
 	The other option would be a dedicated ninja touch bullshit proc on everything

code/modules/clothing/masks/boxing.dm

@@ -6,7 +6,10 @@
 	flags = FPRINT|TABLEPASS|BLOCKHAIR
 	flags_inv = HIDEFACE
 	w_class = 2
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
 /obj/item/clothing/mask/luchador
 	name = "Luchador Mask"
 	desc = "Worn by robust fighters, flying high to defeat their foes!"

code/modules/clothing/masks/breath.dm

@@ -7,8 +7,14 @@
 	w_class = 2
 	gas_transfer_coefficient = 0.10
 	permeability_coefficient = 0.50
+	species_fit = list("Vox")
 	var/hanging = 0
 	species_fit = list("Vox", "Vox Armalis")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi',
+		"Vox Armalis" = 'icons/mob/species/armalis/mask.dmi',
+		)
+
 
 	verb/toggle()
 		set category = "Object"
@@ -20,14 +26,14 @@
 				src.hanging = !src.hanging
 				gas_transfer_coefficient = 1 //gas is now escaping to the turf and vice versa
 				flags &= ~(MASKCOVERSMOUTH | MASKINTERNALS)
-				icon_state = "breathdown"
+				icon_state = "[initial(icon_state)]down"
 				usr << "Your mask is now hanging on your neck."
 
 			else
 				src.hanging = !src.hanging
 				gas_transfer_coefficient = 0.10
 				flags |= MASKCOVERSMOUTH | MASKINTERNALS
-				icon_state = "breath"
+				icon_state = "[initial(icon_state)]"
 				usr << "You pull the mask up to cover your face."
 			usr.update_inv_wear_mask()
 
@@ -37,4 +43,12 @@
 	icon_state = "medical"
 	item_state = "medical"
 	permeability_coefficient = 0.01
-	species_fit = list("Vox")
+	species_fit = list("Vox")
+
+/obj/item/clothing/mask/breath/vox
+	desc = "A weirdly-shaped breath mask."
+	name = "vox breath mask"
+	icon_state = "voxmask"
+	item_state = "voxmask"
+	permeability_coefficient = 0.01
+	species_restricted = list("Vox")

code/modules/clothing/masks/gasmask.dm

@@ -9,7 +9,10 @@
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	siemens_coefficient = 0.9
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
 
 //Bane gas mask
 /obj/item/clothing/mask/banemask
@@ -32,18 +35,21 @@
 	icon_state = "plaguedoctor"
 	item_state = "gas_mask"
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/swat
 	name = "\improper SWAT mask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
 	icon_state = "swat"
 	siemens_coefficient = 0.7
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/syndicate
 	name = "syndicate mask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
 	icon_state = "swat"
 	siemens_coefficient = 0.7
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/voice
 	name = "gas mask"
@@ -52,6 +58,7 @@
 	var/voice = "Unknown"
 	var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N
 	origin_tech = "syndicate=4"
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/voice/space_ninja
 	name = "ninja mask"
@@ -61,6 +68,7 @@
 	vchange = 1
 	unacidable = 1
 	siemens_coefficient = 0.2
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/voice/space_ninja/scar
 	name = "ninja mask"
@@ -105,19 +113,19 @@
 		M << "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!"
 		return 1
 
-
 /obj/item/clothing/mask/gas/virusclown_hat
 	name = "clown wig and mask"
 	desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
 	icon_state = "clown"
 	item_state = "clown_hat"
-
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/sexyclown
 	name = "sexy-clown wig and mask"
 	desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
 	icon_state = "sexyclown"
 	item_state = "sexyclown"
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
@@ -131,23 +139,27 @@
 	desc = "A mask used when acting as a monkey."
 	icon_state = "monkeymask"
 	item_state = "monkeymask"
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/sexymime
 	name = "sexy mime mask"
 	desc = "A traditional female mime's mask."
 	icon_state = "sexymime"
 	item_state = "sexymime"
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/death_commando
 	name = "Death Commando Mask"
 	icon_state = "death_commando_mask"
 	item_state = "death_commando_mask"
 	siemens_coefficient = 0.2
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/cyborg
 	name = "cyborg visor"
 	desc = "Beep boop"
 	icon_state = "death"
+	species_fit = list("Vox")
 
 /obj/item/clothing/mask/gas/owl_mask
 	name = "owl mask"
@@ -167,7 +179,7 @@
 	icon_state = "officermask"
 	var/cooldown = 0
 	var/aggressiveness = 2
-
+	species_fit = list()
 /obj/item/clothing/mask/gas/sechailer/warden
 	icon_state = "wardenmask"
 

code/modules/clothing/masks/miscellaneous.dm

@@ -6,7 +6,10 @@
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
 /obj/item/clothing/mask/muzzle/gag
 	name = "gag"
 	desc = "Stick this in their mouth to stop the noise."
@@ -32,7 +35,10 @@
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/mask.dmi'
+		)
 /obj/item/clothing/mask/fakemoustache
 	name = "fake moustache"
 	desc = "Warning: moustache is fake."

code/modules/clothing/shoes/magboots.dm

@@ -4,9 +4,13 @@
 	icon_state = "magboots0"
 	var/magpulse = 0
 	species_restricted = null
-	icon_action_button = "action_blank"
 	action_button_name = "Toggle the magboots"
 //	flags = NOSLIP //disabled by default
+	icon_action_button = "action_magboots"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 	attack_self(mob/user)
 		if(magpulse)

code/modules/clothing/shoes/miscellaneous.dm

@@ -9,6 +9,10 @@
 	var/list/clothing_choices = list()
 	siemens_coefficient = 0.8
 	species_restricted = null
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 /obj/item/clothing/shoes/mime
 	name = "mime shoes"
@@ -70,6 +74,10 @@
 	flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN+1
 	species_restricted = null
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 /obj/item/clothing/shoes/clown_shoes
 	desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
@@ -125,10 +133,13 @@
 	name = "laceup shoes"
 	desc = "The height of fashion, and they're pre-polished!"
 	icon_state = "laceups"
-
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 /obj/item/clothing/shoes/roman
 	name = "roman sandals"
 	desc = "Sandals with buckled leather straps on it."
 	icon_state = "roman"
 	item_state = "roman"
-	species_restricted = null
+	species_restricted = null

code/modules/clothing/spacesuits/alien.dm

@@ -14,7 +14,6 @@
 	species_restricted = list("Tajaran")
 
 //Skrell space gear. Sleek like a wetsuit.
-
 /obj/item/clothing/head/helmet/space/skrell
 	name = "Skrellian helmet"
 	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
@@ -52,10 +51,8 @@
 	_color = "skrell_suit_black"
 
 
-
 // Vox space gear (vaccuum suit, low pressure armour)
 // Can't be equipped by any other species due to bone structure and vox cybernetics.
-
 /obj/item/clothing/suit/space/vox
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
@@ -63,12 +60,20 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
-	species_restricted = list("Vox")
+	species_restricted = list("Vox", "Vox Armalis")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi',
+		"Vox Armalis" = 'icons/mob/species/armalis/suit.dmi',
+		)
 
 /obj/item/clothing/head/helmet/space/vox
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE
-	species_restricted = list("Vox")
+	species_restricted = list("Vox","Vox Armalis")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/head.dmi',
+		"Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
+		)
 
 /obj/item/clothing/head/helmet/space/vox/pressure
 	name = "alien helmet"
@@ -143,19 +148,25 @@
 	item_state = "gloves-vox"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
-	_color="gloves-vox"
+	_color = "gloves-vox"
 	species_restricted = list("Vox","Vox Armalis")
-	species_fit = list("Vox Armalis")
-
-
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/gloves.dmi',
+		"Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi',
+		)
 /obj/item/clothing/shoes/magboots/vox
 
 	desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
 	name = "vox magclaws"
 	item_state = "boots-vox"
 	icon_state = "boots-vox"
+
 	species_restricted = list("Vox","Vox Armalis")
-	species_fit = list("Vox Armalis")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/feet.dmi',
+		"Vox Armalis" = 'icons/mob/species/armalis/feet.dmi',
+		)
+
 	action_button_name = "Toggle the magclaws"
 
 /obj/item/clothing/shoes/magboots/vox/attack_self(mob/user)
@@ -192,84 +203,11 @@
 	if (magpulse)
 		usr << "It would be hard to take these off without relaxing your grip first." //theoretically this message should only be seen by the wearer when the claws are equipped.
 
-
-//Vox Armalis gear.
-//Vox Armalis gear.
-/obj/item/clothing/shoes/magboots/vox/armalis
- 	name = "large vox magclaws"
- 	item_state = "boots-armalis"
- 	icon_state = "boots-armalis"
- 	icon_override = 'icons/mob/species/vox/armalis/shoes.dmi'
- 	species_restricted = list("Vox Armalis")
-
-/obj/item/clothing/gloves/yellow/vox/armalis
- 	name = "large insulated gauntlets"
- 	item_state = "gloves-armalis"
- 	icon_state = "gloves-armalis"
- 	icon_override = 'icons/mob/species/vox/armalis/hands.dmi'
- 	species_restricted = list("Vox Armalis")
-
-/obj/item/clothing/mask/breath/vox/armalis
- 	name = "large vox mask"
- 	item_state = "mask-armalis"
- 	icon_state = "mask-armalis"
- 	icon_override = 'icons/mob/species/vox/armalis/mask.dmi'
- 	species_restricted = list("Vox Armalis")
-
-/obj/item/clothing/suit/space/vox/carapace/armalis
-	name = "large alien carapace armour"
-	item_state = "armour-armalis"
-	icon_state = "armour-armalis"
-	icon_override = 'icons/mob/vox.dmi'
-	species_restricted = list("Vox Armalis")
-
-/obj/item/clothing/suit/space/vox/carapace/armalis
-	name = "large alien carapace armour"
-	item_state = "armour-armalis"
-	icon_state = "armour-armalis"
-	icon_override = 'icons/mob/vox.dmi'
-	species_restricted = list("Vox Armalis")
-
-//Species-specific Syndicate rigs.
-/obj/item/clothing/head/helmet/space/rig/syndi/tajara
-	icon_state = "rig0-syndie-taj"
-	item_state = "rig0-syndie-taj"
-	_color = "syndie-taj"
-	species_restricted = list("Tajaran")
-
-/obj/item/clothing/suit/space/rig/syndi/tajara
-	item_state = "rig-syndie-taj"
-	icon_state = "rig-syndie-taj"
-	species_restricted = list("Tajaran")
-
-/obj/item/clothing/head/helmet/space/rig/syndi/skrell
-	icon_state = "rig0-syndie-skrell"
-	item_state = "rig0-syndie-skrell"
-	_color = "syndie-skrell"
-	species_restricted = list("Skrell")
-
-/obj/item/clothing/suit/space/rig/syndi/skrell
-	item_state = "rig-syndie-skrell"
-	icon_state = "rig-syndie-skrell"
-	species_restricted = list("Skrell")
-
-/obj/item/clothing/head/helmet/space/rig/syndi/human
-	icon_state = "rig0-syndie-human"
-	item_state = "rig0-syndie-human"
-	_color = "syndie-human"
-	species_restricted = list("Human")
-
-/obj/item/clothing/suit/space/rig/syndi/human
-	item_state = "rig-syndie-human"
-	icon_state = "rig-syndie-human"
-	species_restricted = list("Human")
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
-
 ////////////////UNATHI/////////////////////
 
 /obj/item/clothing/suit/space/rig/unathi
 	icon_state = "rig-unathi-engineering"
-	item_state = "rig_unathi-engineering"
+	item_state = "rig-unathi-engineering"
 	species_restricted = list("Unathi")
 
 /obj/item/clothing/suit/space/rig/security/unathi
@@ -287,17 +225,7 @@
 	item_state = "rig0-unathi-sec"
 	species_restricted = list("Unathi")
 
-/obj/item/clothing/head/helmet/space/rig/syndi/unathi
-	icon_state = "rig0-syndie-unathi"
-	item_state = "rig0-syndie-unathi"
-	_color = "syndie-unathi"
-	species_restricted = list("Unathi")
-
-/obj/item/clothing/suit/space/rig/syndi/unathi
-	item_state = "rig-syndie-unathi"
-	icon_state = "rig-syndie-unathi"
-	species_restricted = list("Unathi")
-
+//Unathi space gear. Huge and restrictive.
 /obj/item/clothing/head/helmet/space/unathi
 	armor = list(melee = 40, bullet = 30, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 50)
 	heat_protection = HEAD

code/modules/clothing/spacesuits/breaches.dm

@@ -0,0 +1,221 @@
+//A 'wound' system for space suits.
+//Breaches greatly increase the amount of lost gas and decrease the armour rating of the suit.
+//They can be healed with plastic or metal sheeting.
+
+/datum/breach
+	var/class = 0                           // Size. Lower is smaller.
+	var/descriptor                          // 'gaping hole' etc.
+	var/damtype = BURN                      // Punctured or melted
+	var/obj/item/clothing/suit/space/holder // Suit containing the list of breaches holding this instance.
+
+/obj/item/clothing/suit/space
+
+	var/can_breach = 1                      // Set to 0 to disregard all breaching.
+	var/list/breaches = list()              // Breach datum container.
+	var/resilience = 0.2                    // Multiplier that turns damage into breach class. 1 is 100% of damage to breach, 0.1 is 10%.
+	var/breach_threshold = 3                // Min damage before a breach is possible.
+	var/damage = 0                          // Current total damage
+	var/brute_damage = 0                    // Specifically brute damage.
+	var/burn_damage = 0                     // Specifically burn damage.
+	var/base_name                           // Used to keep the original name safe while we apply modifiers.
+
+/obj/item/clothing/suit/space/New()
+	..()
+	base_name = "[name]"
+
+//Some simple descriptors for breaches. Global because lazy, TODO: work out a better way to do this.
+
+var/global/list/breach_brute_descriptors = list(
+	"tiny puncture",
+	"ragged tear",
+	"large split",
+	"huge tear",
+	"gaping wound"
+	)
+
+var/global/list/breach_burn_descriptors = list(
+	"small burn",
+	"melted patch",
+	"sizable burn",
+	"large scorched area",
+	"huge scorched area"
+	)
+
+/datum/breach/proc/update_descriptor()
+
+	//Sanity...
+	class = max(1,min(class,5))
+	//Apply the correct descriptor.
+	if(damtype == BURN)
+		descriptor = breach_burn_descriptors[class]
+	else if(damtype == BRUTE)
+		descriptor = breach_brute_descriptors[class]
+
+//Repair a certain amount of brute or burn damage to the suit.
+/obj/item/clothing/suit/space/proc/repair_breaches(var/damtype, var/amount, var/mob/user)
+
+	if(!can_breach || !breaches || !breaches.len || !damage)
+		user << "There are no breaches to repair on \the [src]."
+		return
+
+	var/list/valid_breaches = list()
+
+	for(var/datum/breach/B in breaches)
+		if(B.damtype == damtype)
+			valid_breaches += B
+
+	if(!valid_breaches.len)
+		user << "There are no breaches to repair on \the [src]."
+		return
+
+	var/amount_left = amount
+	for(var/datum/breach/B in valid_breaches)
+		if(!amount_left) break
+
+		if(B.class <= amount_left)
+			amount_left -= B.class
+			valid_breaches -= B
+			breaches -= B
+		else
+			B.class	-= amount_left
+			amount_left = 0
+			B.update_descriptor()
+
+	user.visible_message("<b>[user]</b> patches some of the damage on \the [src].")
+	calc_breach_damage()
+
+/obj/item/clothing/suit/space/proc/create_breaches(var/damtype, var/amount)
+
+	if(!can_breach || !amount)
+		return
+
+	if(!breaches)
+		breaches = list()
+
+	if(damage > 25) return //We don't need to keep tracking it when it's at 250% pressure loss, really.
+
+	if(!loc) return
+	var/turf/T = get_turf(src)
+	if(!T) return
+
+	amount = amount * src.resilience
+
+	//Increase existing breaches.
+	for(var/datum/breach/existing in breaches)
+
+		if(existing.damtype != damtype)
+			continue
+
+		if (existing.class < 5)
+			var/needs = 5 - existing.class
+			if(amount < needs)
+				existing.class += amount
+				amount = 0
+			else
+				existing.class = 5
+				amount -= needs
+
+			if(existing.damtype == BRUTE)
+				T.visible_message("<span class = 'warning'>\The [existing.descriptor] on [src] gapes wider!</span>")
+			else if(existing.damtype == BURN)
+				T.visible_message("<span class = 'warning'>\The [existing.descriptor] on [src] widens!</span>")
+
+	if (amount)
+		//Spawn a new breach.
+		var/datum/breach/B = new()
+		breaches += B
+
+		B.class = min(amount,5)
+
+		B.damtype = damtype
+		B.update_descriptor()
+		B.holder = src
+
+		if(B.damtype == BRUTE)
+			T.visible_message("<span class = 'warning'>\A [B.descriptor] opens up on [src]!</span>")
+		else if(B.damtype == BURN)
+			T.visible_message("<span class = 'warning'>\A [B.descriptor] marks the surface of [src]!</span>")
+
+	calc_breach_damage()
+
+//Calculates the current extent of the damage to the suit.
+/obj/item/clothing/suit/space/proc/calc_breach_damage()
+
+	damage = 0
+	brute_damage = 0
+	burn_damage = 0
+
+	if(!can_breach || !breaches || !breaches.len)
+		name = base_name
+		return 0
+
+	for(var/datum/breach/B in breaches)
+		if(!B.class)
+			src.breaches -= B
+			del(B)
+		else
+			damage += B.class
+			if(B.damtype == BRUTE)
+				brute_damage += B.class
+			else if(B.damtype == BURN)
+				burn_damage += B.class
+
+	if(damage >= 3)
+		if(brute_damage >= 3 && brute_damage > burn_damage)
+			name = "punctured [base_name]"
+		else if(burn_damage >= 3 && burn_damage > brute_damage)
+			name = "scorched [base_name]"
+		else
+			name = "damaged [base_name]"
+	else
+		name = "[base_name]"
+
+	return damage
+
+//Handles repairs (and also upgrades).
+
+/obj/item/clothing/suit/space/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/stack/sheet/mineral/plastic) || istype(W,/obj/item/stack/sheet/metal))
+
+		if(istype(src.loc,/mob/living))
+			user << "\red How do you intend to patch a hardsuit while someone is wearing it?"
+			return
+
+		if(!damage || !burn_damage)
+			user << "There is no surface damage on \the [src] to repair."
+			return
+
+		var/obj/item/stack/sheet/P = W
+		if(P.amount < 3)
+			P.use(P.amount)
+			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/mineral/plastic) ? P.amount : (P.amount*2) ), user)
+		else
+			P.use(3)
+			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/mineral/plastic) ? 3 : 5), user)
+		return
+
+	else if(istype(W, /obj/item/weapon/weldingtool))
+
+		if(istype(src.loc,/mob/living))
+			user << "\red How do you intend to patch a hardsuit while someone is wearing it?"
+			return
+
+		if (!damage || ! brute_damage)
+			user << "There is no structural damage on \the [src] to repair."
+			return
+
+		var/obj/item/weapon/weldingtool/WT = W
+		if(!WT.remove_fuel(5))
+			user << "\red You need more welding fuel to repair this suit."
+			return
+
+		repair_breaches(BRUTE, 3, user)
+		return
+
+	..()
+
+/obj/item/clothing/suit/space/examine()
+	..()
+	if(can_breach && breaches && breaches.len)
+		for(var/datum/breach/B in breaches)
+			usr << "\red <B>It has \a [B.descriptor].</B>"

code/modules/clothing/spacesuits/rig.dm

@@ -65,7 +65,14 @@
 	icon_action_button = "action_hardhat"
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
-	species_restricted = list("exclude","Unathi","Tajara","Skrell","Diona","Vox")
+
+	//Species-specific stuff.
+	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Diona","Vox")
+	sprite_sheets = list(
+		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
+		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
+		"Skrell" = 'icons/mob/species/skrell/helmet.dmi'
+		)
 
 	attack_self(mob/user)
 		if(!isturf(user.loc))
@@ -100,9 +107,241 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
-	species_restricted = list("exclude","Unathi","Tajara","Diona","Vox")
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
 
+	species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox")
+	sprite_sheets = list(
+		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
+		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
+		"Skrell" = 'icons/mob/species/skrell/suit.dmi'
+		)
+
+	//Breach thresholds, should ideally be inherited by most (if not all) hardsuits.
+	breach_threshold = 18
+	can_breach = 1
+
+	//Component/device holders.
+	var/obj/item/weapon/stock_parts/gloves = null     // Basic capacitor allows insulation, upgrades allow shock gloves etc.
+
+	var/attached_boots = 1                            // Can't wear boots if some are attached
+	var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
+	var/attached_helmet = 1                           // Can't wear a helmet if one is deployable.
+	var/obj/item/clothing/head/helmet/helmet = null   // Deployable helmet, if any.
+
+	var/list/max_mounted_devices = 0                  // Maximum devices. Easy.
+	var/list/can_mount = null                         // Types of device that can be hardpoint mounted.
+	var/list/mounted_devices = null                   // Holder for the above device.
+	var/obj/item/active_device = null                 // Currently deployed device, if any.
+
+/obj/item/clothing/suit/space/rig/equipped(mob/M)
+	..()
+
+	var/mob/living/carbon/human/H = M
+
+	if(!istype(H)) return
+
+	if(H.wear_suit != src)
+		return
+
+	if(attached_helmet && helmet)
+		if(H.head)
+			M << "You are unable to deploy your suit's helmet as \the [H.head] is in the way."
+		else
+			M << "Your suit's helmet deploys with a hiss."
+			//TODO: Species check, skull damage for forcing an unfitting helmet on?
+			helmet.loc = H
+			H.equip_to_slot(helmet, slot_head)
+			helmet.canremove = 0
+
+	if(attached_boots && boots)
+		if(H.shoes)
+			M << "You are unable to deploy your suit's magboots as \the [H.shoes] are in the way."
+		else
+			M << "Your suit's boots deploy with a hiss."
+			boots.loc = H
+			H.equip_to_slot(boots, slot_shoes)
+			boots.canremove = 0
+
+/obj/item/clothing/suit/space/rig/dropped()
+	..()
+
+	var/mob/living/carbon/human/H
+
+	if(helmet)
+		H = helmet.loc
+		if(istype(H))
+			if(helmet && H.head == helmet)
+				helmet.canremove = 1
+				H.drop_from_inventory(helmet)
+				helmet.loc = src
+
+	if(boots)
+		H = boots.loc
+		if(istype(H))
+			if(boots && H.shoes == boots)
+				boots.canremove = 1
+				H.drop_from_inventory(boots)
+				boots.loc = src
+
+/*
+/obj/item/clothing/suit/space/rig/verb/get_mounted_device()
+
+	set name = "Deploy Mounted Device"
+	set category = "Object"
+	set src in usr
+
+	if(!can_mount)
+		verbs -= /obj/item/clothing/suit/space/rig/verb/get_mounted_device
+		verbs -= /obj/item/clothing/suit/space/rig/verb/stow_mounted_device
+		return
+
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	if(active_device)
+		usr << "You already have \the [active_device] deployed."
+		return
+
+	if(!mounted_devices.len)
+		usr << "You do not have any devices mounted on \the [src]."
+		return
+
+/obj/item/clothing/suit/space/rig/verb/stow_mounted_device()
+
+	set name = "Stow Mounted Device"
+	set category = "Object"
+	set src in usr
+
+	if(!can_mount)
+		verbs -= /obj/item/clothing/suit/space/rig/verb/get_mounted_device
+		verbs -= /obj/item/clothing/suit/space/rig/verb/stow_mounted_device
+		return
+
+	if(!istype(usr, /mob/living)) return
+
+	if(usr.stat) return
+
+	if(!active_device)
+		usr << "You have no device currently deployed."
+		return
+*/
+
+/obj/item/clothing/suit/space/rig/verb/toggle_helmet()
+
+	set name = "Toggle Helmet"
+	set category = "Object"
+	set src in usr
+
+	if(!istype(src.loc,/mob/living)) return
+
+	if(!helmet)
+		usr << "There is no helmet installed."
+		return
+
+	var/mob/living/carbon/human/H = usr
+
+	if(!istype(H)) return
+	if(H.stat) return
+	if(H.wear_suit != src) return
+
+	if(H.head == helmet)
+		helmet.canremove = 1
+		H.drop_from_inventory(helmet)
+		helmet.loc = src
+		H << "\blue You retract your hardsuit helmet."
+	else
+		if(H.head)
+			H << "\red You cannot deploy your helmet while wearing another helmet."
+			return
+		//TODO: Species check, skull damage for forcing an unfitting helmet on?
+		helmet.loc = H
+		H.equip_to_slot(helmet, slot_head)
+		helmet.canremove = 0
+		H << "\blue You deploy your hardsuit helmet, sealing you off from the world."
+
+/obj/item/clothing/suit/space/rig/attackby(obj/item/W as obj, mob/user as mob)
+
+	if(!istype(user,/mob/living)) return
+
+	if(user.a_intent == "help")
+
+		if(istype(src.loc,/mob/living))
+			user << "How do you propose to modify a hardsuit while it is being worn?"
+			return
+
+		var/target_zone = user.zone_sel.selecting
+
+		if(target_zone == "head")
+
+			//Installing a component into or modifying the contents of the helmet.
+			if(!attached_helmet)
+				user << "\The [src] does not have a helmet mount."
+				return
+
+			if(istype(W,/obj/item/weapon/screwdriver))
+				if(!helmet)
+					user << "\The [src] does not have a helmet installed."
+				else
+					user << "You detatch \the [helmet] from \the [src]'s helmet mount."
+					helmet.loc = get_turf(src)
+					src.helmet = null
+				return
+			else if(istype(W,/obj/item/clothing/head/helmet/space))
+				if(helmet)
+					user << "\The [src] already has a helmet installed."
+				else
+					user << "You attach \the [W] to \the [src]'s helmet mount."
+					user.drop_item()
+					W.loc = src
+					src.helmet = W
+				return
+			else
+				return ..()
+
+		else if(target_zone == "l_leg" || target_zone == "r_leg" || target_zone == "l_foot" || target_zone == "r_foot")
+
+			//Installing a component into or modifying the contents of the feet.
+			if(!attached_boots)
+				user << "\The [src] does not have boot mounts."
+				return
+
+			if(istype(W,/obj/item/weapon/screwdriver))
+				if(!boots)
+					user << "\The [src] does not have any boots installed."
+				else
+					user << "You detatch \the [boots] from \the [src]'s boot mounts."
+					boots.loc = get_turf(src)
+					boots = null
+				return
+			else if(istype(W,/obj/item/clothing/shoes/magboots))
+				if(boots)
+					user << "\The [src] already has magboots installed."
+				else
+					user << "You attach \the [W] to \the [src]'s boot mounts."
+					user.drop_item()
+					W.loc = src
+					boots = W
+			else
+				return ..()
+
+		/*
+		else if(target_zone == "l_arm" || target_zone == "r_arm" || target_zone == "l_hand" || target_zone == "r_hand")
+
+			//Installing a component into or modifying the contents of the hands.
+
+		else if(target_zone == "torso" || target_zone == "groin")
+
+			//Modifying the cell or mounted devices
+
+			if(!mounted_devices)
+				return
+		*/
+
+		else //wat
+			return ..()
+
+	..()
+
 //Chief Engineer's rig
 /obj/item/clothing/head/helmet/space/rig/elite
 	name = "advanced hardsuit helmet"
@@ -111,6 +350,7 @@
 	item_state = "ce_helm"
 	_color = "white"
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
+	sprite_sheets = null
 
 /obj/item/clothing/suit/space/rig/elite
 	icon_state = "rig-white"
@@ -119,7 +359,7 @@
 	item_state = "ce_hardsuit"
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
-
+	sprite_sheets = null
 
 //Singuloth armor
 /obj/item/clothing/head/helmet/space/rig/singuloth
@@ -137,6 +377,7 @@
 	item_state = "singuloth_hardsuit"
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
+
 //Mining rig
 /obj/item/clothing/head/helmet/space/rig/mining
 	name = "mining hardsuit helmet"
@@ -181,7 +422,7 @@
 		usr << "This helmet has a built-in camera. It's [camera ? "" : "in"]active."
 
 /obj/item/clothing/suit/space/rig/syndi
-	icon_state = "rig-syndi"
+	icon_state = "rig-syndie"
 	name = "blood-red hardsuit"
 	desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
 	item_state = "syndie_hardsuit"
@@ -190,7 +431,7 @@
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
 	siemens_coefficient = 0.6
-
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
 
 //Wizard Rig
 /obj/item/clothing/head/helmet/space/rig/wizard
@@ -202,6 +443,7 @@
 	unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.7
+	sprite_sheets = null
 
 /obj/item/clothing/suit/space/rig/wizard
 	icon_state = "rig-wiz"
@@ -213,7 +455,7 @@
 	unacidable = 1
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.7
-
+	sprite_sheets = null
 
 //Medical Rig
 /obj/item/clothing/head/helmet/space/rig/medical
@@ -292,4 +534,4 @@
 	item_state = "atmos_hardsuit"
 	armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 20, bio = 100, rad = 0)
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE
-	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL

code/modules/clothing/suits/labcoat.dm

@@ -7,6 +7,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+	species_fit = list("Vox")
 
 	verb/toggle()
 		set name = "Toggle Labcoat Buttons"
@@ -69,30 +70,48 @@
 	desc = "Bluer than the standard model."
 	icon_state = "labcoat_cmo_open"
 	item_state = "labcoat_cmo"
+	species_fit = list("Vox")
 
 /obj/item/clothing/suit/storage/labcoat/mad
 	name = "The Mad's labcoat"
 	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
 	icon_state = "labgreen_open"
 	item_state = "labgreen"
+	species_fit = list("Vox")
 
 /obj/item/clothing/suit/storage/labcoat/genetics
 	name = "Geneticist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
 	icon_state = "labcoat_gen_open"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 /obj/item/clothing/suit/storage/labcoat/chemist
 	name = "Chemist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 /obj/item/clothing/suit/storage/labcoat/virologist
 	name = "Virologist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)
 
 /obj/item/clothing/suit/storage/labcoat/science
 	name = "Scientist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		)

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

@@ -8,7 +8,9 @@
 	_color = "ba_suit"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
-
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -18,6 +20,9 @@
 	_color = "captain"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/cargo
@@ -28,6 +33,9 @@
 	_color = "qm"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/cargotech
@@ -38,6 +46,9 @@
 	_color = "cargo"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/chaplain
@@ -48,6 +59,9 @@
 	_color = "chapblack"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/chef
@@ -57,6 +71,9 @@
 	_color = "chef"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/clown
@@ -76,6 +93,9 @@
 	_color = "hop"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/head_of_personnel_whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -95,6 +115,9 @@
 	permeability_coefficient = 0.50
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/internalaffairs
@@ -105,6 +128,9 @@
 	_color = "internalaffairs"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/rank/janitor
@@ -115,6 +141,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/lawyer
@@ -127,24 +156,36 @@
 	item_state = "lawyer_black"
 	_color = "lawyer_black"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/female
 	icon_state = "black_suit_fem"
 	item_state = "black_suit_fem"
 	_color = "black_suit_fem"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/red
 	icon_state = "lawyer_red"
 	item_state = "lawyer_red"
 	_color = "lawyer_red"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/blue
 	icon_state = "lawyer_blue"
 	item_state = "lawyer_blue"
 	_color = "lawyer_blue"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "Blue Suit"
@@ -153,6 +194,9 @@
 	item_state = "bluesuit"
 	_color = "bluesuit"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "Purple Suit"
@@ -160,6 +204,9 @@
 	item_state = "lawyer_purp"
 	_color = "lawyer_purp"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/lawyer/oldman
 	name = "Old Man's Suit"
@@ -168,6 +215,9 @@
 	item_state = "oldman"
 	_color = "oldman"
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/librarian
@@ -178,6 +228,9 @@
 	_color = "red_suit"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 /obj/item/clothing/under/mime
@@ -197,6 +250,9 @@
 	_color = "miner"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/barber
 	desc = "It's a barber's uniform."

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

@@ -8,6 +8,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -17,6 +20,9 @@
 	_color = "atmos"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -27,6 +33,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -36,6 +45,9 @@
 	_color = "robotics"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/mechanic
 	desc = "It's a pair of overalls worn by mechanics."

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

@@ -10,6 +10,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -21,6 +24,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/chemist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
@@ -32,6 +38,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /*
  * Medical
@@ -46,6 +55,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/geneticist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -57,6 +69,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/virologist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -68,6 +83,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -79,6 +97,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/nurse
 	desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -90,6 +111,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/orderly
 	desc = "A white suit to be worn by orderly people who love orderly things."
@@ -101,6 +125,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -112,6 +139,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
@@ -120,6 +150,9 @@
 	_color = "scrubsblue"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/medical/green
 	name = "medical scrubs"
@@ -128,6 +161,9 @@
 	_color = "scrubsgreen"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 /obj/item/clothing/under/rank/medical/purple
 	name = "medical scrubs"
@@ -136,6 +172,9 @@
 	_color = "scrubspurple"
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 //paramedic
 /obj/item/clothing/under/rank/medical/paramedic
@@ -148,6 +187,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 
 
 
@@ -193,4 +235,4 @@
 	_color = "virologist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL

code/modules/clothing/under/miscellaneous.dm

@@ -496,4 +496,11 @@
 	desc = "A suit made of strange materials."
 	icon_state = "psyamp"
 	item_state = "psyamp"
-	_color = "psyamp"
+	_color = "psyamp"
+
+/obj/item/clothing/under/rebeloutfit
+	name = "Rebel Outfit"
+	desc = "Made in Seattle, 2216."
+	icon_state = "colin_earle"
+	item_state = "colin_earle"
+	_color = "colin_earle"

code/modules/economy/ATM.dm

@@ -11,6 +11,7 @@ log transactions
 #define CHANGE_SECURITY_LEVEL 1
 #define TRANSFER_FUNDS 2
 #define VIEW_TRANSACTION_LOGS 3
+#define PRINT_DELAY 100
 
 /obj/item/weapon/card/id/var/money = 2000
 
@@ -33,6 +34,7 @@ log transactions
 	var/obj/item/weapon/card/held_card
 	var/editing_security_level = 0
 	var/view_screen = NO_SCREEN
+	var/lastprint = 0 // Printer needs time to cooldown
 
 /obj/machinery/atm/New()
 	..()
@@ -325,6 +327,10 @@ log transactions
 						usr << "\icon[src]<span class='warning'>You don't have enough funds to do that!</span>"
 			if("balance_statement")
 				if(authenticated_account)
+					if(world.timeofday < lastprint + PRINT_DELAY)
+						usr << "<span class='notice'>The [src.name] flashes an error on its display.</span>"
+						return
+					lastprint = world.timeofday
 					var/obj/item/weapon/paper/R = new(src.loc)
 					R.name = "Account balance: [authenticated_account.owner_name]"
 					R.info = {"<b>NT Automated Teller Account Statement</b><br><br>

code/modules/economy/Accounts_DB.dm

@@ -40,6 +40,19 @@
 		"}
 
 /obj/machinery/account_database/New()
+	if(!station_account)
+		create_station_account()
+
+	if(department_accounts.len == 0)
+		for(var/department in station_departments)
+			create_department_account(department)
+	if(!vendor_account)
+		create_department_account("Vendor")
+		vendor_account = department_accounts["Vendor"]
+
+	if(!current_date_string)
+		current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 2557"
+
 	machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]"
 	..()
 

code/modules/events/radiation_storm.dm

@@ -29,8 +29,7 @@
 		for(var/area/A in world)
 			if(A.z != 1 || is_safe_zone(A))
 				continue
-			var/area/ma = get_area_master(A)
-			ma.radiation_alert()
+			A.radiation_alert()
 
 		make_maint_all_access()
 
@@ -75,8 +74,7 @@
 		for(var/area/A in world)
 			if(A.z != 1 || is_safe_zone(A))
 				continue
-			var/area/ma = get_area_master(A)
-			ma.reset_radiation_alert()
+			A.reset_radiation_alert()
 
 		sleep(600) // Want to give them time to get out of maintenance.
 

code/modules/ext_scripts/irc.dm

@@ -1,6 +1,7 @@
 /proc/send2irc(var/channel, var/msg)
 	if(config.use_irc_bot && config.irc_bot_host)
-		ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
+		spawn(0)
+			ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
 	return
 
 /proc/send2mainirc(var/msg)

code/modules/food/cereal_maker.dm

@@ -23,6 +23,9 @@
 	if(istype(I, /obj/item/weapon/disk/nuclear))
 		user << "Central command would kill you if you made nuke disk cereal."
 		return
+	if(istype(I, /obj/item/flag))
+		user << "<span class='warning'>That isn't going to fit.</span>"
+		return
 	else
 		user << "<span class='notice'>You put [I] into [src].</span>"
 		on = TRUE

code/modules/food/customizables.dm

@@ -301,6 +301,10 @@
 	if(istype(I, /obj/item/weapon/disk/nuclear))
 		user << "You think about it for a few seconds, then you realize Central Command likely doesn't find nuke disk sandwiches very funny, and so you decide not to turn the nuke disk into a foodstuff."
 		return
+	if(istype(I, /obj/item/flag/nation))
+		user << "That's not going to fit!"
+		return
+
 	else
 		user << "<span class='notice'> You add [I] to [src].</span>"
 		if(istype(I,  /obj/item/weapon/reagent_containers/))

code/modules/food/deep_fryer.dm

@@ -32,6 +32,9 @@
 	if(istype(I, /obj/item/weapon/disk/nuclear))
 		user << "Central command would kill you if you deep fried that."
 		return
+	if(istype(I, /obj/item/flag))
+		user << "<span class='warning'>That isn't going to fit.</span>"
+		return
 	else
 		user << "<span class='notice'>You put [I] into [src].</span>"
 		on = TRUE

code/modules/media/mediamanager.dm

@@ -135,4 +135,4 @@ function SetMusic(url, time, volume) {
 	media.update_volume(value)
 	if(prefs)
 		prefs.volume = value
-		prefs.save_volume()
+		prefs.save_preferences(src)

code/modules/mining/mine_items.dm

@@ -154,28 +154,8 @@ proc/move_mining_shuttle()
 		src.req_access = list()
 		hacked = 1
 		usr << "You fried the consoles ID checking system. It's now available to everyone!"
-
-	else if(istype(W, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-			var/obj/item/weapon/circuitboard/mining_shuttle/M = new /obj/item/weapon/circuitboard/mining_shuttle( A )
-			for (var/obj/C in src)
-				C.loc = src.loc
-			A.circuit = M
-			A.anchored = 1
-
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				getFromPool(/obj/item/weapon/shard, loc)
-				A.state = 3
-				A.icon_state = "3"
-			else
-				user << "\blue You disconnect the monitor."
-				A.state = 4
-				A.icon_state = "4"
-
-			del(src)
+	else
+		..()
 
 /******************************Lantern*******************************/
 

code/modules/mining/mine_turfs.dm

@@ -13,7 +13,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 	opacity = 1
 	density = 1
 	blocks_air = 1
-	temperature = TCMB
+	temperature = T0C
 	var/mineral/mineral
 	var/mined_ore = 0
 	var/last_act = 0
@@ -402,7 +402,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 	icon_state = "asteroid"
 	oxygen = 0.01
 	nitrogen = 0.01
-	temperature = TCMB
+	temperature = T0C
 	icon_plating = "asteroid"
 	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
 

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

@@ -97,7 +97,7 @@ Works together with spawning an observer, noted above.
 	if(antagHUD)
 		var/list/target_list = list()
 		for(var/mob/living/target in oview(src, 14))
-			if(target.mind&&(target.mind.special_role||issilicon(target)) )
+			if(target.mind&&(target.mind.special_role||issilicon(target)||target.mind.nation) )
 				target_list += target
 		if(target_list.len)
 			assess_targets(target_list, src)
@@ -115,6 +115,7 @@ Works together with spawning an observer, noted above.
 	var/client/C = U.client
 	for(var/mob/living/carbon/human/target in target_list)
 		C.images += target.hud_list[SPECIALROLE_HUD]
+		C.images += target.hud_list[NATIONS_HUD]
 
 
 /*
@@ -148,6 +149,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
+	if(ticker && ticker.mode.name == "nations")
+		usr << "\blue Ghosting is disabled."
+		return
+
 	var/mob/M = src
 
 	if(stat == DEAD)

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -244,10 +244,9 @@
 		if ("grab")
 			if (M == src)
 				return
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src )
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, src )
 
 			M.put_in_active_hand(G)
-
 			grabbed_by += G
 			G.synch()
 

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

@@ -5,7 +5,7 @@
 	voice_name = "unknown"
 	icon = 'icons/mob/human.dmi'
 	icon_state = "body_m_s"
-	var/list/hud_list[9]
+	var/list/hud_list[10]
 	var/datum/species/species //Contains icon generation and language information, set during New().
 	var/embedded_flag	  //To check if we've need to roll for damage on movement while an item is imbedded in us.
 
@@ -88,7 +88,7 @@
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[STATUS_HUD_OOC]  = image('icons/mob/hud.dmi', src, "hudhealthy")
-
+	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 
 	..()
 
@@ -131,6 +131,11 @@
 			now_pushing = 0
 			return
 
+		if(istype(tmob,/mob/living/silicon/robot/drone)) //I have no idea why the hell this isn't already happening. How do mice do it?
+			loc = tmob.loc
+			now_pushing = 0
+			return
+
 		//BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller
 		if((tmob.a_intent == "help" || tmob.restrained()) && (a_intent == "help" || src.restrained()) && tmob.canmove && canmove) // mutual brohugs all around!
 			var/turf/oldloc = loc

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

@@ -85,6 +85,7 @@
 		if (prob(mut_prob))
 			var/list/datum/organ/external/candidates = list()
 			for (var/datum/organ/external/O in organs)
+				if(O.status & ORGAN_ROBOT) continue
 				if(!(O.status & ORGAN_MUTATED))
 					candidates |= O
 			if (candidates.len)
@@ -228,6 +229,8 @@ This function restores all organs.
 
 /mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/obj/used_weapon = null)
 
+	handle_suit_punctures(damagetype, damage)
+
 	//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
 	if((damagetype != BRUTE) && (damagetype != BURN))
 		..(damage, damagetype, def_zone, blocked)

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

@@ -52,7 +52,8 @@ emp_act
 				return -1 // complete projectile permutation
 
 	if(check_shields(P.damage, "the [P.name]"))
-		P.on_hit(src, 2)
+		P.on_hit(src, 2, def_zone)
+		handle_suit_punctures(P.damage_type, P.damage)
 		return 2
 
 //BEGIN BOOK'S TASER NERF.
@@ -337,3 +338,14 @@ emp_act
 				update_inv_w_uniform(1,0)
 		else
 			update_inv_w_uniform(1,0)
+
+/mob/living/carbon/human/proc/handle_suit_punctures(var/damtype, var/damage)
+
+	if(!wear_suit) return
+	if(!istype(wear_suit,/obj/item/clothing/suit/space)) return
+	if(damtype != BURN && damtype != BRUTE) return
+
+	var/obj/item/clothing/suit/space/SS = wear_suit
+	var/penetrated_dam = max(0,(damage - max(0,(SS.breach_threshold - SS.damage))))
+
+	if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)

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

@@ -30,17 +30,28 @@
 	if(wear_suit)
 		tally += wear_suit.slowdown
 
-	if(shoes)
-		tally += shoes.slowdown
+	if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair)))
+		if(shoes)
+			tally += shoes.slowdown
 
-	for(var/organ_name in list("l_foot","r_foot","l_leg","r_leg"))
-		var/datum/organ/external/E = get_organ(organ_name)
-		if(!E || (E.status & ORGAN_DESTROYED))
-			tally += 4
-		if(E.status & ORGAN_SPLINTED)
-			tally += 0.5
-		else if(E.status & ORGAN_BROKEN)
-			tally += 1.5
+		for(var/organ_name in list("l_foot","r_foot","l_leg","r_leg"))
+			var/datum/organ/external/E = get_organ(organ_name)
+			if(!E || (E.status & ORGAN_DESTROYED))
+				tally += 4
+			if(E.status & ORGAN_SPLINTED)
+				tally += 0.5
+			else if(E.status & ORGAN_BROKEN)
+				tally += 1.5
+
+	if(pulledby && istype(pulledby, /obj/structure/stool/bed/chair/wheelchair))
+		for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
+			var/datum/organ/external/E = get_organ(organ_name)
+			if(!E || (E.status & ORGAN_DESTROYED))
+				tally += 4
+			if(E.status & ORGAN_SPLINTED)
+				tally += 0.5
+			else if(E.status & ORGAN_BROKEN)
+				tally += 1.5
 
 	if(shock_stage >= 10) tally += 3
 

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

@@ -428,7 +428,7 @@
 					del(src)
 					return
 			if("internal")
-				if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && istype(target.back, /obj/item/weapon/tank) && !( target.internal )) ) && !( target.internal )))
+				if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && (istype(target.back, /obj/item/weapon/tank) || istype(target.belt, /obj/item/weapon/tank) || istype(target.s_store, /obj/item/weapon/tank)) && !( target.internal )) ) && !( target.internal )))
 					del(src)
 
 	var/message=null

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

@@ -21,9 +21,33 @@
 #define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
 #define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point
 
+var/global/list/unconscious_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage1"),\
+	"2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage2"),\
+	"3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage3"),\
+	"4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage4"),\
+	"5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage5"),\
+	"6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage6"),\
+	"7" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage7"),\
+	"8" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage8"),\
+	"9" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage9"),\
+	"10" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage10"))
+var/global/list/oxyloss_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1"),\
+	"2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2"),\
+	"3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3"),\
+	"4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4"),\
+	"5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5"),\
+	"6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6"),\
+	"7" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7"))
+var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1"),\
+	"2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2"),\
+	"3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3"),\
+	"4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4"),\
+	"5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5"),\
+	"6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6"))
 /mob/living/carbon/human
 	var/oxygen_alert = 0
 	var/toxins_alert = 0
+	var/co2_alert = 0
 	var/fire_alert = 0
 	var/pressure_alert = 0
 	var/prev_gender = null // Debug for plural genders
@@ -160,12 +184,24 @@
 	var/pressure_difference = abs( pressure - ONE_ATMOSPHERE )
 
 	var/pressure_adjustment_coefficient = 1	//Determins how much the clothing you are wearing protects you in percent.
-	if(wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE))
-		pressure_adjustment_coefficient -= PRESSURE_SUIT_REDUCTION_COEFFICIENT
+
 	if(head && (head.flags & STOPSPRESSUREDMAGE))
 		pressure_adjustment_coefficient -= PRESSURE_HEAD_REDUCTION_COEFFICIENT
-	pressure_adjustment_coefficient = max(pressure_adjustment_coefficient,0) //So it isn't less than 0
+
+	if(wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE))
+		pressure_adjustment_coefficient -= PRESSURE_SUIT_REDUCTION_COEFFICIENT
+
+		//Handles breaches in your space suit. 10 suit damage equals a 100% loss of pressure reduction.
+		if(istype(wear_suit,/obj/item/clothing/suit/space))
+			var/obj/item/clothing/suit/space/S = wear_suit
+			if(S.can_breach && S.damage)
+				var/pressure_loss = S.damage * 0.1
+				pressure_adjustment_coefficient += pressure_loss
+
+	pressure_adjustment_coefficient = min(1,max(pressure_adjustment_coefficient,0)) //So it isn't less than 0 or larger than 1.
+
 	pressure_difference = pressure_difference * pressure_adjustment_coefficient
+
 	if(pressure > ONE_ATMOSPHERE)
 		return ONE_ATMOSPHERE + pressure_difference
 	else
@@ -350,9 +386,11 @@
 
 		var/datum/gas_mixture/environment = loc.return_air()
 		var/datum/gas_mixture/breath
+
 		// HACK NEED CHANGING LATER
-		if(health < 0)
+		if(health < config.health_threshold_crit && !reagents.has_reagent("inaprovaline"))
 			losebreath++
+
 		if(losebreath>0) //Suffocating so do not take a breath
 			losebreath--
 			if (prob(10)) //Gasp per 10 ticks? Sounds about right.
@@ -449,8 +487,6 @@
 			return
 
 		if(!breath || (breath.total_moles() == 0) || suiciding)
-			if(reagents.has_reagent("inaprovaline"))
-				return
 			if(suiciding)
 				adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
 				failed_last_breath = 1
@@ -470,7 +506,8 @@
 		var/safe_pressure_min = 16 // Minimum safe partial pressure of breathable gas in kPa
 		//var/safe_pressure_max = 140 // Maximum safe partial pressure of breathable gas in kPa (Not used for now)
 		var/safe_exhaled_max = 10 // Yes it's an arbitrary value who cares?
-		var/safe_toxins_max = 0.005
+		var/safe_toxins_max = 0.5
+		var/safe_toxins_mask = 5
 		var/SA_para_min = 1
 		var/SA_sleep_min = 5
 		var/inhaled_gas_used = 0
@@ -481,12 +518,15 @@
 		var/poison
 		var/no_exhale
 
+		var/failed_inhale = 0
+		var/failed_exhale = 0
+
 		switch(species.breath_type)
 			if("nitrogen")
 				inhaling = breath.nitrogen
 			if("plasma")
 				inhaling = breath.toxins
-			if("C02")
+			if("carbon_dioxide")
 				inhaling = breath.carbon_dioxide
 			else
 				inhaling = breath.oxygen
@@ -496,13 +536,13 @@
 				poison = breath.oxygen
 			if("nitrogen")
 				poison = breath.nitrogen
-			if("C02")
+			if("carbon_dioxide")
 				poison = breath.carbon_dioxide
 			else
 				poison = breath.toxins
 
 		switch(species.exhale_type)
-			if("C02")
+			if("carbon_dioxide")
 				exhaling = breath.carbon_dioxide
 			if("oxygen")
 				exhaling = breath.oxygen
@@ -517,34 +557,38 @@
 		var/toxins_pp = (poison/breath.total_moles())*breath_pressure
 		var/exhaled_pp = (exhaling/breath.total_moles())*breath_pressure
 
+		// Not enough to breathe
 		if(inhale_pp < safe_pressure_min)
 			if(prob(20))
 				spawn(0) emote("gasp")
 			if(inhale_pp > 0)
-				var/ratio = safe_pressure_min/inhale_pp
+				var/ratio = inhale_pp/safe_pressure_min
 
 				 // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!)
+				 // The hell? By definition ratio > 1, and HUMAN_MAX_OXYLOSS = 1... why do we even have this?
 				adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS))
-				failed_last_breath = 1
+				failed_inhale = 1
 				inhaled_gas_used = inhaling*ratio/6
 
 			else
 
 				adjustOxyLoss(HUMAN_MAX_OXYLOSS)
-				failed_last_breath = 1
+				failed_inhale = 1
 
 			oxygen_alert = max(oxygen_alert, 1)
 
 		else
 			// We're in safe limits
-			failed_last_breath = 0
-			adjustOxyLoss(-5)
 			inhaled_gas_used = inhaling/6
 			oxygen_alert = 0
 
 		switch(species.breath_type)
 			if("nitrogen")
 				breath.nitrogen -= inhaled_gas_used
+			if("plasma")
+				breath.toxins -= inhaled_gas_used
+			if("carbon_dioxide")
+				breath.carbon_dioxide-= inhaled_gas_used
 			else
 				breath.oxygen -= inhaled_gas_used
 
@@ -556,42 +600,54 @@
 					breath.nitrogen += inhaled_gas_used
 				if("plamsa")
 					breath.toxins += inhaled_gas_used
-				if("C02")
+				if("carbon_dioxide")
 					breath.carbon_dioxide += inhaled_gas_used
 
-		// CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2,
-		// this will hurt you, but only once per 4 ticks, instead of once per tick.
-
+		// Too much exhaled gas in the air
 		if(exhaled_pp > safe_exhaled_max)
+			if (!co2_alert|| prob(15))
+				var/word = pick("extremely dizzy","short of breath","faint","confused")
+				src << "\red <b>You feel [word].</b>"
 
-			// If it's the first breath with too much CO2 in it, lets start a counter,
-			// then have them pass out after 12s or so.
-			if(!co2overloadtime)
-				co2overloadtime = world.time
+			adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+			co2_alert = 1
+			failed_exhale = 1
 
-			else if(world.time - co2overloadtime > 120)
+		else if(exhaled_pp > safe_exhaled_max * 0.7)
+			if (!co2_alert || prob(1))
+				var/word = pick("dizzy","short of breath","faint","momentarily confused")
+				src << "\red You feel [word]."
 
-				// Lets hurt em a little, let them know we mean business
-				Paralyse(3)
-				adjustOxyLoss(3)
+			//scale linearly from 0 to 1 between safe_exhaled_max and safe_exhaled_max*0.7
+			var/ratio = 1.0 - (safe_exhaled_max - exhaled_pp)/(safe_exhaled_max*0.3)
 
-				// They've been in here 30s now, lets start to kill them for their own good!
-				if(world.time - co2overloadtime > 300)
-					adjustOxyLoss(8)
+			//give them some oxyloss, up to the limit - we don't want people falling unconcious due to CO2 alone until they're pretty close to safe_exhaled_max.
+			if (getOxyLoss() < 50*ratio)
+				adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+			co2_alert = 1
+			failed_exhale = 1
 
-			// Lets give them some chance to know somethings not right though I guess.
-			if(prob(20))
-				spawn(0) emote("cough")
+		else if(exhaled_pp > safe_exhaled_max * 0.6)
+			if (prob(0.3))
+				var/word = pick("a little dizzy","short of breath")
+				src << "\red You feel [word]."
 
 		else
-			co2overloadtime = 0
+			co2_alert = 0
 
 		// Too much poison in the air.
-		if(toxins_pp > safe_toxins_max)
+		if(toxins_pp > safe_toxins_max) // Too much toxins
 			var/ratio = (poison/safe_toxins_max) * 10
-			if(reagents)
-				//TODO: Fix Ravensdale's shit, make toxins toxins again instead of phoron.
-				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
+			if(wear_mask)
+				if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
+					if(poison > safe_toxins_mask)
+						ratio = (poison/safe_toxins_mask) * 10
+					else
+						ratio = 0
+			if(ratio)
+				if(reagents)
+					reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
+				toxins_alert = max(toxins_alert, 1)
 			toxins_alert = max(toxins_alert, 1)
 		else
 			toxins_alert = 0
@@ -617,7 +673,15 @@
 						spawn(0) emote(pick("giggle", "laugh"))
 				SA.moles = 0
 
-		if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in mutations)) // Hot air hurts :(
+		// Were we able to breathe?
+		if (failed_inhale || failed_exhale)
+			failed_last_breath = 1
+		else
+			failed_last_breath = 0
+			adjustOxyLoss(-5)
+
+		// Hot air hurts :(
+		if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in mutations))
 
 			if(status_flags & GODMODE)
 				return 1
@@ -1331,70 +1395,69 @@
 		if(stat == UNCONSCIOUS)
 			//Critical damage passage overlay
 			if(health <= 0)
-				var/image/I
+				//var/image/I
 				switch(health)
 					if(-20 to -10)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage1")
+						damageoverlay.overlays += unconscious_overlays["1"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage1")
 					if(-30 to -20)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage2")
+						damageoverlay.overlays +=  unconscious_overlays["2"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage2")
 					if(-40 to -30)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage3")
+						damageoverlay.overlays +=  unconscious_overlays["3"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage3")
 					if(-50 to -40)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage4")
+						damageoverlay.overlays +=  unconscious_overlays["4"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage4")
 					if(-60 to -50)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage5")
+						damageoverlay.overlays +=  unconscious_overlays["5"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage5")
 					if(-70 to -60)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage6")
+						damageoverlay.overlays +=  unconscious_overlays["6"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage6")
 					if(-80 to -70)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage7")
+						damageoverlay.overlays +=  unconscious_overlays["7"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage7")
 					if(-90 to -80)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage8")
+						damageoverlay.overlays +=  unconscious_overlays["8"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage8")
 					if(-95 to -90)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage9")
+						damageoverlay.overlays +=  unconscious_overlays["9"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage9")
 					if(-INFINITY to -95)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage10")
-				damageoverlay.overlays += I
+						damageoverlay.overlays +=  unconscious_overlays["10"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage10")
+				//damageoverlay.overlays += I
 		else
 			//Oxygen damage overlay
 			if(oxyloss)
-				var/image/I
+				//var/image/I
 				switch(oxyloss)
 					if(10 to 20)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1")
+						damageoverlay.overlays += oxyloss_overlays["1"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1")
 					if(20 to 25)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2")
+						damageoverlay.overlays += oxyloss_overlays["2"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2")
 					if(25 to 30)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3")
+						damageoverlay.overlays += oxyloss_overlays["3"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3")
 					if(30 to 35)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4")
+						damageoverlay.overlays += oxyloss_overlays["4"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4")
 					if(35 to 40)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5")
+						damageoverlay.overlays += oxyloss_overlays["5"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5")
 					if(40 to 45)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6")
+						damageoverlay.overlays += oxyloss_overlays["6"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6")
 					if(45 to INFINITY)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7")
-				damageoverlay.overlays += I
+						damageoverlay.overlays += oxyloss_overlays["7"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7")
+				//damageoverlay.overlays += I
 
 			//Fire and Brute damage overlay (BSSR)
 			var/hurtdamage = src.getBruteLoss() + src.getFireLoss() + damageoverlaytemp
 			damageoverlaytemp = 0 // We do this so we can detect if someone hits us or not.
 			if(hurtdamage)
-				var/image/I
+				//var/image/I
 				switch(hurtdamage)
 					if(10 to 25)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1")
+						damageoverlay.overlays += brutefireloss_overlays["1"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1")
 					if(25 to 40)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2")
+						damageoverlay.overlays += brutefireloss_overlays["2"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2")
 					if(40 to 55)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3")
+						damageoverlay.overlays += brutefireloss_overlays["3"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3")
 					if(55 to 70)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4")
+						damageoverlay.overlays += brutefireloss_overlays["4"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4")
 					if(70 to 85)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5")
+						damageoverlay.overlays += brutefireloss_overlays["5"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5")
 					if(85 to INFINITY)
-						I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6")
-				damageoverlay.overlays += I
-
+						damageoverlay.overlays += brutefireloss_overlays["6"]//image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6")
+				//damageoverlay.overlays += I
 		if( stat == DEAD )
 			sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			see_in_dark = 8
@@ -1480,6 +1543,8 @@
 				see_in_dark = species.darksight
 				see_invisible = SEE_INVISIBLE_LIVING
 
+			if(ticker && ticker.mode.name == "nations")
+				process_nations()
 
 			if(healths)
 				if (analgesic)
@@ -1789,8 +1854,9 @@
 		for(var/mob/living/carbon/human/H in range(decaylevel, src))
 			if(prob(5))
 				if(airborne_can_reach(get_turf(src), get_turf(H)))
-					if(loc == istype(loc,/obj/item/bodybag)) return
-					if(H.wear_mask && H.wear_mask == istype(H.wear_mask,/obj/item/clothing/mask/surgical)) return
+					if(istype(loc,/obj/item/bodybag)) return
+					if(H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/surgical)) return
+					if(H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/breath/medical)) return
 					H << "<spawn class='warning'>You smell something foul..."
 					H.vomit()
 
@@ -1939,14 +2005,44 @@
 					holder.icon_state = "hudvampthrall"
 				if("head_loyalist")
 					holder.icon_state = "loyalist"
+				if("loyalist")
+					holder.icon_state = "loyalist"
 				if("head_mutineer")
 					holder.icon_state = "mutineer"
-
+				if("mutineer")
+					holder.icon_state = "mutineer"
 
 			hud_list[SPECIALROLE_HUD] = holder
 
+	if(hud_updateflag & 1 << NATIONS_HUD)
+		var/image/holder = hud_list[NATIONS_HUD]
+		holder.icon_state = "hudblank"
+
+		if(mind && mind.nation)
+			switch(mind.nation.name)
+				if("Atmosia")
+					holder.icon_state = "hudatmosia"
+				if("Brigston")
+					holder.icon_state = "hudbrigston"
+				if("Cargonia")
+					holder.icon_state = "hudcargonia"
+				if("People's Republic of Commandzakstan")
+					holder.icon_state = "hudcommand"
+				if("Medistan")
+					holder.icon_state = "hudmedistan"
+				if("Scientopia")
+					holder.icon_state = "hudscientopia"
+
+			hud_list[NATIONS_HUD] = holder
+
 	hud_updateflag = 0
 
 
+/mob/living/carbon/human/proc/process_nations()
+	var/client/C = client
+	for(var/mob/living/carbon/human/H in view(src, 14))
+		C.images += H.hud_list[NATIONS_HUD]
+
+
 #undef HUMAN_MAX_OXYLOSS
 #undef HUMAN_CRIT_MAX_OXYLOSS

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

@@ -290,7 +290,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 		//Robotic limbs are handled in get_icon() so all we worry about are missing or dead limbs.
 		//No icon stored, so we need to start with a basic one.
 		var/datum/organ/external/chest = get_organ("chest")
-		base_icon = chest.get_icon(g)
+		base_icon = chest.get_icon(g,fat)
 
 		for(var/datum/organ/external/part in organs)
 
@@ -355,7 +355,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 		//Skin tone.
 		if(!husk && !hulk)
-			if(species.flags & HAS_SKIN_TONE)
+			if(species.bodyflags & HAS_SKIN_TONE)
 				if(s_tone >= 0)
 					base_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 				else
@@ -596,16 +596,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 		else
 			standing.icon	= 'icons/mob/uniform.dmi'
 
-		var/obj/item/I = w_uniform
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.uniform_icons)
-				standing.icon = species.uniform_icons
-
 		if(w_uniform.icon_override)
-			standing.icon	= w_uniform.icon_override
-
-		if(w_uniform.custom)
-			standing.icon	= w_uniform.icon
+			standing.icon = w_uniform.icon_override
+		else if(w_uniform.sprite_sheets && w_uniform.sprite_sheets[species.name])
+			standing.icon = w_uniform.sprite_sheets[species.name]
+		else
+			standing.icon = 'icons/mob/uniform.dmi'
 
 		if(w_uniform.blood_DNA)
 			if(green==1)
@@ -654,12 +650,13 @@ proc/get_damage_icon_part(damage_state, body_part)
 		var/t_state = gloves.item_state
 		if(!t_state)	t_state = gloves.icon_state
 
-		var/image/standing	= image("icon" = ((gloves.icon_override) ? gloves.icon_override : 'icons/mob/hands.dmi'), "icon_state" = "[t_state]")
-
-		var/obj/item/I = gloves
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.gloves_icons)
-				standing.icon = species.gloves_icons
+		var/image/standing
+		if(gloves.icon_override)
+			standing = image("icon" = gloves.icon_override, "icon_state" = "[t_state]")
+		else if(gloves.sprite_sheets && gloves.sprite_sheets[species.name])
+			standing = image("icon" = gloves.sprite_sheets[species.name], "icon_state" = "[t_state]")
+		else
+			standing = image("icon" = 'icons/mob/hands.dmi', "icon_state" = "[t_state]")
 
 		if(gloves.blood_DNA)
 			if(green==1)
@@ -681,14 +678,13 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 /mob/living/carbon/human/update_inv_glasses(var/update_icons=1)
 	if(glasses)
-		var/image/standing = image("icon" = ((glasses.icon_override) ? glasses.icon_override : 'icons/mob/eyes.dmi'), "icon_state" = "[glasses.icon_state]")
 
-		var/obj/item/I = glasses
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.glasses_icons)
-				standing.icon = species.glasses_icons
-
-		overlays_standing[GLASSES_LAYER]	= standing
+		if(glasses.icon_override)
+			overlays_standing[GLASSES_LAYER] = image("icon" = glasses.icon_override, "icon_state" = "[glasses.icon_state]")
+		else if(glasses.sprite_sheets && glasses.sprite_sheets[species.name])
+			overlays_standing[GLASSES_LAYER]= image("icon" = glasses.sprite_sheets[species.name], "icon_state" = "[glasses.icon_state]")
+		else
+			overlays_standing[GLASSES_LAYER]= image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]")
 
 	else
 		overlays_standing[GLASSES_LAYER]	= null
@@ -697,21 +693,43 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/update_inv_ears(var/update_icons=1)
 	if(l_ear || r_ear)
 		if(l_ear)
-			overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[l_ear.icon_state]")
+
+			var/t_type = l_ear.icon_state
+			if(l_ear.icon_override)
+				t_type = "[t_type]_l"
+				overlays_standing[EARS_LAYER] = image("icon" = l_ear.icon_override, "icon_state" = "[t_type]")
+			else if(l_ear.sprite_sheets && l_ear.sprite_sheets[species.name])
+				t_type = "[t_type]_l"
+				overlays_standing[EARS_LAYER] = image("icon" = l_ear.sprite_sheets[species.name], "icon_state" = "[t_type]")
+			else
+				overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]")
+
 		if(r_ear)
-			overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[r_ear.icon_state]")
+
+			var/t_type = r_ear.icon_state
+			if(r_ear.icon_override)
+				t_type = "[t_type]_r"
+				overlays_standing[EARS_LAYER] = image("icon" = r_ear.icon_override, "icon_state" = "[t_type]")
+			else if(r_ear.sprite_sheets && r_ear.sprite_sheets[species.name])
+				t_type = "[t_type]_r"
+				overlays_standing[EARS_LAYER] = image("icon" = r_ear.sprite_sheets[species.name], "icon_state" = "[t_type]")
+			else
+				overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]")
+
 	else
 		overlays_standing[EARS_LAYER]	= null
 	if(update_icons)   update_icons()
 
 /mob/living/carbon/human/update_inv_shoes(var/update_icons=1,var/green=0)
 	if(shoes)
-		var/image/standing	= image("icon" = ((shoes.icon_override) ? shoes.icon_override : 'icons/mob/feet.dmi'), "icon_state" = "[shoes.icon_state]")
 
-		var/obj/item/I = shoes
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.shoes_icons)
-				standing.icon = species.shoes_icons
+		var/image/standing
+		if(shoes.icon_override)
+			standing = image("icon" = shoes.icon_override, "icon_state" = "[shoes.icon_state]")
+		else if(shoes.sprite_sheets && shoes.sprite_sheets[species.name])
+			standing = image("icon" = shoes.sprite_sheets[species.name], "icon_state" = "[shoes.icon_state]")
+		else
+			standing = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]")
 
 		if(shoes.blood_DNA)
 			if(green==1)
@@ -743,14 +761,14 @@ proc/get_damage_icon_part(damage_state, body_part)
 		head.screen_loc = ui_head		//TODO
 		var/image/standing
 		if(istype(head,/obj/item/clothing/head/kitty))
-			standing	= image("icon" = head:mob)
+			standing = image("icon" = head:mob)
 		else
-			standing	= image("icon" = ((head.icon_override) ? head.icon_override : 'icons/mob/head.dmi'), "icon_state" = "[head.icon_state]")
-
-		var/obj/item/I = head
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.head_icons)
-				standing.icon = species.head_icons
+			if(head.icon_override)
+				standing = image("icon" = head.icon_override, "icon_state" = "[head.icon_state]")
+			else if(head.sprite_sheets && head.sprite_sheets[species.name])
+				standing = image("icon" = head.sprite_sheets[species.name], "icon_state" = "[head.icon_state]")
+			else
+				standing = image("icon" = 'icons/mob/head.dmi', "icon_state" = "[head.icon_state]")
 
 		if(head.blood_DNA)
 			if(green==1)
@@ -758,6 +776,8 @@ proc/get_damage_icon_part(damage_state, body_part)
 			else
 				standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "helmetblood")
 		overlays_standing[HEAD_LAYER]	= standing
+
+
 	else
 		overlays_standing[HEAD_LAYER]	= null
 	if(update_icons)   update_icons()
@@ -767,37 +787,36 @@ proc/get_damage_icon_part(damage_state, body_part)
 		belt.screen_loc = ui_belt	//TODO
 		var/t_state = belt.item_state
 		if(!t_state)	t_state = belt.icon_state
-		var/image/standing = image("icon" = ((belt.icon_override) ? belt.icon_override : 'icons/mob/belt.dmi'), "icon_state" = "[t_state]")
 
-		var/obj/item/I = belt
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.belt_icons)
-				standing.icon = species.belt_icons
-
-		overlays_standing[BELT_LAYER]	= standing
+		if(belt.icon_override)
+			overlays_standing[BELT_LAYER] = image("icon" = belt.icon_override, "icon_state" = "[t_state]")
+		else if(belt.sprite_sheets && belt.sprite_sheets[species.name])
+			overlays_standing[BELT_LAYER] = image("icon" = belt.sprite_sheets[species.name], "icon_state" = "[t_state]")
+		else
+			overlays_standing[BELT_LAYER] = image("icon" = 'icons/mob/belt.dmi', "icon_state" = "[t_state]")
 	else
-		overlays_standing[BELT_LAYER]	= null
+		overlays_standing[BELT_LAYER] = null
 	if(update_icons)   update_icons()
 
 
 /mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1)
 	if( wear_suit && istype(wear_suit, /obj/item/clothing/suit) )	//TODO check this
 		wear_suit.screen_loc = ui_oclothing	//TODO
-		var/dmi='icons/mob/suit.dmi'
-		if(wear_suit.custom)
-			dmi  = wear_suit.icon
 
-		var/image/standing  = image("icon" = dmi, "icon_state" = "[wear_suit.icon_state]")
-
-		if(M_FAT in mutations)
+		var/image/standing
+		if(wear_suit.icon_override)
+			standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]")
+		else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
+			standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
+		else if(M_FAT in mutations)
 			if(wear_suit.flags&ONESIZEFITSALL)
-				standing.icon	= 'icons/mob/suit_fat.dmi'
+				standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
 			else
 				src << "\red You burst out of \the [wear_suit]!"
 				drop_from_inventory(wear_suit)
 				return
 		else
-			standing.icon	= 'icons/mob/suit.dmi'
+			standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")
 
 
 		if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
@@ -805,11 +824,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 			drop_l_hand()
 			drop_r_hand()
 
-		var/obj/item/I = wear_suit
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.wear_suit_icons)
-				standing.icon = species.wear_suit_icons
-
 		if(wear_suit.blood_DNA)
 			var/t_state
 			if( istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat) )
@@ -850,12 +864,14 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
 	if( wear_mask && ( istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/tie) ) )
 		wear_mask.screen_loc = ui_mask	//TODO
-		var/image/standing	= image("icon" = ((wear_mask.icon_override) ? wear_mask.icon_override : 'icons/mob/mask.dmi'), "icon_state" = "[wear_mask.icon_state]")
 
-		var/obj/item/I = wear_mask
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.wear_mask_icons)
-				standing.icon = species.wear_mask_icons
+		var/image/standing
+		if(wear_mask.icon_override)
+			standing = image("icon" = wear_mask.icon_override, "icon_state" = "[wear_mask.icon_state]")
+		else if(wear_mask.sprite_sheets && wear_mask.sprite_sheets[species.name])
+			standing = image("icon" = wear_mask.sprite_sheets[species.name], "icon_state" = "[wear_mask.icon_state]")
+		else
+			standing = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]")
 
 		if( !istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA )
 			standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "maskblood")
@@ -868,14 +884,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/update_inv_back(var/update_icons=1)
 	if(back)
 		back.screen_loc = ui_back	//TODO
-		var/image/standing	= image("icon" = ((back.icon_override) ? back.icon_override : 'icons/mob/back.dmi'), "icon_state" = "[back.icon_state]")
-
-		var/obj/item/I = back
-		if(species.name in I.species_fit) //Allows clothes to display differently for multiple species
-			if(species.back_icons)
-				standing.icon = species.back_icons
-
-		overlays_standing[BACK_LAYER]	= standing
+		if(back.icon_override)
+			overlays_standing[BACK_LAYER] = image("icon" = back.icon_override, "icon_state" = "[back.icon_state]")
+		else if(back.sprite_sheets && back.sprite_sheets[species.name])
+			overlays_standing[BACK_LAYER] = image("icon" = back.sprite_sheets[species.name], "icon_state" = "[back.icon_state]")
+		else
+			overlays_standing[BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]")
 	else
 		overlays_standing[BACK_LAYER]	= null
 	if(update_icons)   update_icons()
@@ -929,8 +943,16 @@ proc/get_damage_icon_part(damage_state, body_part)
 		r_hand.screen_loc = ui_rhand	//TODO
 		var/t_state = r_hand.item_state
 		if(!t_state)	t_state = r_hand.icon_state
-		if(r_hand.icon_override) t_state = "[t_state]_r"
-		overlays_standing[R_HAND_LAYER] = image("icon" = ((r_hand.icon_override) ? r_hand.icon_override : 'icons/mob/items_righthand.dmi'), "icon_state" = "[t_state]")
+
+		if(r_hand.icon_override)
+			t_state = "[t_state]_r"
+			overlays_standing[R_HAND_LAYER] = image("icon" = r_hand.icon_override, "icon_state" = "[t_state]")
+		else if(r_hand.sprite_sheets && r_hand.sprite_sheets[species.name])
+			t_state = "[t_state]_r"
+			overlays_standing[R_HAND_LAYER] = image("icon" = r_hand.sprite_sheets[species.name], "icon_state" = "[t_state]")
+		else
+			overlays_standing[R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = "[t_state]")
+
 		if (handcuffed) drop_r_hand()
 	else
 		overlays_standing[R_HAND_LAYER] = null
@@ -942,8 +964,16 @@ proc/get_damage_icon_part(damage_state, body_part)
 		l_hand.screen_loc = ui_lhand	//TODO
 		var/t_state = l_hand.item_state
 		if(!t_state)	t_state = l_hand.icon_state
-		if(l_hand.icon_override) t_state = "[t_state]_l"
-		overlays_standing[L_HAND_LAYER] = image("icon" = ((l_hand.icon_override) ? l_hand.icon_override : 'icons/mob/items_lefthand.dmi'), "icon_state" = "[t_state]")
+
+		if(l_hand.icon_override)
+			t_state = "[t_state]_l"
+			overlays_standing[L_HAND_LAYER] = image("icon" = l_hand.icon_override, "icon_state" = "[t_state]")
+		else if(l_hand.sprite_sheets && l_hand.sprite_sheets[species.name])
+			t_state = "[t_state]_l"
+			overlays_standing[L_HAND_LAYER] = image("icon" = l_hand.sprite_sheets[species.name], "icon_state" = "[t_state]")
+		else
+			overlays_standing[L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = "[t_state]")
+
 		if (handcuffed) drop_l_hand()
 	else
 		overlays_standing[L_HAND_LAYER] = null

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

@@ -164,11 +164,11 @@
 	set desc = "Grow to a more complex form."
 
 	if(donors.len < 5)
-		src << "You are not yet ready for your growth..."
+		src << "You need more blood in order to ascend to a new state of consciousness..."
 		return
 
-	if(reagents.get_reagent_amount("nutriment") < 5)
-		src << "You have not yet consumed enough to grow..."
+	if(nutrition < 500)
+		src << "You need to binge on weeds in order to have the energy to grow..."
 		return
 
 	src.split()
@@ -239,3 +239,13 @@
 		src << "\green You feel your awareness expand, and realize you know how to understand the creatures around you."
 	else
 		src << "\green The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind."
+
+
+/mob/living/carbon/monkey/diona/put_in_hands(obj/item/W)
+	W.loc = get_turf(src)
+	W.layer = initial(W.layer)
+	W.dropped()
+
+/mob/living/carbon/monkey/diona/put_in_active_hand(obj/item/W)
+	src << "\red You don't have any hands!"
+	return

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

@@ -305,6 +305,7 @@
 		//var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now)
 		var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
 		var/safe_toxins_max = 0.5
+		var/safe_toxins_mask = 5
 		var/SA_para_min = 0.5
 		var/SA_sleep_min = 5
 		var/oxygen_used = 0
@@ -357,9 +358,16 @@
 		if(Toxins_pp > safe_toxins_max) // Too much toxins
 			var/ratio = (breath.toxins/safe_toxins_max) * 10
 			//adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))	//Limit amount of damage toxin exposure can do per second
-			if(reagents)
-				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
-			toxins_alert = max(toxins_alert, 1)
+			if(wear_mask)
+				if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
+					if(breath.toxins > safe_toxins_mask)
+						ratio = (breath.toxins/safe_toxins_mask) * 10
+					else
+						ratio = 0
+			if(ratio)
+				if(reagents)
+					reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
+				toxins_alert = max(toxins_alert, 1)
 		else
 			toxins_alert = 0
 

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

@@ -17,7 +17,7 @@
 
 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
 	var/poison_type = "plasma"   // Poisonous air.
-	var/exhale_type = "C02"      // Exhaled gas type.
+	var/exhale_type = "carbon_dioxide"      // Exhaled gas type.
 
 	var/cold_level_1 = 260  // Cold damage level 1 below this point.
 	var/cold_level_2 = 200  // Cold damage level 2 below this point.
@@ -48,17 +48,6 @@
 
 	var/list/abilities = list()	// For species-derived or admin-given powers
 
-	var/uniform_icons = 'icons/mob/uniform.dmi'
-	var/fat_uniform_icons = 'icons/mob/uniform_fat.dmi'
-	var/gloves_icons = 'icons/mob/hands.dmi'
-	var/glasses_icons = 'icons/mob/eyes.dmi'
-	var/shoes_icons = 'icons/mob/feet.dmi'
-	var/head_icons = 'icons/mob/head.dmi'
-	var/belt_icons = 'icons/mob/belt.dmi'
-	var/wear_suit_icons = 'icons/mob/suit.dmi'
-	var/wear_mask_icons = 'icons/mob/mask.dmi'
-	var/back_icons = 'icons/mob/back.dmi'
-
 	var/blood_color = "#A10808" //Red.
 	var/flesh_color = "#FFC896" //Pink.
 
@@ -215,12 +204,20 @@
 	breath_type = "nitrogen"
 	poison_type = "oxygen"
 
-	uniform_icons = 'icons/mob/species/vox/uniform.dmi'
-	shoes_icons = 'icons/mob/species/vox/shoes.dmi'
-	wear_mask_icons = 'icons/mob/species/vox/masks.dmi'
-
 	flags = NO_SCAN | IS_WHITELISTED | NO_BLOOD
 
+	flesh_color = "#808D11"
+
+	makeName(var/gender,var/mob/living/carbon/human/H=null)
+		var/sounds = rand(2,8)
+		var/i = 0
+		var/newname = ""
+
+		while(i<=sounds)
+			i++
+			newname += pick(vox_name_syllables)
+		return capitalize(newname)
+
 /datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
 
 	H.verbs += /mob/living/carbon/human/proc/leap
@@ -263,18 +260,11 @@
 	tail = "armalis_tail"
 	icon_template = 'icons/mob/human_races/r_armalis.dmi'
 
-	wear_mask_icons = 'icons/mob/species/vox/armalis/mask.dmi'
-	shoes_icons = 'icons/mob/species/vox/armalis/shoes.dmi'
-	gloves_icons = 'icons/mob/species/vox/armalis/hands.dmi'
+/datum/species/vox/create_organs(var/mob/living/carbon/human/H)
 
-/datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
-	H.verbs += /mob/living/carbon/human/proc/gut
-	..()
-
-/datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
-
-	H.verbs += /mob/living/carbon/human/proc/leap
+	..() //create organs first.
 
+	//Now apply cortical stack.
 	var/datum/organ/external/affected = H.get_organ("head")
 
 	//To avoid duplicates.
@@ -293,8 +283,6 @@
 		M.cortical_stacks += I
 		M.raiders[H.mind] = I
 
-	return ..()
-
 
 
 /datum/species/kidan
@@ -351,16 +339,6 @@
 	default_block_names=list("REMOTETALK")
 
 
-	makeName(var/gender,var/mob/living/carbon/human/H=null)
-		var/sounds = rand(2,8)
-		var/i = 0
-		var/newname = ""
-
-		while(i<=sounds)
-			i++
-			newname += pick(vox_name_syllables)
-		return capitalize(newname)
-
 /datum/species/diona
 	name = "Diona"
 	icobase = 'icons/mob/human_races/r_diona.dmi'
@@ -428,6 +406,6 @@
 	heat_level_2 = 3000
 	heat_level_3 = 4000
 
-	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
+	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC | NO_INTORGANS
 
 	flesh_color = "#AAAAAA"

code/modules/mob/living/living_defense.dm

@@ -87,7 +87,7 @@
 
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a thrown [O], last touched by [M.name] ([assailant.ckey])</font>")
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with a thrown [O]</font>")
-			if(!istype(src,/mob/living/simple_animal/mouse))
+			if(src.ckey)
 				msg_admin_attack("[src.name] ([src.ckey]) was hit by a thrown [O], last touched by [M.name] ([assailant.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
 			if(!iscarbon(M))
 				src.LAssailant = null

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

@@ -138,7 +138,7 @@ var/list/ai_list = list()
 	hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-
+	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 
 	ai_list += src
 	..()

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

@@ -11,11 +11,11 @@
 	pass_flags = PASSTABLE
 	braintype = "Robot"
 	lawupdate = 0
-	density = 0
+	density = 1
+	req_access = list(access_engine, access_robotics)
 
 	// We need to keep track of a few module items so we don't need to do list operations
 	// every time we need them. These get set in New() after the module is chosen.
-
 	var/obj/item/stack/sheet/metal/cyborg/stack_metal = null
 	var/obj/item/stack/sheet/wood/cyborg/stack_wood = null
 	var/obj/item/stack/sheet/glass/cyborg/stack_glass = null
@@ -25,10 +25,15 @@
 	//Used for self-mailing.
 	var/mail_destination = 0
 
+	//Used for pulling.
+
 /mob/living/silicon/robot/drone/New()
 
 	..()
 
+	if(camera && "Robots" in camera.network)
+		camera.network.Add("Engineering")
+
 	//They are unable to be upgraded, so let's give them a bit of a better battery.
 	cell.maxcharge = 10000
 	cell.charge = 10000
@@ -54,11 +59,10 @@
 	decompiler = locate(/obj/item/weapon/matter_decompiler) in src.module
 
 	//Some tidying-up.
-	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT log and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
+	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
 	updatename()
 	updateicon()
 
-
 //Redefining some robot procs...
 /mob/living/silicon/robot/drone/updatename()
 	real_name = "maintenance drone ([rand(100,999)])"
@@ -101,10 +105,27 @@
 		return emote(copytext(message,2))
 	else if(length(message) >= 2)
 		if(copytext(message, 1 ,3) == ":b" || copytext(message, 1 ,3) == ":B")
+
 			if(!is_component_functioning("comms"))
 				src << "\red Your binary communications component isn't functional."
 				return
+
 			robot_talk(trim(copytext(message,3)))
+
+		else if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":d")
+
+			if(!is_component_functioning("radio"))
+				src << "\red Your radio transmitter isn't functional."
+				return
+
+			for (var/mob/living/S in living_mob_list)
+				if(istype(S, /mob/living/silicon/robot/drone))
+					S << "<i><span class='game say'>Drone Talk, <span class='name'>[name]</span><span class='message'> transmits, \"[message]\"</span></span></i>"
+
+			for (var/mob/M in dead_mob_list)
+				if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain))
+					M << "<i><span class='game say'>Drone Talk, <span class='name'>[name]</span><span class='message'> transmits, \"[trim(copytext(message,3))]\"</span></span></i>"
+
 		else
 
 			var/list/listeners = hearers(5,src)
@@ -181,11 +202,15 @@
 
 		if(stat == 2)
 
-			user << "\red You swipe your ID card through [src], attempting to reboot it."
 			if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave.
 				user << "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one."
 				return
 
+			if(!allowed(usr))
+				user << "\red Access denied."
+				return
+			
+			user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to reboot it.", "\red You swipe your ID card through \the [src], attempting to reboot it.")
 			var/drones = 0
 			for(var/mob/living/silicon/robot/drone/D in world)
 				if(D.key && D.client)
@@ -195,14 +220,15 @@
 			return
 
 		else
-			src << "\red [user] swipes an ID card through your card reader."
-			user << "\red You swipe your ID card through [src], attempting to shut it down."
+			user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to shut it down.", "\red You swipe your ID card through \the [src], attempting to shut it down.")
 
 			if(emagged)
 				return
 
 			if(allowed(usr))
 				shut_down()
+			else
+				user << "\red Access denied."
 
 		return
 
@@ -298,8 +324,35 @@
 	if(player.mob && player.mob.mind)
 		player.mob.mind.transfer_to(src)
 
-	emagged = 0
 	lawupdate = 0
 	src << "<b>Systems rebooted</b>. Loading base pattern maintenance protocol... <b>loaded</b>."
 	full_law_reset()
+	src << "<br><b>You are a maintenance drone, a tiny-brained robotic repair machine</b>."
+	src << "You have no individual will, no personality, and no drives or urges other than your laws."
+	src << "Use <b>:b</b> to talk to your fellow synthetics, or use <b>say</b> to speak silently to other drones nearby."
+	src << "Remember,  you are <b>lawed against interference with the crew</b>."
+	src << "<b>Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.</b>"
+	src << "<b>If a crewmember has noticed you, <i>you are probably breaking your first law</i></b>."
 
+/mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes)
+	if (!yes || (!istype(AM,/obj/machinery/door) && !istype(AM,/obj/machinery/recharge_station)) ) return
+	..()
+	return
+
+/mob/living/silicon/robot/drone/Bumped(AM as mob|obj)
+	return
+
+/mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM)
+
+	if(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct))
+		..()
+	else if(istype(AM,/obj/item))
+		var/obj/item/O = AM
+		if(O.w_class > 2)
+			src << "<span class='warning'>You are too small to pull that.</span>"
+			return
+		else
+			..()
+	else
+		src << "<span class='warning'>You are too small to pull that.</span>"
+		return

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

@@ -53,9 +53,12 @@
 	wrapped = null
 	//update_icon()
 
-/obj/item/weapon/gripper/afterattack(atom/target, mob/user as mob)
+/obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	return
 
-	if(!target) //Target is invalid.
+/obj/item/weapon/gripper/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+
+	if(!target || !flag) //Target is invalid or we are not adjacent.
 		return
 
 	//There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z
@@ -139,7 +142,12 @@
 		"plastic" = 0
 		)
 
-/obj/item/weapon/matter_decompiler/afterattack(atom/target, mob/user as mob)
+/obj/item/weapon/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	return
+
+/obj/item/weapon/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+
+	if(!flag) return //Not adjacent.
 
 	//We only want to deal with using this on turfs. Specific items aren't important.
 	var/turf/T = get_turf(target)
@@ -160,7 +168,7 @@
 			stored_comms["plastic"]++
 			return
 
-		else if(istype(M,/mob/living/silicon/robot/drone) && M.stat == 2 && !M.client)
+		else if(istype(M,/mob/living/silicon/robot/drone) && !M.client)
 
 			var/mob/living/silicon/robot/drone/D = src.loc
 

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

@@ -27,8 +27,11 @@
 
 /obj/machinery/drone_fabricator/process()
 
+	if(ticker.current_state < GAME_STATE_PLAYING)
+		return
+
 	if(stat & NOPOWER || !produce_drones)
-		icon_state = "drone_fab_nopower"
+		if(icon_state != "drone_fab_nopower") icon_state = "drone_fab_nopower"
 		return
 
 	if(drone_progress >= 100)

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

@@ -102,10 +102,7 @@
 		modtype = "Security"
 	else if(istype(src,/mob/living/silicon/robot/drone))
 		laws = new /datum/ai_laws/drone()
-		connected_ai = select_active_ai_with_fewest_borgs()
-		if(connected_ai)
-			connected_ai.connected_robots += src
-			lawsync()
+		connected_ai = null
 	else
 		if(mmi.alien || alien)
 			laws = new /datum/ai_laws/alienmov()
@@ -157,6 +154,7 @@
 	hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
+	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 
 	if(istype(src,/mob/living/silicon/robot/drone))
 		playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
@@ -1052,9 +1050,9 @@
 	if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access
 		return 0
 	for(var/req in req_access)
-		if(!(req in I.access)) //doesn't have this access
-			return 0
-	return 1
+		if(req in I.access) //have one of the required accesses
+			return 1
+	return 0
 
 /mob/living/silicon/robot/proc/updateicon()
 

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

@@ -46,14 +46,15 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/weapon/melee/baton/loaded(src)
-		modules += new /obj/item/weapon/extinguisher(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/crowbar(src)
-		modules += new /obj/item/device/healthanalyzer(src)
-		emag = new /obj/item/weapon/melee/energy/sword(src)
-
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
+		src.modules += new /obj/item/weapon/melee/baton/loaded(src)
+		src.modules += new /obj/item/weapon/extinguisher(src)
+		src.modules += new /obj/item/weapon/wrench(src)
+		src.modules += new /obj/item/weapon/crowbar(src)
+		src.modules += new /obj/item/device/healthanalyzer(src)
+		src.emag = new /obj/item/weapon/melee/energy/sword(src)
+		return
 
 
 /obj/item/weapon/robot_module/medical
@@ -61,7 +62,8 @@
 
 
 	New()
-		..()
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/borg/sight/hud/med(src)
 		src.modules += new /obj/item/device/healthanalyzer(src)
 		src.modules += new /obj/item/device/reagent_scanner/adv(src)
@@ -83,20 +85,22 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/meson(src)
-		emag = new /obj/item/borg/stun(src)
-		modules += new /obj/item/weapon/rcd/borg(src)
-		modules += new /obj/item/weapon/extinguisher(src)
-		modules += new /obj/item/weapon/weldingtool/largetank(src)
-		modules += new /obj/item/weapon/screwdriver(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/crowbar(src)
-		modules += new /obj/item/weapon/wirecutters(src)
-		modules += new /obj/item/device/multitool(src)
-		modules += new /obj/item/device/t_scanner(src)
-		modules += new /obj/item/device/analyzer(src)
-		modules += new /obj/item/taperoll/engineering(src)
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
+		src.modules += new /obj/item/borg/sight/meson(src)
+		src.emag = new /obj/item/borg/stun(src)
+		src.modules += new /obj/item/weapon/rcd/borg(src)
+		src.modules += new /obj/item/weapon/extinguisher(src)
+//		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/weapon/weldingtool/largetank(src)
+		src.modules += new /obj/item/weapon/screwdriver(src)
+		src.modules += new /obj/item/weapon/wrench(src)
+		src.modules += new /obj/item/weapon/crowbar(src)
+		src.modules += new /obj/item/weapon/wirecutters(src)
+		src.modules += new /obj/item/device/multitool(src)
+		src.modules += new /obj/item/device/t_scanner(src)
+		src.modules += new /obj/item/device/analyzer(src)
+		src.modules += new /obj/item/taperoll/engineering(src)
 
 		var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src)
 		M.amount = 50
@@ -134,14 +138,15 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/hud/sec(src)
-		modules += new /obj/item/weapon/handcuffs/cyborg(src)
-		modules += new /obj/item/weapon/melee/baton/loaded(src)
-		modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
-		modules += new /obj/item/taperoll/police(src)
-		emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
-
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
+		src.modules += new /obj/item/borg/sight/hud/sec(src)
+		src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
+		src.modules += new /obj/item/weapon/melee/baton/loaded(src)
+		src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
+		src.modules += new /obj/item/taperoll/police(src)
+		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
+		return
 
 
 /obj/item/weapon/robot_module/janitor
@@ -149,7 +154,8 @@
 
 
 	New()
-		..()
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 		src.modules += new /obj/item/weapon/storage/bag/trash(src)
 		src.modules += new /obj/item/weapon/mop(src)
@@ -167,7 +173,8 @@
 
 
 	New()
-		..()
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
 		src.modules += new /obj/item/weapon/pen/robopen(src)
@@ -200,21 +207,23 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/meson(src)
-		emag = new /obj/item/borg/stun(src)
-		modules += new /obj/item/weapon/storage/bag/ore(src)
-		modules += new /obj/item/weapon/pickaxe/borgdrill(src)
-		modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/pickaxe/robotic(src)
-		modules += new /obj/item/device/depth_scanner(src)
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
+		src.modules += new /obj/item/borg/sight/meson(src)
+		src.emag = new /obj/item/borg/stun(src)
+		src.modules += new /obj/item/weapon/storage/bag/ore(src)
+		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
+		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
+//		src.modules += new /obj/item/weapon/shovel(src) Uneeded due to buffed drill
+		return
 
 /obj/item/weapon/robot_module/syndicate
 	name = "syndicate robot module"
 
 
 	New()
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/weapon/melee/energy/sword(src)
 		src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src)
 		src.modules += new /obj/item/weapon/card/emag(src)
@@ -224,6 +233,8 @@
 	name = "combat robot module"
 
 	New()
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/borg/sight/thermal(src)
 		src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src)
 		src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
@@ -265,8 +276,7 @@
 		)
 
 	New()
-		//TODO: Replace with shittier flashlight and work out why we can't remove the flash. ~Z
-		..()
+		src.modules += new /obj/item/device/flashlight/drone(src)
 		src.modules += new /obj/item/weapon/weldingtool(src)
 		src.modules += new /obj/item/weapon/screwdriver(src)
 		src.modules += new /obj/item/weapon/wrench(src)
@@ -274,9 +284,9 @@
 		src.modules += new /obj/item/weapon/wirecutters(src)
 		src.modules += new /obj/item/device/multitool(src)
 		src.modules += new /obj/item/device/lightreplacer(src)
-		src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner(src)
 		src.modules += new /obj/item/weapon/gripper(src)
 		src.modules += new /obj/item/weapon/matter_decompiler(src)
+		src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
 
 		src.emag = new /obj/item/weapon/card/emag(src)
 		src.emag.name = "Cryptographic Sequencer"
@@ -290,7 +300,7 @@
 
 /obj/item/weapon/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R)
 	var/obj/item/weapon/reagent_containers/spray/cleaner/C = locate() in src.modules
-	C.reagents.add_reagent("cleaner", 10)
+	C.reagents.add_reagent("cleaner", 3)
 
 	for(var/T in stacktypes)
 		var/O = locate(T) in src.modules

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

@@ -7,7 +7,7 @@
 	var/list/alarms_to_show = list()
 	var/list/alarms_to_clear = list()
 	immune_to_ssd = 1
-	var/list/hud_list[9]
+	var/list/hud_list[10]
 	var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
 	var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
 

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

@@ -296,30 +296,31 @@
 						movement_target = S
 						break
 			if(movement_target)
-				stop_automated_movement = 1
-				step_to(src,movement_target,1)
-				sleep(3)
-				step_to(src,movement_target,1)
-				sleep(3)
-				step_to(src,movement_target,1)
+				spawn(0)
+					stop_automated_movement = 1
+					step_to(src,movement_target,1)
+					sleep(3)
+					step_to(src,movement_target,1)
+					sleep(3)
+					step_to(src,movement_target,1)
 
-				if(movement_target)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
-					if (movement_target.loc.x < src.x)
-						dir = WEST
-					else if (movement_target.loc.x > src.x)
-						dir = EAST
-					else if (movement_target.loc.y < src.y)
-						dir = SOUTH
-					else if (movement_target.loc.y > src.y)
-						dir = NORTH
-					else
-						dir = SOUTH
+					if(movement_target)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
+						if (movement_target.loc.x < src.x)
+							dir = WEST
+						else if (movement_target.loc.x > src.x)
+							dir = EAST
+						else if (movement_target.loc.y < src.y)
+							dir = SOUTH
+						else if (movement_target.loc.y > src.y)
+							dir = NORTH
+						else
+							dir = SOUTH
 
-					if(isturf(movement_target.loc) )
-						movement_target.attack_animal(src)
-					else if(ishuman(movement_target.loc) )
-						if(prob(20))
-							emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
+						if(isturf(movement_target.loc) )
+							movement_target.attack_animal(src)
+						else if(ishuman(movement_target.loc) )
+							if(prob(20))
+								emote("stares at [movement_target.loc]'s [movement_target] with a sad puppy-face")
 
 		if(prob(1))
 			emote(pick("dances around","chases its tail"))

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

@@ -127,12 +127,7 @@
 // Copy Mimic
 //
 
-var/global/list/protected_objects = list(
-	/obj/structure/table,
-	/obj/structure/cable,
-	/obj/structure/window,
-	/obj/structure/particle_accelerator // /vg/ Redmine #116
-)
+var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/cable, /obj/structure/window, /obj/item/projectile/animate)
 
 /mob/living/simple_animal/hostile/mimic/copy
 
@@ -206,4 +201,4 @@ var/global/list/protected_objects = list(
 	if(owner != creator)
 		LoseTarget()
 		creator = owner
-		faction = "\ref[owner]"
+		faction = "\ref[owner]"

code/modules/mob/mob.dm

@@ -802,6 +802,17 @@ var/list/slot_equipment_priority = list( \
 /mob/proc/is_active()
 	return (0 >= usr.stat)
 
+/mob/proc/is_mechanical()
+	if(mind && (mind.assigned_role == "Cyborg" || mind.assigned_role == "AI"))
+		return 1
+	return istype(src, /mob/living/silicon) || get_species() == "Machine"
+
+/mob/proc/is_ready()
+	return client && !!mind
+
+/mob/proc/get_gender()
+	return gender
+
 /mob/proc/see(message)
 	if(!is_active())
 		return 0
@@ -1204,4 +1215,4 @@ mob/proc/yank_out_object()
 
 	if(host)
 		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>"
+		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/mob_movement.dm

@@ -204,10 +204,10 @@
 
 	if(Process_Grab())	return
 
-	if(mob.buckled)							//if we're buckled to something, tell it we moved.
-		return mob.buckled.relaymove(mob, direct)
 
-	if(!mob.canmove)	return
+	if(!mob.canmove)
+		if (mob.buckled && (istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair))) // Exception for wheelchairs
+		else	return
 
 	//if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV))
 	//	if(!mob.Process_Spacemove(0))	return 0
@@ -255,7 +255,20 @@
 			move_delay = move_delay + tickcomp
 
 
-
+		if(mob.pulledby || mob.buckled) // Wheelchair driving!
+			if(istype(mob.loc, /turf/space))
+				return // No wheelchair driving in space
+			if(istype(mob.pulledby, /obj/structure/stool/bed/chair/wheelchair))
+				return mob.pulledby.relaymove(mob, direct)
+			else if(istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair))
+				if(ishuman(mob.buckled))
+					var/mob/living/carbon/human/driver = mob.buckled
+					var/datum/organ/external/l_hand = driver.get_organ("l_hand")
+					var/datum/organ/external/r_hand = driver.get_organ("r_hand")
+					if((!l_hand || l_hand.status & ORGAN_DESTROYED) && (!r_hand || r_hand.status & ORGAN_DESTROYED))
+						return // No hands to drive your chair? Tough luck!
+				move_delay += 2
+				return mob.buckled.relaymove(mob,direct)
 
 		//We are now going to move
 		moving = 1

code/modules/mob/new_player/new_player.dm

@@ -311,6 +311,10 @@
 		EquipCustomItems(character)
 		character.loc = pick(latejoin)
 		character.lastarea = get_area(loc)
+		// Moving wheelchair if they have one
+		if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
+			character.buckled.loc = character.loc
+			character.buckled.dir = character.dir
 
 		ticker.mode.latespawn(character)
 
@@ -318,11 +322,12 @@
 			data_core.manifest_inject(character)
 			ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.	//TODO!!!!! ~Carn
 			AnnounceArrival(character, rank)
-
+			callHook("latespawn", list(character))
 		else
 			character.Robotize()
 		del(src)
 
+
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
@@ -374,7 +379,8 @@
 		if(client.prefs.species)
 			chosen_species = all_species[client.prefs.species]
 		if(chosen_species)
-			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
+			// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
+			if(is_species_whitelisted(chosen_species) || has_admin_rights())
 				switch(chosen_species.name)
 					if("Slime People")
 						new_character = new /mob/living/carbon/human/slime(loc)
@@ -477,3 +483,31 @@
 		src << browse(null, "window=preferences") //closes job selection
 		src << browse(null, "window=mob_occupation")
 		src << browse(null, "window=latechoices") //closes late job selection
+
+
+	proc/has_admin_rights()
+		return client.holder.rights & R_ADMIN
+
+	proc/is_species_whitelisted(datum/species/S)
+		if(!S) return 1
+		return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.flags & IS_WHITELISTED)
+
+/mob/new_player/get_species()
+	var/datum/species/chosen_species
+	if(client.prefs.species)
+		chosen_species = all_species[client.prefs.species]
+
+	if(!chosen_species)
+		return "Human"
+
+	if(is_species_whitelisted(chosen_species) || has_admin_rights())
+		return chosen_species.name
+
+	return "Human"
+
+/mob/new_player/get_gender()
+	if(!client || !client.prefs) ..()
+	return client.prefs.gender
+
+/mob/new_player/is_ready()
+	return ready && ..()

code/modules/mob/new_player/preferences_setup.dm

@@ -259,223 +259,435 @@ datum/preferences
 			undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "undershirt[undershirt]_s")
 
 		var/icon/clothes_s = null
-
-		// UNIFORM DMI
-		var/uniform_dmi=current_species.uniform_icons
-		if(disabilities&DISABILITY_FLAG_FAT && current_species.fat_uniform_icons)
-			uniform_dmi=current_species.fat_uniform_icons
-
-		// SHOES DMI
-		var/feet_dmi=current_species.shoes_icons
-
-		if(!for_observer)
-			// Commenting this check so that, if all else fails, the preview icon is never naked. - N3X
-			//if(job_civilian_low & ASSISTANT) //This gives the preview icon clothes depending on which job(if any) is set to 'high'
+		var/uniform_dmi='icons/mob/uniform.dmi'
+		if(disabilities&DISABILITY_FLAG_FAT)
+			uniform_dmi='icons/mob/uniform_fat.dmi'
+		if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
 			clothes_s = new /icon(uniform_dmi, "grey_s")
-			clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-			clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			if(backbag == 2)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+			else if(backbag == 3 || backbag == 4)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
-			//else
-			if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
-				switch(job_civilian_high)
-					if(HOP)
-						clothes_s = new /icon(uniform_dmi, "hop_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(BARTENDER)
-						clothes_s = new /icon(uniform_dmi, "ba_suit_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(BOTANIST)
-						clothes_s = new /icon(uniform_dmi, "hydroponics_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-hyd")
-					if(CHEF)
-						clothes_s = new /icon(uniform_dmi, "chef_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(JANITOR)
-						clothes_s = new /icon(uniform_dmi, "janitor_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(LIBRARIAN)
-						clothes_s = new /icon(uniform_dmi, "red_suit_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(QUARTERMASTER)
-						clothes_s = new /icon(uniform_dmi, "qm_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sun"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "clipboard"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(CARGOTECH)
-						clothes_s = new /icon(uniform_dmi, "cargotech_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(MINER)
-						clothes_s = new /icon(uniform_dmi, "miner_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-eng")
-					if(LAWYER)
-						clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(CHAPLAIN)
-						clothes_s = new /icon(uniform_dmi, "chapblack_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(CLOWN)
-						clothes_s = new /icon(uniform_dmi, "clown_s")
-						clothes_s.Blend(new /icon(feet_dmi, "clown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
-					if(MIME)
-						clothes_s = new /icon(uniform_dmi, "mime_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
+		else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
+			switch(job_civilian_high)
+				if(HOP)
+					clothes_s = new /icon(uniform_dmi, "hop_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BARTENDER)
+					clothes_s = new /icon(uniform_dmi, "ba_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BOTANIST)
+					clothes_s = new /icon(uniform_dmi, "hydroponics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEF)
+					clothes_s = new /icon(uniform_dmi, "chef_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(JANITOR)
+					clothes_s = new /icon(uniform_dmi, "janitor_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LIBRARIAN)
+					clothes_s = new /icon(uniform_dmi, "red_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(QUARTERMASTER)
+					clothes_s = new /icon(uniform_dmi, "qm_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CARGOTECH)
+					clothes_s = new /icon(uniform_dmi, "cargotech_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(MINER)
+					clothes_s = new /icon(uniform_dmi, "miner_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LAWYER)
+					clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHAPLAIN)
+					clothes_s = new /icon(uniform_dmi, "chapblack_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CLOWN)
+					clothes_s = new /icon(uniform_dmi, "clown_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
+				if(MIME)
+					clothes_s = new /icon(uniform_dmi, "mime_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
-			else if(job_medsci_high)
-				switch(job_medsci_high)
-					if(RD)
-						clothes_s = new /icon(uniform_dmi, "director_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "clipboard"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-tox")
-					if(SCIENTIST)
-						clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
-						clothes_s.Blend(new /icon(feet_dmi, "white"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-tox")
-					if(CHEMIST)
-						clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
-						clothes_s.Blend(new /icon(feet_dmi, "white"), ICON_UNDERLAY)
+		else if(job_medsci_high)
+			switch(job_medsci_high)
+				if(RD)
+					clothes_s = new /icon(uniform_dmi, "director_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(SCIENTIST)
+					clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEMIST)
+					clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
+					else
 						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-chem")
-					if(CMO)
-						clothes_s = new /icon(uniform_dmi, "cmo_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CMO)
+					clothes_s = new /icon(uniform_dmi, "cmo_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
+					else
 						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-med")
-					if(DOCTOR)
-						clothes_s = new /icon(uniform_dmi, "medical_s")
-						clothes_s.Blend(new /icon(feet_dmi, "white"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DOCTOR)
+					clothes_s = new /icon(uniform_dmi, "medical_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
+					else
 						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-med","medicalpack")
-					if(GENETICIST)
-						clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
-						clothes_s.Blend(new /icon(feet_dmi, "white"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(GENETICIST)
+					clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
+					else
 						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-gen")
-					if(VIROLOGIST)
-						clothes_s = new /icon(uniform_dmi, "virologywhite_s")
-						clothes_s.Blend(new /icon(feet_dmi, "white"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-vir","medicalpack")
-					if(ROBOTICIST)
-						clothes_s = new /icon(uniform_dmi, "robotics_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(VIROLOGIST)
+					clothes_s = new /icon(uniform_dmi, "virologywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ROBOTICIST)
+					clothes_s = new /icon(uniform_dmi, "robotics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					if(prob(1))
 						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
-			else if(job_engsec_high)
-				switch(job_engsec_high)
-					if(CAPTAIN)
-						clothes_s = new /icon(uniform_dmi, "captain_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
+		else if(job_engsec_high)
+			switch(job_engsec_high)
+				if(CAPTAIN)
+					clothes_s = new /icon(uniform_dmi, "captain_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
+					else
 						clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(HOS)
+					clothes_s = new /icon(uniform_dmi, "hosred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberet"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(WARDEN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DETECTIVE)
+					clothes_s = new /icon(uniform_dmi, "detective_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
 						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sun"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "caparmor"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-cap")
-					if(HOS)
-						clothes_s = new /icon(uniform_dmi, "hosred_s")
-						clothes_s.Blend(new /icon(feet_dmi, "jackboots"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-sec","securitypack")
-					if(WARDEN)
-						clothes_s = new /icon(uniform_dmi, "warden_s")
-						clothes_s.Blend(new /icon(feet_dmi, "jackboots"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-sec","securitypack")
-					if(DETECTIVE)
-						clothes_s = new /icon(uniform_dmi, "detective_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(OFFICER)
-						clothes_s = new /icon(uniform_dmi, "secred_s")
-						clothes_s.Blend(new /icon(feet_dmi, "jackboots"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-sec","securitypack")
-					if(CHIEF)
-						clothes_s = new /icon(uniform_dmi, "chief_s")
-						clothes_s.Blend(new /icon(feet_dmi, "brown"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-eng","engiepack")
-					if(ENGINEER)
-						clothes_s = new /icon(uniform_dmi, "engine_s")
-						clothes_s.Blend(new /icon(feet_dmi, "orange"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-eng","engiepack")
-					if(ATMOSTECH)
-						clothes_s = new /icon(uniform_dmi, "atmos_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(ROBOTICIST)
-						clothes_s = new /icon(uniform_dmi, "robotics_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
-						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
-						clothes_s = new /icon(uniform_dmi, "grey_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
-					if(CYBORG)
-						clothes_s = new /icon(uniform_dmi, "grey_s")
-						clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-						clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(OFFICER)
+					clothes_s = new /icon(uniform_dmi, "secred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "officerberet"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHIEF)
+					clothes_s = new /icon(uniform_dmi, "chief_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ENGINEER)
+					clothes_s = new /icon(uniform_dmi, "engine_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ATMOSTECH)
+					clothes_s = new /icon(uniform_dmi, "atmos_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
+					clothes_s = new /icon(uniform_dmi, "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CYBORG)
+					clothes_s = new /icon(uniform_dmi, "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		if(disabilities & NEARSIGHTED)
+			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
 
 		// Observers get tourist outfit.
 		if(for_observer)
 			clothes_s = new /icon(uniform_dmi, "tourist_s")
-			clothes_s.Blend(new /icon(feet_dmi, "black"), ICON_UNDERLAY)
-			clothes_s=blend_backpack(clothes_s,backbag,"satchel-norm")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			if(backbag == 2)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+			else if(backbag == 3 || backbag == 4)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
 
 		preview_icon.Blend(eyes_s, ICON_OVERLAY)
@@ -491,4 +703,4 @@ datum/preferences
 		del(eyes_s)
 		del(underwear_s)
 		del(undershirt_s)
-		del(clothes_s)
+		del(clothes_s)

code/modules/organs/organ_external.dm

@@ -378,11 +378,13 @@ This function completely restores a damaged organ to perfect condition.
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
-			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
+			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
+			var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
+			if(!bicardose || !inaprovaline)	//bicaridine and inaprovaline stop internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 
-			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
+			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 

code/modules/organs/pain.dm

@@ -91,7 +91,7 @@ mob/living/carbon/human/proc/handle_pain()
 	for(var/datum/organ/external/E in organs)
 		// amputated limbs don't cause pain
 		if(E.amputated) continue
-		if(E.status & ORGAN_DEAD) continue
+		if(E.status & ORGAN_DEAD|ORGAN_ROBOT) continue
 		var/dam = E.get_damage()
 		// make the choice of the organ depend on damage,
 		// but also sometimes use one of the less damaged ones

code/modules/paperwork/paper.dm

@@ -182,6 +182,13 @@
 		t = replacetext(t, "\[/small\]", "</font>")
 		t = replacetext(t, "\[list\]", "<ul>")
 		t = replacetext(t, "\[/list\]", "</ul>")
+		t = replacetext(t, "\[table\]", "<table border=1 cellspacing=0 cellpadding=3 style='border: 1px solid black;'>")
+		t = replacetext(t, "\[/table\]", "</td></tr></table>")
+		t = replacetext(t, "\[grid\]", "<table>")
+		t = replacetext(t, "\[/grid\]", "</td></tr></table>")
+		t = replacetext(t, "\[row\]", "</td><tr>")
+		t = replacetext(t, "\[cell\]", "<td>")
+		t = replacetext(t, "\[logo\]", "<img src = http://baystation12.net/wiki/logo.png>")
 
 		t = "<font face=\"[deffont]\" color=[P.colour]>[t]</font>"
 	else // If it is a crayon, and he still tries to use these, make them empty!
@@ -191,6 +198,11 @@
 		t = replacetext(t, "\[/small\]", "")
 		t = replacetext(t, "\[list\]", "")
 		t = replacetext(t, "\[/list\]", "")
+		t = replacetext(t, "\[table\]", "")
+		t = replacetext(t, "\[/table\]", "")
+		t = replacetext(t, "\[row\]", "")
+		t = replacetext(t, "\[cell\]", "")
+		t = replacetext(t, "\[logo\]", "")
 
 		t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
 
@@ -273,7 +285,7 @@
 
 		if((!in_range(src, usr) && loc != usr && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != usr && usr.get_active_hand() != i)) // Some check to see if he's allowed to write
 			return
-
+/*
 		t = checkhtml(t)
 
 		// check for exploits
@@ -283,7 +295,8 @@
 				log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
 				message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
 				return
-
+*/
+		t = html_encode(t)
 		t = replacetext(t, "\n", "<BR>")
 		t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html
 

code/modules/paperwork/pen.dm

@@ -49,7 +49,6 @@
 //	M << "\red You feel a tiny prick!" //That's a whole lot of meta!
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
-	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(!iscarbon(user))
 		M.LAssailant = null
 	else
@@ -76,9 +75,10 @@
 
 
 /obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
-	if(!(istype(M,/mob)))
+	if(!ismob(M))
 		return
 	..()
+	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(reagents.total_volume)
 		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
 	return
@@ -93,9 +93,10 @@
 
 
 /obj/item/weapon/pen/paralysis/attack(mob/M as mob, mob/user as mob)
-	if(!(istype(M,/mob)))
+	if(!ismob(M))
 		return
 	..()
+	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(reagents.total_volume)
 		if(M.reagents) reagents.trans_to(M, 50)
 	return
@@ -106,7 +107,6 @@
 	reagents = R
 	R.my_atom = src
 	R.add_reagent("zombiepowder", 10)
-	R.add_reagent("impedrezene", 25)
 	R.add_reagent("cryptobiolin", 15)
 	..()
-	return
+	return

code/modules/power/cable.dm

@@ -620,39 +620,19 @@ obj/structure/cable/proc/cableColor(var/colorC)
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
 			return ..()
 
-		if(S.burn_dam > 0 && use(1))
-			S.heal_damage(0,15,0,1)
-
-			if(user != M)
-				user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\
-				"\red You repair some burn damage on your [S.display_name]",\
-				"You hear wires being cut.")
-			else
-				user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\
-				"\red You repair some burn damage on your [S.display_name]",\
-				"You hear wires being cut.")
-
-			return
-
 		if(istype(M,/mob/living/carbon/human))
-
 			var/mob/living/carbon/human/H = M
-
 			if(H.species.flags & IS_SYNTHETIC)
-
-				if(H.getFireLoss() > 0)
-
-					if(M == user)
-						user << "\red You can't repair damage to your own body - it's against OH&S."
-						return
-
-					user.visible_message("<span class='notice'>\The [user] repairs some burn damage on [M]  with \the [src]</span>",\
-						"<span class='notice'>You repair some of \the [M]'s burn damage.</span>",\
-						"You hear wires being cut.")
-					H.heal_overall_damage(0,5)
+				if(M == user)
+					user << "\red You can't repair damage to your own body - it's against OH&S."
 					return
 
-		user << "Nothing to fix!"
+		if(S.burn_dam > 0 && use(1))
+			S.heal_damage(0,15,0,1)
+			user.visible_message("\red \The [user] repairs some burn damage on \the [M]'s [S.display_name] with \the [src].")
+			return
+		else
+			user << "Nothing to fix!"
 
 	else
 		return ..()

code/modules/power/turbine.dm

@@ -31,6 +31,7 @@
 	desc = "A computer to remotely control a gas turbine"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "airtunnel0e"
+	circuit = /obj/item/weapon/circuitboard/turbine_control
 	anchored = 1
 	density = 1
 	var/obj/machinery/compressor/compressor
@@ -220,6 +221,7 @@
 			if(P.id == id)
 				doors += P
 
+/*
 /obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -252,6 +254,7 @@
 	else
 		src.attack_hand(user)
 	return
+*/
 
 /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
 	user.machine = src

code/modules/projectiles/guns/energy/nuclear.dm

@@ -5,7 +5,6 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_sound = 'sound/weapons/Taser.ogg'
 
-	charge_cost = 100 //How much energy is needed to fire.
 	projectile_type = "/obj/item/projectile/beam/stun"
 	origin_tech = "combat=3;magnets=2"
 	modifystate = "energystun"
@@ -58,7 +57,7 @@
 		if(!power_supply) return 0
 		if((power_supply.charge / power_supply.maxcharge) != 1)
 			if(!failcheck())	return 0
-			power_supply.give(100)
+			power_supply.give(1000)
 			update_icon()
 		return 1
 

code/modules/projectiles/guns/energy/pulse.dm

@@ -5,7 +5,7 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	force = 10
 	fire_sound = 'sound/weapons/pulse.ogg'
-	charge_cost = 200
+	charge_cost = 2000
 	projectile_type = "/obj/item/projectile/beam/pulse"
 	cell_type = "/obj/item/weapon/cell/super"
 	var/mode = 2

code/modules/projectiles/guns/energy/special.dm

@@ -8,7 +8,6 @@
 	w_class = 4.0
 	flags =  FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BACK
-	charge_cost = 100
 	projectile_type = "/obj/item/projectile/ion"
 
 /obj/item/weapon/gun/energy/ionrifle/emp_act(severity)
@@ -24,7 +23,6 @@
 	icon_state = "decloner"
 	fire_sound = 'sound/weapons/pulse3.ogg'
 	origin_tech = "combat=5;materials=4;powerstorage=3"
-	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/declone"
 
 
@@ -34,7 +32,6 @@
 	icon_state = "floramut100"
 	item_state = "obj/item/gun.dmi"
 	fire_sound = 'sound/effects/stealthoff.ogg'
-	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/floramut"
 	origin_tech = "materials=2;biotech=3;powerstorage=3"
 	modifystate = "floramut"
@@ -56,7 +53,7 @@
 		if(charge_tick < 4) return 0
 		charge_tick = 0
 		if(!power_supply) return 0
-		power_supply.give(100)
+		power_supply.give(1000)
 		update_icon()
 		return 1
 
@@ -64,13 +61,13 @@
 		switch(mode)
 			if(0)
 				mode = 1
-				charge_cost = 100
+				charge_cost = 1000
 				user << "\red The [src.name] is now set to increase yield."
 				projectile_type = "/obj/item/projectile/energy/florayield"
 				modifystate = "florayield"
 			if(1)
 				mode = 0
-				charge_cost = 100
+				charge_cost = 1000
 				user << "\red The [src.name] is now set to induce mutations."
 				projectile_type = "/obj/item/projectile/energy/floramut"
 				modifystate = "floramut"
@@ -84,7 +81,6 @@
 	item_state = "c20r"
 	w_class = 4
 	projectile_type = "/obj/item/projectile/meteor"
-	charge_cost = 100
 	cell_type = "/obj/item/weapon/cell/potato"
 	clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
 	var/charge_tick = 0
@@ -104,7 +100,7 @@
 		if(charge_tick < recharge_time) return 0
 		charge_tick = 0
 		if(!power_supply) return 0
-		power_supply.give(100)
+		power_supply.give(1000)
 
 	update_icon()
 		return
@@ -212,10 +208,10 @@ obj/item/weapon/gun/energy/staff/focus
 	item_state = "shotgun"
 	projectile_type = "/obj/item/projectile/kinetic"
 	cell_type = "/obj/item/weapon/cell/crap"
-	charge_cost = 500
+	charge_cost = 5000
 	fire_delay = 20
 
 /obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(var/mob/living/user/L)
-	power_supply.give(500)
+	power_supply.give(5000)
 	playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1)
 	return

code/modules/projectiles/guns/energy/stun.dm

@@ -5,7 +5,6 @@
 	icon_state = "taser"
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_sound = 'sound/weapons/Taser.ogg'
-	charge_cost = 100
 	projectile_type = "/obj/item/projectile/beam/stun"
 	cell_type = "/obj/item/weapon/cell/crap"
 
@@ -14,7 +13,6 @@
 	desc = "A small, low capacity gun used for non-lethal takedowns."
 	icon_state = "taser"
 	fire_sound = 'sound/weapons/Taser.ogg'
-	charge_cost = 100
 	projectile_type = "/obj/item/projectile/beam/stun"
 	cell_type = "/obj/item/weapon/cell/secborg"
 	var/charge_tick = 0
@@ -53,7 +51,7 @@
 	icon_state = "stunrevolver"
 	fire_sound = 'sound/weapons/Taser.ogg'
 	origin_tech = "combat=3;materials=3;powerstorage=2"
-	charge_cost = 125
+	charge_cost = 1250
 	projectile_type = "/obj/item/projectile/beam/stun"
 	cell_type = "/obj/item/weapon/cell"
 

code/modules/projectiles/projectile.dm

@@ -123,14 +123,16 @@
 				if(istype(firer, /mob))
 					M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
 					firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
-					msg_admin_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
+					if(M.ckey)
+						msg_admin_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
 					if(!iscarbon(firer))
 						M.LAssailant = null
 					else
 						M.LAssailant = firer
 				else
 					M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-					msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
+					if(M.ckey)
+						msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
 
 		if(A)
 			if (!forcedodge)

code/modules/projectiles/projectile/beams.dm

@@ -396,5 +396,6 @@ var/list/beam_master = list()
 	name = "stun beam"
 	icon_state = "stun"
 	nodamage = 1
+	damage = 0
 	agony = 40
 	damage_type = HALLOSS

code/modules/reagents/Chemistry-Machinery.dm

@@ -590,8 +590,9 @@
 	anchored = 1
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "mixer0"
-	use_power = 1
-	idle_power_usage = 20
+	circuit = /obj/item/weapon/circuitboard/pandemic
+	//use_power = 1
+	//idle_power_usage = 20		//defaults make more sense.
 	var/temphtml = ""
 	var/wait = null
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
@@ -820,33 +821,7 @@
 
 
 /obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe(src.loc)
-				getFromPool(/obj/item/weapon/shard, loc)
-				var/obj/item/weapon/circuitboard/pandemic/M = new /obj/item/weapon/circuitboard/pandemic(A)
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/pandemic/M = new /obj/item/weapon/circuitboard/pandemic(A)
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else if(istype(I, /obj/item/weapon/reagent_containers/glass))
+	if(istype(I, /obj/item/weapon/reagent_containers/glass))
 		if(stat & (NOPOWER|BROKEN)) return
 		if(src.beaker)
 			user << "A beaker is already loaded into the machine."

code/modules/reagents/Chemistry-Reagents.dm

@@ -30,6 +30,7 @@ datum
 		var/mildly_toxic = 0
 		var/overdose = 0
 		var/overdose_dam = 1
+		var/addictiveness = 1
 		//var/list/viruses = list()
 		var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
 
@@ -64,6 +65,19 @@ datum
 						if(prob(chance) && !block)
 							if(M.reagents)
 								M.reagents.add_reagent(self.id,self.volume/2)
+
+
+				if(method == INGEST && istype(M, /mob/living/carbon))
+					if(prob(1 * self.addictiveness))
+						if(prob(5 * volume))
+							var/datum/disease/addiction/A = new /datum/disease/addiction
+							A.addicted_to = self
+							A.name = "[self.name] Addiction"
+							A.addiction ="[self.name]"
+							A.cure = self.id
+							M.viruses += A
+							A.affected_mob = M
+							A.holder = M
 				return 1
 
 			reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object
@@ -579,6 +593,7 @@ datum
 			description = "An illegal chemical compound used as drug."
 			reagent_state = LIQUID
 			color = "#60A584" // rgb: 96, 165, 132
+			addictiveness = 25
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -789,7 +804,8 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
-				if(!istype(T, /turf/space))
+				// Only add one dirt per turf.  Was causing people to crash.
+				if(!istype(T, /turf/space) && !(locate(/obj/effect/decal/cleanable/dirt) in T))
 					new /obj/effect/decal/cleanable/dirt(T)
 
 		chlorine
@@ -1144,6 +1160,7 @@ datum
 			color = "#C855DC"
 			overdose_dam = 0
 			overdose = 60
+			addictiveness = 5
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1185,6 +1202,7 @@ datum
 			description = "A simple, yet effective painkiller."
 			reagent_state = LIQUID
 			color = "#FAEBD7" //rgb 250, 235, 215
+			addictiveness = 50
 
 		oxycodone
 			name = "Oxycodone"
@@ -1192,6 +1210,7 @@ datum
 			description = "An effective and very addictive painkiller."
 			reagent_state = LIQUID
 			color = "#8A2BE2" // rgb 138, 43, 226
+			addictiveness = 80
 
 		virus_food
 			name = "Virus Food"
@@ -1856,12 +1875,24 @@ datum
 				..()
 				return
 
+		benazine
+			name = "Benazine"
+			id = "benazine"
+			description = "An innocuous cold medicine, good against Coldingtons. It is also the precursor of the highly addictive stiumlant hyperzine."
+			reagent_state = LIQUID
+			color = "#CCFF00" // rgb: 204, 255, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				..()
+				return
+
 		hyperzine
 			name = "Hyperzine"
 			id = "hyperzine"
-			description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
-			reagent_state = LIQUID
-			color = "#CCFF00" // rgb: 204, 255, 0
+			description = "Hyperzine is a highly effective, long lasting, muscle stimulant. It is highly addictive."
+			reagent_state = SOLID
+			color = "#FFFFFF" // rgb: 255,255,255
+			addictiveness = 80
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1975,7 +2006,10 @@ datum
 
 			on_mob_life(var/mob/living/carbon/M as mob)
 				if(!M) M = holder.my_atom
-				M.status_flags |= FAKEDEATH
+				if(volume >= 1) //Hotfix for Fakedeath never ending.
+					M.status_flags |= FAKEDEATH
+				else
+					M.status_flags &= ~FAKEDEATH
 				M.adjustOxyLoss(0.5*REM)
 				M.adjustToxLoss(0.5*REM)
 				M.Weaken(10)
@@ -1984,11 +2018,11 @@ datum
 				..()
 				return
 
-			Del()
+			/*Del()
 				if(holder && ismob(holder.my_atom))
 					var/mob/M = holder.my_atom
 					M.status_flags &= ~FAKEDEATH
-				..()
+				..()8*/
 
 		mindbreaker
 			name = "Mindbreaker Toxin"
@@ -1997,6 +2031,7 @@ datum
 			reagent_state = LIQUID
 			color = "#B31008" // rgb: 139, 166, 233
 			custom_metabolism = 0.05
+			addictiveness = 15
 
 			on_mob_life(var/mob/living/M)
 				if(!M) M = holder.my_atom
@@ -2084,6 +2119,7 @@ datum
 			description = "A highly addictive stimulant extracted from the tobacco plant."
 			reagent_state = LIQUID
 			color = "#181818" // rgb: 24, 24, 24
+			addictiveness = 90
 /*
 		ethanol
 			name = "Ethanol"

code/modules/reagents/Chemistry-Recipes.dm

@@ -29,17 +29,27 @@ datum
 			required_reagents = list("water" = 1, "potassium" = 1)
 			result_amount = 2
 			on_reaction(var/datum/reagents/holder, var/created_volume)
-				var/datum/effect/effect/system/reagents_explosion/e = new()
-				e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
-				e.holder_damage(holder.my_atom)
-				if(isliving(holder.my_atom))
-					e.amount *= 0.5
-					var/mob/living/L = holder.my_atom
-					if(L.stat!=DEAD)
+
+				if(holder.has_reagent("benazine"))
+					if(istype(holder.my_atom.loc, /obj/machinery/bunsen_burner))
+						if(holder.my_atom.loc:heated)
+							var/bvolume = holder.get_reagent_amount("benazine")
+							if(bvolume > created_volume / 2)
+								bvolume = created_volume
+							holder.add_reagent("hyperzine", bvolume)
+							holder.isolate_reagent("hyperzine")
+				else
+					var/datum/effect/effect/system/reagents_explosion/e = new()
+					e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
+					e.holder_damage(holder.my_atom)
+					if(isliving(holder.my_atom))
 						e.amount *= 0.5
-				e.start()
-				holder.clear_reagents()
-				return
+						var/mob/living/L = holder.my_atom
+						if(L.stat!=DEAD)
+							e.amount *= 0.5
+					e.start()
+					holder.clear_reagents()
+					return
 
 		emp_pulse
 			name = "EMP Pulse"
@@ -269,12 +279,24 @@ datum
 			required_reagents = list("inaprovaline" = 1, "carbon" = 1)
 			result_amount = 2
 
+		benazine
+			name = "Benazine"
+			id = "benarzine"
+			result = "benazine"
+			required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,)
+			result_amount = 3
+
+/*
+		Made with benazine and potassium/water combo sekrit recipe.
+
 		hyperzine
 			name = "Hyperzine"
 			id = "hyperzine"
 			result = "hyperzine"
-			required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,)
+			required_reagents = list("benazine" = 1, "potassium" = 1, "water" = 1,)
 			result_amount = 3
+			requires_heating = 1
+*/
 
 		ryetalyn
 			name = "Ryetalyn"

code/modules/reagents/dartgun.dm

@@ -179,7 +179,8 @@
 					if (istype(M, /mob))
 						M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
 						user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
-						msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a dartgun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+						if(M.ckey)
+							msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a dartgun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 						if(!iscarbon(user))
 							M.LAssailant = null
 						else

code/modules/reagents/reagent_containers/dropper.dm

@@ -72,7 +72,8 @@
 				var/contained = english_list(injected)
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
-				msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				if(M.ckey)
+					msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 				if(!iscarbon(user))
 					M.LAssailant = null
 				else

code/modules/reagents/reagent_containers/drugs.dm

@@ -0,0 +1,145 @@
+/obj/item/weapon/reagent_containers/drugs
+	name = " "
+	var/base_name = " "
+	desc = " "
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "baggie"
+	item_state = "beaker"
+	amount_per_transfer_from_this = 2
+	possible_transfer_amounts = 2
+	volume = 10
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+
+	var/label_text = ""
+
+	New()
+		..()
+		src.pixel_x = rand(-10.0, 10) //Randomizes postion
+		src.pixel_y = rand(-10.0, 10)
+		base_name = name
+
+
+	examine()
+		set src in view()
+		..()
+		if (!(usr in view(2)) && usr!=src.loc) return
+		usr << "\blue It contains:"
+		if(reagents && reagents.reagent_list.len)
+			usr << "\blue [src.reagents.total_volume] units of powder."
+		else
+			usr << "\blue Nothing."
+
+	afterattack(obj/target, mob/user, proximity)
+		if(!proximity) return
+
+		if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
+
+			if(!target.reagents.total_volume && target.reagents)
+				user << "\red [target] is empty."
+				return
+
+			if(reagents.total_volume >= reagents.maximum_volume)
+				user << "\red [src] is full."
+				return
+
+			for(var/datum/reagent/A in target.reagents.reagent_list)
+				if(A.reagent_state != 1)
+					user << "\red You can only put powders in [src]."
+					return
+
+			var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
+			user << "\blue You fill [src] with [trans] units of the contents of [target]."
+
+		else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
+			if(!reagents.total_volume)
+				user << "\red [src] is empty."
+				return
+
+			if(target.reagents.total_volume >= target.reagents.maximum_volume)
+				user << "\red [target] is full."
+				return
+
+			// /vg/: Logging transfers of bad things
+			if(target.reagents_to_log.len)
+				var/list/badshit=list()
+				for(var/bad_reagent in target.reagents_to_log)
+					if(reagents.has_reagent(bad_reagent))
+						badshit += reagents_to_log[bad_reagent]
+				if(badshit.len)
+					var/hl="\red <b>([english_list(badshit)])</b> \black"
+					message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+					log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+
+			var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+			user << "\blue You transfer [trans] units of the solution to [target]."
+
+		//Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary.
+		else if(istype(target, /obj/item/clothing/suit/space/space_ninja))
+			return
+
+		else if(istype(target, /obj/machinery/bunsen_burner))
+			return
+
+		else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
+			return
+
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
+			var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
+			if(length(tmp_label) > 10)
+				user << "\red The label can be at most 10 characters long."
+			else
+				user << "\blue You set the label to \"[tmp_label]\"."
+				src.label_text = tmp_label
+				src.update_name_label()
+
+	proc/update_name_label()
+		if(src.label_text == "")
+			src.name = src.base_name
+		else
+			src.name = "[src.base_name] ([src.label_text])"
+
+/obj/item/weapon/reagent_containers/drugs/baggie
+	name = "baggie"
+	desc = "A baggie. Can hold up to 10 units."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "baggie"
+	item_state = "beaker"
+
+	on_reagent_change()
+		update_icon()
+
+	pickup(mob/user)
+		..()
+		update_icon()
+
+	dropped(mob/user)
+		..()
+		update_icon()
+
+	attack_hand()
+		..()
+		update_icon()
+
+	update_icon()
+		overlays.Cut()
+
+		if(reagents.total_volume)
+			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]2")
+
+			switch(reagents.total_volume)
+				if(0 to 2)	filling.icon_state = "[icon_state]2"
+				if(3 to 4) 	filling.icon_state = "[icon_state]4"
+				if(5 to 6)	filling.icon_state = "[icon_state]6"
+				if(7 to 8)	filling.icon_state = "[icon_state]8"
+				if(9 to 10)	filling.icon_state = "[icon_state]10"
+
+
+			filling.icon += mix_color_from_reagents(reagents.reagent_list)
+			overlays += filling
+
+/obj/item/weapon/reagent_containers/drugs/baggie/meth
+	New()
+		..()
+		reagents.add_reagent("hyperzine", 10)

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -50,7 +50,8 @@
 
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-		msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+		if(M.ckey)
+			msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		if(!iscarbon(user))
 			M.LAssailant = null
 		else

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -99,7 +99,8 @@
 	//Attack logs
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has attacked [target.name] ([target.ckey]) with a bottle!</font>")
 	target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been smashed with a bottle by [user.name] ([user.ckey])</font>")
-	msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+	if(target.ckey)
+		msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(!iscarbon(user))
 		target.LAssailant = null
 	else

code/modules/reagents/reagent_containers/glass.dm

@@ -88,7 +88,8 @@
 			var/contained = english_list(injected)
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been splashed with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to splash [M.name] ([M.key]). Reagents: [contained]</font>")
-			msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			if(M.ckey)
+				msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else

code/modules/reagents/reagent_containers/hypospray.dm

@@ -42,7 +42,8 @@
 			var/contained = english_list(injected)
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]</font>")
-			msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			if(M.ckey)
+				msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else

code/modules/reagents/reagent_containers/pill.dm

@@ -55,7 +55,8 @@
 
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-			msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			if(M.ckey)
+				msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else

code/modules/reagents/reagent_containers/robodropper.dm

@@ -80,7 +80,8 @@
 				var/contained = english_list(injected)
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
-				msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				if(M.ckey)
+					msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 				if(!iscarbon(user))
 					M.LAssailant = null
 				else

code/modules/reagents/reagent_containers/spray.dm

@@ -107,11 +107,14 @@
 	name = "space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
 
+/obj/item/weapon/reagent_containers/spray/cleaner/drone
+	name = "space cleaner"
+	desc = "BLAM!-brand non-foaming space cleaner!"
+	volume = 50
 
 /obj/item/weapon/reagent_containers/spray/cleaner/New()
 	..()
-	reagents.add_reagent("cleaner", 250)
-
+	reagents.add_reagent("cleaner", src.volume)
 //pepperspray
 /obj/item/weapon/reagent_containers/spray/pepper
 	name = "pepperspray"

code/modules/reagents/reagent_containers/syringes.dm

@@ -163,7 +163,8 @@
 						var/contained = english_list(injected)
 						M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 						user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]</font>")
-						msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+						if(M.ckey)
+							msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 						if(!iscarbon(user))
 							M.LAssailant = null
 						else
@@ -247,7 +248,8 @@
 
 		user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 		target.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
-		msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+		if(target.ckey)
+			msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		if(!iscarbon(user))
 			target.LAssailant = null
 		else

code/modules/reagents/reagent_dispenser.dm

@@ -172,8 +172,11 @@
 
 
 /obj/structure/reagent_dispensers/fueltank/Move()
-	if (..() && modded)
+	..()
+	if(modded)
 		leak_fuel(amount_per_transfer_from_this)
+	if(rig)
+		rig.process_movement()
 
 /obj/structure/reagent_dispensers/fueltank/proc/leak_fuel(amount)
 	if (reagents.total_volume == 0)
@@ -183,6 +186,23 @@
 	reagents.remove_reagent("fuel",amount)
 	new /obj/effect/decal/cleanable/liquid_fuel(src.loc, amount)
 
+/obj/structure/reagent_dispensers/fueltank/HasProximity(atom/movable/AM)
+	if(rig)
+		rig.HasProximity(AM)
+
+/obj/structure/reagent_dispensers/fueltank/Crossed(atom/movable/AM)
+	if(rig)
+		rig.Crossed(AM)
+
+/obj/structure/reagent_dispensers/fueltank/hear_talk(mob/living/M, msg)
+	if(rig)
+		rig.hear_talk(M, msg)
+
+/obj/structure/reagent_dispensers/fueltank/Bump()
+	..()
+	if(rig)
+		rig.process_movement()
+
 /obj/structure/reagent_dispensers/peppertank
 	name = "Pepper Spray Refiller"
 	desc = "Refill pepper spray canisters."

code/modules/reagents/syringe_gun.dm

@@ -87,7 +87,8 @@
 					if (istype(M, /mob))
 						M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
 						user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
-						msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+						if(M.ckey)
+							msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 						if(!iscarbon(user))
 							M.LAssailant = null
 						else

code/modules/recycling/disposal.dm

@@ -118,7 +118,8 @@
 					del(G)
 					usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [GM.name] ([GM.ckey]) in disposals.</font>")
 					GM.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been placed in disposals by [usr.name] ([usr.ckey])</font>")
-					msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
+					if(GM.ckey)
+						msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
 			return
 
 		if(!I)	return
@@ -164,7 +165,8 @@
 
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [target.name] ([target.ckey]) in disposals.</font>")
 			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been placed in disposals by [user.name] ([user.ckey])</font>")
-			msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			if(target.ckey)
+				msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		else
 			return
 		if (target.client)

code/modules/research/designs.dm

@@ -12,6 +12,7 @@ The currently supporting non-reagent materials:
 - $metal (/obj/item/stack/metal). One sheet = 3750 units.
 - $glass (/obj/item/stack/glass). One sheet = 3750 units.
 - $plasma (/obj/item/stack/plasma). One sheet = 3750 units.
+- $plasteel (/obj/item/stack/sheet/plasteel). One sheet = 3750 units.
 - $silver (/obj/item/stack/silver). One sheet = 3750 units.
 - $gold (/obj/item/stack/gold). One sheet = 3750 units.
 - $uranium (/obj/item/stack/uranium). One sheet = 3750 units.
@@ -1609,6 +1610,100 @@ datum/design/plasmapistol
 	materials = list("$metal" = 5000, "$glass" = 1000, "$plasma" = 3000)
 	build_path = "/obj/item/weapon/gun/energy/toxgun"
 
+/////////////////////////////////////////
+/////////////////Armor///////////////////
+/////////////////////////////////////////
+
+datum/design/powerarmor
+	name = "Powered armor suit"
+	desc = "The frame for Centcom's patented powered armor."
+	id = "powerarmor"
+	req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasteel" = 4000)
+	build_path = /obj/item/clothing/suit/space/powered
+
+datum/design/powerarmor_helmet
+	name = "Powered armor helmet"
+	desc = "The frame for Centcom's patented powered armor."
+	id = "powerarmorhelmet"
+	req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 3750, "$glass" = 3750, "$plasteel" = 2000)
+	build_path = /obj/item/clothing/head/space/powered
+
+datum/design/powerarmor_gloves
+	name = "Powered armor gloves"
+	desc = "The frame for Centcom's patented powered armor."
+	id = "powerarmorgloves"
+	req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasteel" = 2000)
+	build_path = /obj/item/clothing/gloves/powered
+
+datum/design/powerarmor_boots
+	name = "Powered armor boots"
+	desc = "The frame for Centcom's patented powered armor."
+	id = "powerarmorboots"
+	req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasteel" = 2000)
+	build_path = /obj/item/clothing/shoes/powered
+
+datum/design/powerarmor_plasma
+	name = "Powered armor miniaturized plasma generator"
+	desc = "One of the potential power sources for powered armor."
+	id = "powerarmorplasma"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 4, "plasmatech" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasma" = 4000)
+	build_path = /obj/item/powerarmor/power/plasma
+
+datum/design/powerarmor_cell
+	name = "Powered armor powercell interface"
+	desc = "One of the potential power sources for powered armor."
+	id = "powerarmorcell"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 3, "magnets" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$silver" = 4000)
+	build_path = /obj/item/powerarmor/power/powercell
+
+datum/design/powerarmor_nuclear
+	name = "Powered armor miniaturized nuclear generator"
+	desc = "One of the potential power sources for powered armor."
+	id = "powerarmornuclear"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 4, "magnets" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$uranium" = 4000)
+	build_path = /obj/item/powerarmor/power/nuclear
+
+datum/design/powerarmor_reactive
+	name = "Powered armor reactive plating"
+	desc = "The core of the power armor's active defenses."
+	id = "powerarmorreactive"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 3, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$diamond" = 4000)
+	build_path = /obj/item/powerarmor/reactive
+
+datum/design/powerarmor_servos
+	name = "Powered armor servos"
+	desc = "This allows the powerarmor to move efficiently."
+	id = "powerarmorservos"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 3, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasteel" = 4000)
+	build_path = /obj/item/powerarmor/servos
+
+datum/design/powerarmor_atmoseal
+	name = "Powered armor atmospheric seal"
+	desc = "This keeps the bad stuff out."
+	id = "powerarmoratmoseal"
+	req_tech = list("combat" = 3, "engineering" = 3, "powerstorage" = 3, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 7500, "$plasteel" = 4000)
+	build_path = /obj/item/powerarmor/atmoseal
+
 /////////////////////////////////////////
 /////////////////Mining//////////////////
 /////////////////////////////////////////

code/modules/research/protolathe.dm

@@ -14,6 +14,7 @@ Note: Must be placed west/left of and R&D console to function.
 
 	var/max_material_storage = 100000 //All this could probably be done better with a list but meh.
 	var/m_amount = 0.0
+	var/plasteel_amount = 0.0
 	var/g_amount = 0.0
 	var/gold_amount = 0.0
 	var/silver_amount = 0.0
@@ -87,6 +88,9 @@ Note: Must be placed west/left of and R&D console to function.
 			if(g_amount >= 3750)
 				var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
 				G.amount = round(g_amount / G.perunit)
+			if(plasteel_amount >= 2000)
+				var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel(src.loc)
+				G.amount = round(plasteel_amount / G.perunit)
 			if(plasma_amount >= 2000)
 				var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc)
 				G.amount = round(plasma_amount / G.perunit)
@@ -162,6 +166,8 @@ Note: Must be placed west/left of and R&D console to function.
 				m_amount += amount * 3750
 			if(/obj/item/stack/sheet/glass)
 				g_amount += amount * 3750
+			if(/obj/item/stack/sheet/plasteel)
+				plasteel_amount += amount * 2000
 			if(/obj/item/stack/sheet/mineral/gold)
 				gold_amount += amount * 2000
 			if(/obj/item/stack/sheet/mineral/silver)

code/modules/research/rdconsole.dm

@@ -34,6 +34,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole
 	name = "R&D Console"
 	icon_state = "rdcomp"
+	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
 	var/obj/item/weapon/disk/tech_disk/t_disk = null	//Stores the technology disk.
 	var/obj/item/weapon/disk/design_disk/d_disk = null	//Stores the design disk.
@@ -46,7 +47,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	var/id = 0			//ID of the computer (for server restrictions).
 	var/sync = 1		//If sync = 0, it doesn't show up on Server Control Console
 
-	req_access = list(access_tox)	//Data and setting manipulation requires scientist access.
+	req_access = list(access_research)	//Data and setting manipulation requires scientist access.
 
 /obj/machinery/computer/rdconsole/proc/Maximize()
 
@@ -77,6 +78,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		switch(return_name)
 			if("metal")
 				return_name = "Metal"
+			if("plasteel")
+				return_name = "Plasteel"
 			if("glass")
 				return_name = "Glass"
 			if("gold")
@@ -147,35 +150,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 */
 
 /obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
-	//The construction/deconstruction of the console code.
-	if(istype(D, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/rdconsole/M = new /obj/item/weapon/circuitboard/rdconsole( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/rdconsole/M = new /obj/item/weapon/circuitboard/rdconsole( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
 	//Loading a disk into it.
-	else if(istype(D, /obj/item/weapon/disk))
+	if(istype(D, /obj/item/weapon/disk))
 		if(t_disk || d_disk)
 			user << "A disk is already loaded into the machine."
 			return
@@ -192,6 +168,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 		emagged = 1
 		user << "\blue You you disable the security protocols"
+	else
+		//The construction/deconstruction of the console code.
+		..()
+
 	src.updateUsrDialog()
 	return
 
@@ -388,6 +368,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 									linked_lathe.m_amount = max(0, (linked_lathe.m_amount-being_built.materials[M]))
 								if("$glass")
 									linked_lathe.g_amount = max(0, (linked_lathe.g_amount-being_built.materials[M]))
+								if("$plasteel")
+									linked_lathe.plasteel_amount = max(0, (linked_lathe.plasteel_amount-being_built.materials[M]))
 								if("$gold")
 									linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-being_built.materials[M]))
 								if("$silver")
@@ -478,6 +460,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if("glass")
 				type = /obj/item/stack/sheet/glass
 				res_amount = "g_amount"
+			if("plasteel")
+				type = /obj/item/stack/sheet/plasteel
+				res_amount = "plasteel_amount"
 			if("gold")
 				type = /obj/item/stack/sheet/mineral/gold
 				res_amount = "gold_amount"
@@ -751,6 +736,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								if(D.materials[M] > linked_lathe.g_amount) check_materials = 0
 							if("$metal")
 								if(D.materials[M] > linked_lathe.m_amount) check_materials = 0
+							if("$plasteel")
+								if(D.materials[M] > linked_lathe.plasteel_amount) check_materials = 0
 							if("$gold")
 								if(D.materials[M] > linked_lathe.gold_amount) check_materials = 0
 							if("$silver")
@@ -788,6 +775,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(linked_lathe.g_amount >= 18750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=glass;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
 			if(linked_lathe.g_amount >= 3750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=glass;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
 			dat += "<BR>"
+			//Plasteel
+			dat += "* [linked_lathe.plasteel_amount] cm<sup>3</sup> of Plasteel || "
+			dat += "Eject: "
+			if(linked_lathe.plasteel_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
+			if(linked_lathe.plasteel_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
+			if(linked_lathe.plasteel_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
+			dat += "<BR>"
 			//Gold
 			dat += "* [linked_lathe.gold_amount] cm<sup>3</sup> of Gold || "
 			dat += "Eject: "

code/modules/research/research_shuttle.dm

@@ -100,24 +100,5 @@ proc/move_research_shuttle()
 		hacked = 1
 		usr << "You fried the consoles ID checking system. It's now available to everyone!"
 
-	else if(istype(W, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-			var/obj/item/weapon/circuitboard/research_shuttle/M = new /obj/item/weapon/circuitboard/research_shuttle( A )
-			for (var/obj/C in src)
-				C.loc = src.loc
-			A.circuit = M
-			A.anchored = 1
-
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				getFromPool(/obj/item/weapon/shard, loc)
-				A.state = 3
-				A.icon_state = "3"
-			else
-				user << "\blue You disconnect the monitor."
-				A.state = 4
-				A.icon_state = "4"
-
-			del(src)
+	else
+		..()

code/modules/research/server.dm

@@ -194,6 +194,7 @@
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
 	icon_state = "rdcomp"
+	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0
 	var/obj/machinery/r_n_d/server/temp_server
 	var/list/servers = list()
@@ -333,38 +334,12 @@
 	return
 
 /obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
-	if(istype(D, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				getFromPool(/obj/item/weapon/shard, loc)
-				var/obj/item/weapon/circuitboard/rdservercontrol/M = new /obj/item/weapon/circuitboard/rdservercontrol( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/rdservercontrol/M = new /obj/item/weapon/circuitboard/rdservercontrol( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+	if(istype(D, /obj/item/weapon/card/emag) && !emagged)
 		playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 		emagged = 1
 		user << "\blue You you disable the security protocols"
 	src.updateUsrDialog()
-	return
+	return ..()
 
 
 /obj/machinery/r_n_d/server/robotics
@@ -378,4 +353,4 @@
 	name = "Core R&D Server"
 	id_with_upload_string = "1"
 	id_with_download_string = "1"
-	server_id = 1
+	server_id = 1