Merge https://github.com/Baystation12/Baystation12 into features

2026-07-20 19:44:09 +01:00 · 2012-12-03 18:54:21 +10:00
parent cc2771d4d5 9b910c34ce
commit 39f07d50bf
177 changed files with 12552 additions and 10957 deletions
@@ -258,10 +258,10 @@ obj/machinery/computer/forensic_scanning
 			if("databaseprint") //Printing from the "files" database.
 				if(files)
 					var/obj/item/weapon/paper/P = new(loc)
-					P.name = "\improper Database File (Dossier [files.Find(href_list["identifier"])])"
+					var/list/dossier = files[href_list["identifier"]]
+					P.name = "\improper Database File ([dossier[2]])"
 					P.overlays += "paper_words"
 					P.info = "<b>Criminal Evidence Database</b><br><br>"
-					var/list/dossier = files[href_list["identifier"]]
 					P.info += "Consolidated data points: [dossier[2]]<br>"
 					var/print_string = "Fingerprints: Print not complete!<br>"
 					if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
@@ -512,10 +512,10 @@ obj/machinery/computer/forensic_scanning
 						prints[print] = atom_fingerprints[print]
 		else
 			var/list/templist[4]
-			templist[1] = atom_suit_fibers
-			templist[2] = atom_blood_DNA
+			templist[1] = atom_suit_fibers ? atom_suit_fibers.Copy() : null
+			templist[2] = atom_blood_DNA ? atom_blood_DNA.Copy() : null
 			templist[3] = atom_name
-			templist[4] = atom_fingerprints
+			templist[4] = atom_fingerprints ? atom_fingerprints.Copy() : null
 			misc[atom_reference] = templist	//Store it!
 		//Has prints.
 		if(atom_fingerprints)
@@ -559,17 +559,17 @@ obj/machinery/computer/forensic_scanning
 					//It's not in there!  We gotta add it.
 					update_fingerprints(main_print, atom_fingerprints[main_print])
 					var/list/data_point[4]
-					data_point[1] = atom_fingerprints
-					data_point[2] = atom_suit_fibers
-					data_point[3] = atom_blood_DNA
+					data_point[1] = atom_fingerprints ? atom_fingerprints.Copy() : null
+					data_point[2] = atom_suit_fibers ? atom_suit_fibers.Copy() : null
+					data_point[3] = atom_blood_DNA ? atom_blood_DNA.Copy() : null
 					data_point[4] = atom_name
 					data_entry[atom_reference] = data_point
 					continue
 				//No print at all!  New data entry, go!
 				var/list/data_point[4]
-				data_point[1] = atom_fingerprints
-				data_point[2] = atom_suit_fibers
-				data_point[3] = atom_blood_DNA
+				data_point[1] = atom_fingerprints ? atom_fingerprints.Copy() : null
+				data_point[2] = atom_suit_fibers ? atom_suit_fibers.Copy() : null
+				data_point[3] = atom_blood_DNA ? atom_blood_DNA.Copy() : null
 				data_point[4] = atom_name
 				var/list/new_file[2]
 				new_file[1] = atom_fingerprints[main_print]
@@ -135,7 +135,7 @@
 		return

 	proc/add_data(atom/A as mob|obj|turf|area)
-		//I love hashtables.
+		//I love associative lists.
 		var/list/data_entry = stored["\ref [A]"]
 		if(islist(data_entry)) //Yay, it was already stored!
 			//Merge the fingerprints.
@@ -164,9 +164,9 @@
 						blood[main_blood] = A.blood_DNA[blood]
 			return 1
 		var/list/sum_list[4]	//Pack it back up!
-		sum_list[1] = A.fingerprints
-		sum_list[2] = A.suit_fibers
-		sum_list[3] = A.blood_DNA
+		sum_list[1] = A.fingerprints ? A.fingerprints.Copy() : null
+		sum_list[2] = A.suit_fibers ? A.suit_fibers.Copy() : null
+		sum_list[3] = A.blood_DNA ? A.blood_DNA.Copy() : null
 		sum_list[4] = "\The [A] in \the [get_area(A)]"
 		stored["\ref [A]"] = sum_list
 		return 0
@@ -129,6 +129,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 			send2irc(ckey, "[original_msg] - No admins online")
 		else
 			send2irc(ckey, "[original_msg] - All admins AFK ([admin_number_afk])")
+	else
+		send2irc(ckey, original_msg)
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

@@ -25,7 +25,7 @@
 	for (var/client/C in admin_list)
 		if (src.holder.rank == "Admin Observer")
 			C << "<span class='adminobserver'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]:</EM> <span class='message'>[msg]</span></span>"
-		else if(C.holder.level != 0)
+		else if(C.holder && C.holder.level != 0)
 			C << "<span class='admin'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, C)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"

 /client/proc/cmd_mod_say(msg as text)
@@ -71,8 +71,6 @@
 			holder.process_activation(src, 1, 0)
 		if(holder && (wires & WIRE_PULSE_SPECIAL))
 			holder.process_activation(src, 0, 1)
-		if(master && (wires & WIRE_PULSE))
-			master.receive_signal("activate")
 //		if(radio && (wires & WIRE_RADIO_PULSE))
 			//Not sure what goes here quite yet send signal?
 		return 1
@@ -231,6 +231,9 @@

 		if ( !(usr.stat || usr.restrained()) )
 			var/obj/item/device/assembly_holder/holder
+			if(istype(src,/obj/item/weapon/grenade/chem_grenade))
+				var/obj/item/weapon/grenade/chem_grenade/gren = src
+				holder=gren.detonator
 			var/obj/item/device/assembly/timer/tmr = holder.a_left
 			if(!istype(tmr,/obj/item/device/assembly/timer))
 				tmr = holder.a_right
@@ -104,7 +104,7 @@
 			holder.update_icon()
 		if(holder && istype(holder.loc,/obj/item/weapon/grenade/chem_grenade))
 			var/obj/item/weapon/grenade/chem_grenade/grenade = holder.loc
-			grenade.c_state(scanning)
+			grenade.primed(scanning)
 		return


@@ -31,7 +31,7 @@
 		spawn(10)
 			process_cooldown()

-//		signal()
+		signal()
 		return 1

 	update_icon()
@@ -90,7 +90,7 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/suits.dmi'
 	name = "suit"
 	var/fire_resist = T0C+100
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	slot_flags = SLOT_OCLOTHING
@@ -249,16 +249,16 @@ BLIND     // can't see anything
 		H.holstered = usr.get_active_hand()
 		usr.drop_item()
 		H.holstered.loc = src
-		usr.visible_message("\blue [usr] holsters \the [H.holstered].", "You holster \the [H.holstered].")
+		usr.visible_message("\blue \The [usr] holsters \the [H.holstered].", "You holster \the [H.holstered].")
 	else
 		if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj))
 			usr << "\red You need an empty hand to draw the gun!"
 		else
 			if(usr.a_intent == "hurt")
-				usr.visible_message("\red [usr] draws \the [H.holstered], ready to shoot!", \
+				usr.visible_message("\red \The [usr] draws \the [H.holstered], ready to shoot!", \
 				"\red You draw \the [H.holstered], ready to shoot!")
 			else
-				usr.visible_message("\blue [usr] draws \the [H.holstered], pointing it at the ground.", \
-				"\blue You draw \the [H.holstered], pointing it at tthe ground.")
+				usr.visible_message("\blue \The [usr] draws \the [H.holstered], pointing it at the ground.", \
+				"\blue You draw \the [H.holstered], pointing it at the ground.")
 			usr.put_in_hands(H.holstered)
 			H.holstered = null
@@ -26,7 +26,7 @@
 	icon_state = "santa"
 	item_state = "santa"
 	slowdown = 0
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	allowed = list(/obj/item) //for stuffing exta special presents


@@ -4,7 +4,7 @@
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
 	icon_state = "rig0-engineering"
 	item_state = "eng_helm"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight)
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
@@ -42,7 +42,7 @@
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
 	slowdown = 2
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/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
@@ -15,7 +15,7 @@
 	desc = "An armored vest that protects against some damage."
 	icon_state = "armor"
 	item_state = "armor"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)


@@ -83,7 +83,7 @@
 	desc = "An armored vest with a detective's badge on it."
 	icon_state = "detective-armor"
 	item_state = "armor"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)

@@ -97,7 +97,7 @@
 	icon_state = "reactiveoff"
 	item_state = "reactiveoff"
 	slowdown = 1
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)

 /obj/item/clothing/suit/armor/reactive/IsShield()
@@ -84,7 +84,7 @@
 	desc = "This robe commands authority."
 	icon_state = "judge"
 	item_state = "judge"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/spacecash)
 	flags_inv = HIDEJUMPSUIT
@@ -21,7 +21,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
 	slowdown = 1.0
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
@@ -3,7 +3,7 @@
 	icon_state = "black"
 	item_state = "bl_suit"
 	color = "black"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/blackf
 	name = "feminine black jumpsuit"
@@ -17,21 +17,21 @@
 	icon_state = "blue"
 	item_state = "b_suit"
 	color = "blue"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
 	item_state = "g_suit"
 	color = "green"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
 	item_state = "gy_suit"
 	color = "grey"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
@@ -41,35 +41,35 @@
 	color = "orange"
 	has_sensor = 2
 	sensor_mode = 3
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
 	item_state = "p_suit"
 	color = "pink"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
 	item_state = "r_suit"
 	color = "red"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
 	color = "white"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
 	item_state = "y_suit"
 	color = "yellow"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/psyche
 	name = "psychedelic"
@@ -88,7 +88,7 @@
 	desc = "aqua"
 	icon_state = "aqua"
 	color = "aqua"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/purple
 	name = "purple"
@@ -120,14 +120,14 @@
 	desc = "lightbrown"
 	icon_state = "lightbrown"
 	color = "lightbrown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/brown
 	name = "brown"
 	desc = "brown"
 	icon_state = "brown"
 	color = "brown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/yellowgreen
 	name = "yellowgreen"
@@ -140,7 +140,7 @@
 	desc = "darkblue"
 	icon_state = "darkblue"
 	color = "darkblue"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/lightred
 	name = "lightred"
@@ -153,4 +153,4 @@
 	desc = "darkred"
 	icon_state = "darkred"
 	color = "darkred"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS
@@ -6,7 +6,7 @@
 	icon_state = "ba_suit"
 	item_state = "ba_suit"
 	color = "ba_suit"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -15,7 +15,7 @@
 	icon_state = "captain"
 	item_state = "caparmor"
 	color = "captain"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/cargo
@@ -32,7 +32,7 @@
 	icon_state = "cargotech"
 	item_state = "lb_suit"
 	color = "cargo"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/chaplain
@@ -41,7 +41,7 @@
 	icon_state = "chaplain"
 	item_state = "bl_suit"
 	color = "chapblack"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/chef
@@ -49,7 +49,7 @@
 	name = "chef's uniform"
 	icon_state = "chef"
 	color = "chef"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/clown
@@ -58,7 +58,7 @@
 	icon_state = "clown"
 	item_state = "clown"
 	color = "clown"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/head_of_personnel
@@ -67,7 +67,7 @@
 	icon_state = "hop"
 	item_state = "b_suit"
 	color = "hop"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/hydroponics
@@ -77,7 +77,7 @@
 	item_state = "g_suit"
 	color = "hydroponics"
 	permeability_coefficient = 0.50
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/janitor
@@ -86,7 +86,7 @@
 	icon_state = "janitor"
 	color = "janitor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/lawyer
@@ -147,7 +147,7 @@
 	icon_state = "mime"
 	item_state = "mime"
 	color = "mime"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
@@ -6,7 +6,7 @@
 	item_state = "g_suit"
 	color = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -14,7 +14,7 @@
 	icon_state = "atmos"
 	item_state = "atmos_suit"
 	color = "atmos"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -23,7 +23,7 @@
 	item_state = "engi_suit"
 	color = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -8,7 +8,7 @@
 	item_state = "g_suit"
 	color = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /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."
@@ -18,7 +18,7 @@
 	color = "toxinswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/under/rank/chemist
@@ -50,7 +50,7 @@
 	color = "geneticswhite"
 	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

 /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."
@@ -78,7 +78,7 @@
 	color = "medical"
 	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

 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
@@ -15,7 +15,7 @@
 	item_state = "r_suit"
 	color = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/security
 	name = "security officer's jumpsuit"
@@ -24,7 +24,7 @@
 	item_state = "r_suit"
 	color = "secred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /*
 * Detective
@@ -36,7 +36,7 @@
 	item_state = "det"
 	color = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/head/det_hat
@@ -56,7 +56,7 @@
 	item_state = "r_suit"
 	color = "hosred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS


 /obj/item/clothing/head/helmet/HoS
@@ -24,7 +24,7 @@
 	name = "amish suit"
 	icon_state = "sl_suit"
 	color = "sl_suit"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/waiter
 	name = "waiter's outfit"
@@ -32,7 +32,7 @@
 	icon_state = "waiter"
 	item_state = "waiter"
 	color = "waiter"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/rank/mailman
 	name = "mailman's jumpsuit"
@@ -102,7 +102,7 @@
 	desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
 	icon_state = "owl"
 	color = "owl"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = FPRINT | TABLEPASS

 /obj/item/clothing/under/johnny
 	name = "johnny~~ jumpsuit"
@@ -55,6 +55,17 @@
 	icon_state = "david_fanning_1"
 	item_state = "david_fanning_1"

+/obj/item/fluff/john_mckeever_1 //kirbyelder: John McKeever
+	name = "Suspicious Paper"
+	desc = "A piece of paper reading: Smash = 1/3 Leaf Juice, 1/3 Tricker, 1/3 Aajkli Extract"
+	icon_state = "paper"
+	item_state = "paper"
+
+/obj/item/fluff/maurice_bedford_1
+	name = "Monogrammed Handkerchief"
+	desc = "A neatly folded handkerchief embroidered with a 'M'."
+	icon_state = "maurice_bedford_1"
+
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
@@ -69,6 +80,12 @@
 	icon = 'custom_items.dmi'
 	icon_state = "fancypen"

+/obj/item/weapon/pen/fluff/fountainpen //paththegreat: Eli Stevens
+	name = "Engraved Fountain Pen"
+	desc = "An expensive looking pen with the initials E.S. engraved into the side."
+	icon = 'custom_items.dmi'
+	icon_state = "fountainpen"
+
 /obj/item/fluff/victor_kaminsky_1 //chinsky: Victor Kaminski
 	name = "golden detective's badge"
 	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
@@ -115,13 +132,13 @@
 	icon_on = "blackzippoon"
 	icon_off = "blackzippo"

-/obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 //sniperyeti: Patrick Harris/Susan Harris
-	name = "red black zippo"
-	desc = "A shiny red zippo lighter that looks like it's in perfect condition."
+/obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan
+	name = "Graduation Lighter"
+	desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541"
 	icon = 'custom_items.dmi'
-	icon_state = "redzippo"
-	icon_on = "redzippoon"
-	icon_off = "redzippo"
+	icon_state = "gradzippo"
+	icon_on = "gradzippoon"
+	icon_off = "gradzippo"

 /obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
 	name = "Gonzo Fist zippo"
@@ -131,6 +148,14 @@
 	icon_on = "gonzozippoon"
 	icon_off = "gonzozippo"

+/obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson
+	name = "Engraved zippo"
+	desc = "A intricately engraved Zippo lighter."
+	icon = 'custom_items.dmi'
+	icon_state = "engravedzippo"
+	icon_on = "engravedzippoon"
+	icon_off = "engravedzippo"
+
 /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
 	name = "purple comb"
 	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
@@ -171,6 +196,21 @@
 	icon_state = "shinyflask"
 	volume = 50

+/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask //mcgulliver: Wox Derax
+	name = "Lithium Flask"
+	desc = "A flask with a Lithium Atom symbol on it."
+	icon = 'custom_items.dmi'
+	icon_state = "lithiumflask"
+	volume = 50
+
+/obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1 //rukral:Nashida Bisha'ra
+	name = "Nashida's Etched Beaker"
+	desc = "The message: 'Please do not be removing this beaker from the chemistry lab. If lost, return to Nashida Bisha'ra' can be seen etched into the side of this 100 unit beaker."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "beakerlarge"
+	g_amt = 5000
+	volume = 100
+
 /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle //compactninja: Lister Black
 	name = "Pill bottle (anti-depressants)"
 	desc = "Contains pills used to deal with depression. They appear to be prescribed to Lister Black"
@@ -266,7 +306,7 @@
 	icon = 'custom_items.dmi'
 	icon_state = "odysseus_spec_id"

-/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm
+/obj/item/weapon/card/id/fluff/ian_colm_1 //Roaper: Ian Colm
 	name = "Technician"
 	desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.."
 	icon = 'custom_items.dmi'
@@ -287,12 +327,29 @@
 	icon_state = "wolfflight"
 	item_state = "wolfflight"

+/obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy
+	name = "Zelda's Crowbar"
+	desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "zeldacrowbar"
+	item_state = "crowbar"
+
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////

 //////////// Gloves ////////////

+/obj/item/clothing/gloves/fluff/murad_hassim_1
+	name = "Tajaran Surgical Gloves"
+	desc = "Reinforced sterile gloves custom tailored to comfortably accommodate Tajaran claws."
+	icon_state = "latex"
+	item_state = "lgloves"
+	siemens_coefficient = 0.30
+	permeability_coefficient = 0.01
+	color="white"
+
 /obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks
 	name = "mittens"
 	desc = "A pair of well worn, blue mittens."
@@ -301,6 +358,12 @@
 	item_state = "bluegloves"
 	color="blue"

+/obj/item/clothing/gloves/fluff/chal_appara_1 //furlucis: Chal Appara
+	name = "Left Black Glove"
+	desc = "The left one of a pair of black gloves. Wonder where the other one went..."
+	icon = 'custom_items.dmi'
+	icon_state = "chal_appara_1"
+
 //////////// Eye Wear ////////////

 /obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner
@@ -309,22 +372,19 @@
 	icon = 'custom_items.dmi'
 	icon_state = "book_berner_1"

-/obj/item/clothing/glasses/fluff/serithi_artalis_1 //serithi: Serithi Artalis
-	name = "extranet HUD"
-	desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records."
+/obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra
+	name = "Scanning Goggles"
+	desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it."
 	icon = 'custom_items.dmi'
-	icon_state = "serithi_artalis_1"
+	icon_state = "uzenwa_sissra_1"
+
+/obj/item/clothing/glasses/welding/fluff/ian_colm_2 //roaper: Ian Colm
+	name = "Ian's Goggles"
+	desc = "A pair of goggles used in the application of welding."
+	icon = 'custom_items.dmi'
+	icon_state = "ian_colm_1"

 //////////// Hats ////////////
-//Removed by request
-/*
-/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson
-	name = "old hard hat"
-	desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards."
-	icon_state = "hardhat0_dblue" //Already an in-game sprite
-	item_state = "hardhat0_dblue"
-	color = "dblue"
-*/

 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
 	name = "\improper SWAT hat"
@@ -356,11 +416,11 @@
 	icon = 'custom_items.dmi'
 	icon_state = "taryn_kifer_1"

-/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai
-	name = "comfy cap"
-	desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
+/obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor
+	name = "Edvin's Hat"
+	desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it."
 	icon = 'custom_items.dmi'
-	icon_state = "enos_adlai_1"
+	icon_state = "edvin_telephosphor_1"

 //////////// Suits ////////////

@@ -464,25 +524,31 @@

 //////////// Shoes ////////////

-/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis
-	name = "leather boots"
-	desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot."
+/obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris
+	name = "Susan's Magboots"
+	desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back."
 	icon = 'custom_items.dmi'
-	icon_state = "leatherboots"
-	item_state = "jackboots"
+	icon_state = "atmosmagboots0"
+	toggle()
+		set name = "Toggle Magboots"
+		set category = "Object"
+		set src in usr
+		if(src.magpulse)
+			src.flags &= ~NOSLIP
+			src.slowdown = SHOES_SLOWDOWN
+			src.magpulse = 0
+			icon_state = "atmosmagboots0"
+			usr << "You disable the mag-pulse traction system."
+		else
+			src.flags |= NOSLIP
+			src.slowdown = 2
+			src.magpulse = 1
+			icon_state = "atmosmagboots1"
+			usr << "You enable the mag-pulse traction system."

 //////////// Sets ////////////

-////// CDC //deusdactyl: Roger Wiles
-//Removed by request.
 /*
-/obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit
-	name = "\improper CDC jumpsuit"
-	desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards.  It has a biohazard symbol sewn into the back."
-	icon = 'custom_items.dmi'
-	icon_state = "cdc_jumpsuit"
-	color = "cdc_jumpsuit"
-
 /obj/item/clothing/suit/labcoat/fluff/cdc_labcoat
 	name = "\improper CDC labcoat"
 	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."
@@ -0,0 +1,91 @@
+/datum/genetics/side_effect
+	var/name // name of the side effect, to use as a header in the manual
+	var/symptom // description of the symptom of the side effect
+	var/treatment // description of the treatment of the side effect
+	var/effect // description of what happens when not treated
+	var/duration = 0 // delay between start() and finish()
+
+	proc/start(mob/living/carbon/human/H)
+		// start the side effect, this should give some cue as to what's happening,
+		// such as gasping. These cues need to be unique among side-effects.
+
+	proc/finish(mob/living/carbon/human/H)
+		// Finish the side-effect. This should first check whether the cure has been
+		// applied, and if not, cause bad things to happen.
+
+/datum/genetics/side_effect/genetic_burn
+	name = "Genetic Burn"
+	symptom = "Subject's skin turns unusualy red."
+	treatment = "Inject small dose of dexalin."
+	effect = "Subject's skin burns."
+	duration = 10*30
+
+	start(mob/living/carbon/human/H)
+		H.emote("me", 1, "starts turning very red..")
+
+	finish(mob/living/carbon/human/H)
+		if(!H.reagents.has_reagent("dexalin"))
+			for(var/organ_name in list("chest","l_arm","r_arm","r_leg","l_leg","head","groin"))
+				var/datum/organ/external/E = H.get_organ(organ_name)
+				E.take_damage(0, 5, 0)
+
+/datum/genetics/side_effect/bone_snap
+	name = "Bone Snap"
+	symptom = "Subject's limbs tremble notably."
+	treatment = "Inject small dose of bicaridine."
+	effect = "Subject's bone breaks."
+	duration = 10*60
+
+	start(mob/living/carbon/human/H)
+		H.emote("me", 1, "'s limbs start shivering uncontrollably.")
+
+	finish(mob/living/carbon/human/H)
+		if(!H.reagents.has_reagent("bicaridine"))
+			var/organ_name = pick("chest","l_arm","r_arm","r_leg","l_leg","head","groin")
+			var/datum/organ/external/E = H.get_organ(organ_name)
+			E.take_damage(20, 0, 0)
+			E.fracture()
+
+/*/datum/genetics/side_effect/monkey
+	name = "Monkey"
+	symptom = "Subject starts drooling uncontrollably."
+	treatment = "Inject small dose of dylovene."
+	effect = "Subject turns into monkey."
+	duration = 10*90
+
+	start(mob/living/carbon/human/H)
+		H.emote("me", 1, "has drool running down from his mouth.")
+
+	finish(mob/living/carbon/human/H)
+		if(!H.reagents.has_reagent("anti_toxin"))
+			H.monkeyize()**/
+
+/datum/genetics/side_effect/confuse
+	name = "Confuse"
+	symptom = "Subject starts drooling uncontrollably."
+	treatment = "Inject small dose of dylovene."
+	effect = "Subject becomes confused."
+	duration = 10*30
+
+	start(mob/living/carbon/human/H)
+		H.emote("me", 1, "has drool running down from his mouth.")
+
+	finish(mob/living/carbon/human/H)
+		if(!H.reagents.has_reagent("anti_toxin"))
+			H.confused += 100
+
+proc/trigger_side_effect(mob/living/carbon/human/H)
+	spawn
+		if(!istype(H)) return
+		var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)
+		var/datum/genetics/side_effect/S = new tp
+
+		S.start(H)
+		spawn(20)
+			if(!istype(H)) return
+			H.Weaken(rand(0, S.duration / 50))
+		sleep(S.duration)
+
+		if(!istype(H)) return
+		H.SetWeakened(0)
+		S.finish(H)
@@ -31,7 +31,7 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
 			if (istype(M, /mob/new_player))
 				continue
 			if(findtext(message," snores.")) //Because we have so many sleeping people.
-				continue
+				break
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)

@@ -16,6 +16,55 @@
 	src.adding += using
 	action_intent = using

+//intent small hud objects
+	var/icon/ico
+
+	ico = new('icons/mob/screen1_alien.dmi', "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
+	using = new /obj/screen( src )
+	using.name = "help"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	help_intent = using
+
+	ico = new('icons/mob/screen1_alien.dmi', "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
+	using = new /obj/screen( src )
+	using.name = "disarm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	disarm_intent = using
+
+	ico = new('icons/mob/screen1_alien.dmi', "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "grab"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	grab_intent = using
+
+	ico = new('icons/mob/screen1_alien.dmi', "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "harm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	hurt_intent = using
+
+//end intent small hud objects
+
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.dir = SOUTHWEST
@@ -418,8 +418,8 @@
 		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,
 		//blame the person who coded them. Temporary fix added.
-
-		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
+		if (client)
+			client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)

 		if ((blind && stat != 2))
 			if ((blinded))
@@ -441,7 +441,7 @@
 				if (!( machine.check_eye(src) ))
 					reset_view(null)
 			else
-				if(!client.adminobs)
+				if(client && !client.adminobs)
 					reset_view(null)

 		return 1
@@ -332,9 +332,8 @@ FUCK YOU MORE FAT CODE -Hawk*/
 		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,
 		//blame the person who coded them. Temporary fix added.
-
-
-		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
+		if (client)
+			client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)

 		if ((blind && stat != 2))
 			if ((blinded))
@@ -356,7 +355,7 @@ FUCK YOU MORE FAT CODE -Hawk*/
 				if (!( machine.check_eye(src) ))
 					reset_view(null)
 			else
-				if(!client.adminobs)
+				if(client && !client.adminobs)
 					reset_view(null)

 		return 1
@@ -134,7 +134,7 @@
 	if(istype(M) && M.lying) //Pulling lying down people is slower
 		tally += 3

-	if(MINCREASERUN in mutations)
+	if(mRun in mutations)
 		tally = 0

 	return tally
@@ -10,7 +10,7 @@
 	src.darkMask = list(  )
 	src.intent_small_hud_objects = list(  )

-	src.g_dither = new src.h_type( src )
+	src.g_dither = new /obj/screen( src )
 	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	src.g_dither.name = "Mask"
 	src.g_dither.icon = ui_style
@@ -18,7 +18,7 @@
 	src.g_dither.layer = 18
 	src.g_dither.mouse_opacity = 0

-	src.alien_view = new src.h_type(src)
+	src.alien_view = new /obj/screen(src)
 	src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	src.alien_view.name = "Alien"
 	src.alien_view.icon = ui_style
@@ -26,7 +26,7 @@
 	src.alien_view.layer = 18
 	src.alien_view.mouse_opacity = 0

-	src.blurry = new src.h_type( src )
+	src.blurry = new /obj/screen( src )
 	src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	src.blurry.name = "Blurry"
 	src.blurry.icon = ui_style
@@ -34,7 +34,7 @@
 	src.blurry.layer = 17
 	src.blurry.mouse_opacity = 0

-	src.druggy = new src.h_type( src )
+	src.druggy = new /obj/screen( src )
 	src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	src.druggy.name = "Druggy"
 	src.druggy.icon = ui_style
@@ -44,7 +44,7 @@

 	var/obj/screen/using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "act_intent"
 	using.dir = SOUTHWEST
 	using.icon = ui_style
@@ -55,45 +55,55 @@
 	action_intent = using

 //intent small hud objects
-	using = new src.h_type( src )
+	var/icon/ico
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
+	using = new /obj/screen( src )
 	using.name = "help"
-	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == "help" ? "help_small_active" : "help_small")
-	using.screen_loc = ui_help_small
+	using.icon = ico
+	using.screen_loc = ui_acti
 	using.layer = 21
 	src.adding += using
 	help_intent = using

-	using = new src.h_type( src )
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
+	using = new /obj/screen( src )
 	using.name = "disarm"
-	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == "disarm" ? "disarm_small_active" : "disarm_small")
-	using.screen_loc = ui_disarm_small
+	using.icon = ico
+	using.screen_loc = ui_acti
 	using.layer = 21
 	src.adding += using
 	disarm_intent = using

-	using = new src.h_type( src )
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
+	using = new /obj/screen( src )
 	using.name = "grab"
-	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == "grab" ? "grab_small_active" : "grab_small")
-	using.screen_loc = ui_grab_small
+	using.icon = ico
+	using.screen_loc = ui_acti
 	using.layer = 21
 	src.adding += using
 	grab_intent = using

-	using = new src.h_type( src )
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
+	using = new /obj/screen( src )
 	using.name = "harm"
-	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == "hurt" ? "harm_small_active" : "harm_small")
-	using.screen_loc = ui_harm_small
+	using.icon = ico
+	using.screen_loc = ui_acti
 	using.layer = 21
 	src.adding += using
 	hurt_intent = using

 //end intent small hud objects

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "mov_intent"
 	using.dir = SOUTHWEST
 	using.icon = ui_style
@@ -103,7 +113,7 @@
 	src.adding += using
 	move_intent = using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "drop"
 	using.icon = ui_style
 	using.icon_state = "act_drop"
@@ -111,7 +121,7 @@
 	using.layer = 19
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "r_hand"
 	using.dir = WEST
 	using.icon = ui_style
@@ -123,7 +133,7 @@
 	src.r_hand_hud_object = using
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "l_hand"
 	using.dir = EAST
 	using.icon = ui_style
@@ -135,7 +145,7 @@
 	src.l_hand_hud_object = using
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "hand"
 	using.dir = SOUTH
 	using.icon = ui_style
@@ -144,7 +154,7 @@
 	using.layer = 19
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "hand"
 	using.dir = SOUTH
 	using.icon = ui_style
@@ -153,7 +163,7 @@
 	using.layer = 19
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "mask"
 	using.dir = NORTH
 	using.icon = ui_style
@@ -162,7 +172,7 @@
 	using.layer = 19
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "back"
 	using.dir = NORTHEAST
 	using.icon = ui_style
@@ -171,7 +181,7 @@
 	using.layer = 19
 	src.adding += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = null
 	using.icon = ui_style
 	using.icon_state = "dither50"
@@ -179,7 +189,7 @@
 	using.layer = 17
 	using.mouse_opacity = 0
 	src.vimpaired += using
-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = null
 	using.icon = ui_style
 	using.icon_state = "dither50"
@@ -187,7 +197,7 @@
 	using.layer = 17
 	using.mouse_opacity = 0
 	src.vimpaired += using
-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = null
 	using.icon = ui_style
 	using.icon_state = "dither50"
@@ -195,7 +205,7 @@
 	using.layer = 17
 	using.mouse_opacity = 0
 	src.vimpaired += using
-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = null
 	using.icon = ui_style
 	using.icon_state = "dither50"
@@ -242,8 +242,8 @@
 				healths.icon_state = "health7"

 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
-
-		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
+		if (client)
+			client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)

 		if ((blind && stat != 2))
 			if ((blinded))
@@ -265,7 +265,7 @@
 				if (!( machine.check_eye(src) ))
 					reset_view(null)
 			else
-				if(!client.adminobs)
+				if(client && !client.adminobs)
 					reset_view(null)

 		return 1
@@ -141,7 +141,7 @@
 	shock_damage *= siemens_coeff
 	if (shock_damage<1)
 		return 0
-	src.take_overall_damage(0,shock_damage)
+	src.take_overall_damage(0,shock_damage,used_weapon="Electrocution")
 	//src.burn_skin(shock_damage)
 	//src.adjustFireLoss(shock_damage) //burn_skin will do this for us
 	//src.updatehealth()
@@ -353,10 +353,12 @@
 		if(H.gloves)
 			if(H.gloves.clean_blood())
 				H.update_inv_gloves(0)
+			H.gloves.germ_level = 0
 		else
 			if(H.bloody_hands)
 				H.bloody_hands = 0
 				H.update_inv_gloves(0)
+			H.germ_level = 0
 	update_icons()	//apply the now updated overlays to the mob


@@ -2,6 +2,7 @@
 	gender = MALE
 	var/list/stomach_contents = list()
 	var/brain_op_stage = 0.0
+	var/ribcage_op_stage = 0
 /*
 	var/eye_op_stage = 0.0
 	var/appendix_op_stage = 0.0
@@ -18,4 +19,4 @@
 	var/analgesic = 0 // when this is set, the mob isn't affected by shock or pain
 					  // life should decrease this by 1 every tick
 	// total amount of wounds on mob, used to spread out healing and the like over all wounds
-	var/number_wounds = 0
+	var/number_wounds = 0
@@ -482,9 +482,9 @@


 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			for (var/mob/O in get_mobs_in_view(world.view,src))
 				O.show_message(message, m_type)
 		else if (m_type & 2)
-			for (var/mob/O in hearers(src.loc, null))
+			for (var/mob/O in (hearers(src.loc, null) | get_mobs_in_view(world.view,src)))
 				O.show_message(message, m_type)

@@ -193,6 +193,8 @@
 	if(suiciding)
 		msg += "<span class='warning'>[t_He] [t_has] bitten off [t_his] own tongue and [t_has] suffered major bloodloss!</span>\n"

+	if(mSmallsize in mutations)
+		msg += "[t_He] [t_is] small halfling!\n"

 	var/distance = get_dist(usr,src)
 	if(istype(usr, /mob/dead/observer) || usr.stat == 2) // ghosts can see anything
@@ -278,6 +280,8 @@
 					var/this_wound_desc = W.desc
 					if(W.bleeding()) this_wound_desc = "bleeding [this_wound_desc]"
 					else if(W.bandaged) this_wound_desc = "bandaged [this_wound_desc]"
+					if(W.germ_level > 1000) this_wound_desc = "badly infected [this_wound_desc]"
+					else if(W.germ_level > 100) this_wound_desc = "lightly infected [this_wound_desc]"
 					if(this_wound_desc in wound_descriptors)
 						wound_descriptors[this_wound_desc] += W.amount
 						continue
@@ -11,12 +11,61 @@
 	using.name = "act_intent"
 	using.dir = SOUTHWEST
 	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent)
+	using.icon_state = "intent_"+mymob.a_intent
 	using.screen_loc = ui_acti
 	using.layer = 20
 	src.adding += using
 	action_intent = using

+//intent small hud objects
+	var/icon/ico
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
+	using = new /obj/screen( src )
+	using.name = "help"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	help_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
+	using = new /obj/screen( src )
+	using.name = "disarm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	disarm_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "grab"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	grab_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "harm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	hurt_intent = using
+
+//end intent small hud objects
+
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.dir = SOUTHWEST
@@ -345,84 +394,84 @@

 	/*/Monkey blockers

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_ears
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_belt
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_shoes
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_storage2
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_glasses
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_gloves
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_storage1
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_headset
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_oclothing
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_iclothing
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_id
 	using.layer = 20
 	src.mon_blo += using

-	using = new src.h_type( src )
+	using = new /obj/screen( src )
 	using.name = "blocked"
 	using.icon_state = "blocked"
 	using.screen_loc = ui_head
@@ -272,34 +272,36 @@

 	// focus most of the blast on one organ
 	var/datum/organ/external/take_blast = pick(organs)
-	update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9)
+	update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9, used_weapon = "Explosive blast")

 	// distribute the remaining 10% on all limbs equally
 	b_loss *= 0.1
 	f_loss *= 0.1

+	var/weapon_message = "Explosive Blast"
+
 	for(var/datum/organ/external/temp in organs)
 		switch(temp.name)
 			if("head")
-				update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2)
+				update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message)
 			if("chest")
-				update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4)
+				update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message)
 			if("l_arm")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("r_arm")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("l_leg")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("r_leg")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("r_foot")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("l_foot")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("r_arm")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 			if("l_arm")
-				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05)
+				update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
 	if(update)	UpdateDamageIcon()


@@ -816,3 +818,193 @@
 				spawn(350)	//wait 35 seconds before next volley
 					lastpuke = 0

+/mob/living/carbon/human/proc/morph()
+	set name = "Morph"
+	set category = "Superpower"
+
+	if(stat!=CONSCIOUS)
+		reset_view(0)
+		remoteview_target = null
+		return
+
+	if(!(mMorph in mutations))
+		src.verbs -= /mob/living/carbon/human/proc/morph
+		return
+
+	var/new_facial = input("Please select facial hair color.", "Character Generation",rgb(r_facial,g_facial,b_facial)) as color
+	if(new_facial)
+		r_facial = hex2num(copytext(new_facial, 2, 4))
+		g_facial = hex2num(copytext(new_facial, 4, 6))
+		b_facial = hex2num(copytext(new_facial, 6, 8))
+
+	var/new_hair = input("Please select hair color.", "Character Generation",rgb(r_hair,g_hair,b_hair)) as color
+	if(new_facial)
+		r_hair = hex2num(copytext(new_hair, 2, 4))
+		g_hair = hex2num(copytext(new_hair, 4, 6))
+		b_hair = hex2num(copytext(new_hair, 6, 8))
+
+	var/new_eyes = input("Please select eye color.", "Character Generation",rgb(r_eyes,g_eyes,b_eyes)) as color
+	if(new_eyes)
+		r_eyes = hex2num(copytext(new_eyes, 2, 4))
+		g_eyes = hex2num(copytext(new_eyes, 4, 6))
+		b_eyes = hex2num(copytext(new_eyes, 6, 8))
+
+	var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", "[35-s_tone]")  as text
+
+	if (!new_tone)
+		new_tone = 35
+	s_tone = max(min(round(text2num(new_tone)), 220), 1)
+	s_tone =  -s_tone + 35
+
+	// hair
+	var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
+	var/list/hairs = list()
+
+	// loop through potential hairs
+	for(var/x in all_hairs)
+		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
+		hairs.Add(H.name) // add hair name to hairs
+		del(H) // delete the hair after it's all done
+
+	var/new_style = input("Please select hair style", "Character Generation",h_style)  as null|anything in hairs
+
+	// if new style selected (not cancel)
+	if (new_style)
+		h_style = new_style
+
+	// facial hair
+	var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
+	var/list/fhairs = list()
+
+	for(var/x in all_fhairs)
+		var/datum/sprite_accessory/facial_hair/H = new x
+		fhairs.Add(H.name)
+		del(H)
+
+	new_style = input("Please select facial style", "Character Generation",f_style)  as null|anything in fhairs
+
+	if(new_style)
+		f_style = new_style
+
+	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
+	if (new_gender)
+		if(new_gender == "Male")
+			gender = MALE
+		else
+			gender = FEMALE
+	regenerate_icons()
+	check_dna()
+
+	visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god!  What the hell was that?  It sounded like flesh getting squished and bone ground into a different shape!")
+
+/mob/living/carbon/human/proc/remotesay()
+	set name = "Project mind"
+	set category = "Superpower"
+
+	if(stat!=CONSCIOUS)
+		reset_view(0)
+		remoteview_target = null
+		return
+
+	if(!(mRemotetalk in src.mutations))
+		src.verbs -= /mob/living/carbon/human/proc/remotesay
+		return
+	var/list/creatures = list()
+	for(var/mob/living/carbon/h in world)
+		creatures += h
+	var/mob/target = input ("Who do you want to project your mind to ?") as null|anything in creatures
+	if (isnull(target))
+		return
+
+	var/say = input ("What do you wish to say")
+	if(mRemotetalk in target.mutations)
+		target.show_message("\blue You hear [src.real_name]'s voice: [say]")
+	else
+		target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
+	usr.show_message("\blue You project your mind into [target.real_name]: [say]")
+	for(var/mob/dead/observer/G in world)
+		G.show_message("<i>Telepathic message from <b>[src]</b> to <b>[target]</b>: [say]</i>")
+
+/mob/living/carbon/human/proc/remoteobserve()
+	set name = "Remote View"
+	set category = "Superpower"
+
+	if(stat!=CONSCIOUS)
+		remoteview_target = null
+		reset_view(0)
+		return
+
+	if(!(mRemote in src.mutations))
+		remoteview_target = null
+		reset_view(0)
+		src.verbs -= /mob/living/carbon/human/proc/remoteobserve
+		return
+
+	if(client.eye != client.mob)
+		remoteview_target = null
+		reset_view(0)
+		return
+
+	var/list/mob/creatures = list()
+
+	for(var/mob/living/carbon/h in world)
+		var/turf/temp_turf = get_turf(h)
+		if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat!=CONSCIOUS) //Not on mining or the station. Or dead
+			continue
+		creatures += h
+
+	var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures
+
+	if (target)
+		remoteview_target = target
+		reset_view(target)
+	else
+		remoteview_target = null
+		reset_view(0)
+
+/mob/living/carbon/human/proc/get_visible_gender()
+	if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
+		return NEUTER
+	return gender
+
+/mob/living/carbon/human/proc/increase_germ_level(n)
+	if(gloves)
+		gloves.germ_level += n
+	else
+		germ_level += n
+
+/mob/living/carbon/human/revive()
+	for (var/datum/organ/external/O in organs)
+		O.status &= ~ORGAN_BROKEN
+		O.status &= ~ORGAN_BLEEDING
+		O.status &= ~ORGAN_SPLINTED
+		O.status &= ~ORGAN_ATTACHABLE
+		if (!O.amputated)
+			O.status &= ~ORGAN_DESTROYED
+		O.wounds.Cut()
+
+	vessel.add_reagent("blood",560-vessel.total_volume)
+	fixblood()
+	for (var/obj/item/weapon/organ/head/H in world)
+		if(H.brainmob)
+			if(H.brainmob.real_name == src.real_name)
+				if(H.brainmob.mind)
+					H.brainmob.mind.transfer_to(src)
+					del(H)
+
+
+	..()
+
+/mob/living/carbon/human/proc/is_lung_ruptured()
+	var/datum/organ/external/chest/E = get_organ("chest")
+	return E.ruptured_lungs
+
+
+/mob/living/carbon/human/proc/rupture_lung()
+	var/datum/organ/external/chest/E = get_organ("chest")
+
+	if(E.ruptured_lungs == 0)
+		src.custom_pain("You feel a stabbing pain in your chest!", 1)
+
+	E.ruptured_lungs = 1
+
@@ -61,6 +61,7 @@
 	switch(M.a_intent)
 		if("help")
 			if(health > config.health_threshold_crit)
+				diary << "\[[time2text(world.timeofday, "hh:mm.ss")]\] CPR BUGHINTING: [M] shakes [src]: health - [health], threshold - [config.health_threshold_crit]. Health details: OX [getOxyLoss()] TX [getToxLoss()] BU [getFireLoss()] BR [getBruteLoss()]  Blood: [round(vessel.get_reagent_amount("blood"))] out of 560"
 				help_shake_act(M)
 				return 1
 //			if(M.health < -75)	return 0
@@ -116,7 +116,7 @@
 	if(update)	UpdateDamageIcon()

 // damage MANY external organs, in random order
-/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0)
+/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/used_weapon = null)
 	if(nodamage)	return	//godmode
 	var/list/datum/organ/external/parts = get_damageable_organs()
 	var/update = 0
@@ -126,7 +126,7 @@
 		var/brute_was = picked.brute_dam
 		var/burn_was = picked.burn_dam

-		update |= picked.take_damage(brute,burn,sharp)
+		update |= picked.take_damage(brute,burn,sharp,used_weapon)

 		brute	-= (picked.brute_dam - brute_was)
 		burn	-= (picked.burn_dam - burn_was)
@@ -154,7 +154,7 @@
 		zone = "head"
 	return organs_by_name[zone]

-/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0)
+/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/used_weapon = null)
 	if((damagetype != BRUTE) && (damagetype != BURN))
 		..(damage, damagetype, def_zone, blocked)
 		return 1
@@ -176,10 +176,10 @@

 	switch(damagetype)
 		if(BRUTE)
-			if(organ.take_damage(damage, 0, sharp))
+			if(organ.take_damage(damage, 0, sharp, used_weapon))
 				UpdateDamageIcon()
 		if(BURN)
-			if(organ.take_damage(0, damage, sharp))
+			if(organ.take_damage(0, damage, sharp, used_weapon))
 				UpdateDamageIcon()
 	updatehealth()
 	return 1
@@ -133,7 +133,7 @@ emp_act
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0

-	apply_damage(I.force, I.damtype, affecting, armor , I.sharp)
+	apply_damage(I.force, I.damtype, affecting, armor , I.sharp, I.name)

 	var/bloody = 0
 	if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))
@@ -55,4 +55,6 @@

 	var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.

-	var/xylophone = 0 //For the spoooooooky xylophone cooldown
+	var/xylophone = 0 //For the spoooooooky xylophone cooldown
+
+	var/mob/remoteview_target = null
@@ -33,6 +33,9 @@
 	if (bodytemperature < 283.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75

+	if(mRun in mutations)
+		tally = 0
+
 	return (tally+config.human_delay)

 /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0)
@@ -433,8 +433,9 @@
 						return
 				message = "\red <B>[source] is trying to empty [target]'s pockets.</B>"
 			if("CPR")
-				if (target.cpr_time >= world.time + 3)
+				if (!target.cpr_time)
 					del(src)
+				target.cpr_time = 0
 				message = "\red <B>[source] is trying perform CPR on [target]!</B>"
 			if("id")
 				message = "\red <B>[source] is trying to take off [target.wear_id] from [target]'s uniform!</B>"
@@ -460,6 +461,7 @@ The else statement is for equipping stuff to empty slots.
 It can still be worn/put on as normal.
 */
 /obj/effect/equip_e/human/done()	//TODO: And rewrite this :< ~Carn
+	target.cpr_time = 1
 	if(!source || !target) return		//Target or source no longer exist
 	if(source.loc != s_loc) return		//source has moved
 	if(target.loc != t_loc) return		//target has moved
@@ -540,10 +542,7 @@ It can still be worn/put on as normal.
 			if (target.legcuffed)
 				strip_item = target.legcuffed
 		if("CPR")
-			if (target.cpr_time >= world.time + 30)
-				del(src)
 			if ((target.health >= -99.0 && target.health <= 0))
-				target.cpr_time = world.time
 				var/suff = min(target.getOxyLoss(), 7)
 				target.adjustOxyLoss(-suff)
 				target.updatehealth()
@@ -587,7 +586,7 @@ It can still be worn/put on as normal.
 						target.internal = target.belt
 					if (target.internal)
 						for(var/mob/M in viewers(target, 1))
-							M.show_message("[source] is now running on internals.", 1)
+							M.show_message("[target] is now running on internals.", 1)
 						target.internal.add_fingerprint(source)
 						if (target.internals)
 							target.internals.icon_state = "internal1"
@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32

 //NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick!
-#define HUMAN_MAX_OXYLOSS 3 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it.
-#define HUMAN_CRIT_MAX_OXYLOSS ( (last_tick_duration) /3) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 100HP to get through, so (1/3)*last_tick_duration per second. Breaths however only happen every 4 ticks.
+#define HUMAN_MAX_OXYLOSS 1 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it.
+#define HUMAN_CRIT_MAX_OXYLOSS ( (last_tick_duration) /5) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 100HP to get through, so (1/3)*last_tick_duration per second. Breaths however only happen every 4 ticks.

 #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
 #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point
@@ -130,7 +130,7 @@

 	proc/handle_blood()
 		// take care of blood and blood loss
-		if(stat < 2)
+		if(stat < 2 && bodytemperature >= 170)
 			var/blood_volume = round(vessel.get_reagent_amount("blood"))
 			if(blood_volume < 560 && blood_volume)
 				var/datum/reagent/blood/B = locate() in vessel.reagent_list //Grab some blood
@@ -187,6 +187,10 @@
 						var/word = pick("dizzy","woosey","faint")
 						src << "\red You feel extremely [word]"
 				if(0 to 122)
+					// There currently is a strange bug here. If the mob is not below -100 health
+					// when death() is called, apparently they will be just fine, and this way it'll
+					// spam deathgasp. Adjusting toxloss ensures the mob will stay dead.
+					toxloss += 300 // just to be safe!
 					death()


@@ -353,12 +357,28 @@
 			if((COLD_RESISTANCE in mutations) || (prob(1)))
 				heal_organ_damage(0,1)

+		if(mHallucination in mutations)
+			hallucination = 100
+			halloss = 0
+
+		if(mSmallsize in mutations)
+			if(!(pass_flags & PASSTABLE))
+				pass_flags |= PASSTABLE
+		else
+			if(pass_flags & PASSTABLE)
+				pass_flags &= ~PASSTABLE
+
 		// Make nanoregen heal youu, -3 all damage types
-		if(NANOREGEN in augmentations)
+		if((NANOREGEN in augmentations) || (mRegen in mutations))
 			var/healed = 0
-			var/hptoreg = 3
-			if(stat==UNCONSCIOUS) hptoreg=1
+			var/hptoreg = 0
+			if(NANOREGEN in augmentations)
+				hptoreg += 3
+			if(mRegen in mutations)
+				hptoreg += 2
+			if(stat==UNCONSCIOUS) hptoreg/=2
 			if(stat==DEAD) hptoreg=0
+
 			for(var/i=0, i<hptoreg, i++)
 				var/list/damages = new/list()
 				if(getToxLoss())
@@ -404,6 +424,27 @@
 				if(prob(5))
 					src << "\blue You feel your wounds mending..."

+		if(!(/mob/living/carbon/human/proc/morph in src.verbs))
+			if(mMorph in mutations)
+				src.verbs += /mob/living/carbon/human/proc/morph
+		else
+			if(!(mMorph in mutations))
+				src.verbs -= /mob/living/carbon/human/proc/morph
+
+		if(!(/mob/living/carbon/human/proc/remoteobserve in src.verbs))
+			if(mRemote in mutations)
+				src.verbs += /mob/living/carbon/human/proc/remoteobserve
+		else
+			if(!(mRemote in mutations))
+				src.verbs -= /mob/living/carbon/human/proc/remoteobserve
+
+		if(!(/mob/living/carbon/human/proc/remotesay in src.verbs))
+			if(mRemotetalk in mutations)
+				src.verbs += /mob/living/carbon/human/proc/remotesay
+		else
+			if(!(mRemotetalk in mutations))
+				src.verbs -= /mob/living/carbon/human/proc/remotesay
+
 		if ((HULK in mutations) && health <= 25)
 			mutations.Remove(HULK)
 			update_mutations()		//update our mutation overlays
@@ -422,15 +463,18 @@
 				radiation = 0

 			else
+				var/damage = 0
 				switch(radiation)
 					if(1 to 49)
 						radiation--
 						if(prob(25))
 							adjustToxLoss(1)
+							damage = 1
 							updatehealth()

 					if(50 to 74)
 						radiation -= 2
+						damage = 1
 						adjustToxLoss(1)
 						if(prob(5))
 							radiation -= 5
@@ -442,6 +486,7 @@
 					if(75 to 100)
 						radiation -= 3
 						adjustToxLoss(3)
+						damage = 1
 						if(prob(1))
 							src << "\red You mutate!"
 							randmutb(src)
@@ -449,18 +494,28 @@
 							emote("gasp")
 						updatehealth()

+				if(damage && organs.len)
+					var/datum/organ/external/O = pick(organs)
+					if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)

 	proc/breathe()
-
 		if(reagents.has_reagent("lexorin")) return
 		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return

+		var/lung_ruptured = is_lung_ruptured()
+
+		if(lung_ruptured && prob(2))
+			spawn emote("me", 1, "coughs up blood!")
+			src.drip(10)
+
 		var/datum/gas_mixture/environment = loc.return_air()
 		var/datum/gas_mixture/breath
 		// HACK NEED CHANGING LATER
 		if(health < 0)
 			losebreath++
-
+		if(lung_ruptured && prob(4))
+			spawn emote("me", 1, "gasps for air!")
+			losebreath += 5
 		if(losebreath>0) //Suffocating so do not take a breath
 			losebreath--
 			if (prob(10)) //Gasp per 10 ticks? Sounds about right.
@@ -477,7 +532,7 @@
 			if(!breath)
 				if(isobj(loc))
 					var/obj/location_as_object = loc
-					breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME)
+					breath = location_as_object.handle_internal_lifeform(src, BREATH_MOLES)
 				else if(isturf(loc))
 					var/breath_moles = 0
 					/*if(environment.return_pressure() > ONE_ATMOSPHERE)
@@ -488,6 +543,13 @@
 					breath_moles = environment.total_moles()*BREATH_PERCENTAGE

 					breath = loc.remove_air(breath_moles)
+
+
+					if(!lung_ruptured)
+						if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
+							if(prob(5))
+								rupture_lung()
+
 					// Handle chem smoke effect  -- Doohl
 					var/block = 0
 					if(wear_mask)
@@ -535,10 +597,10 @@


 	proc/handle_breath(datum/gas_mixture/breath)
-		if(nodamage || REBREATHER in augmentations)
+		if(nodamage || (REBREATHER in augmentations) || (mNobreath in mutations))
 			return

-		if(!breath || (breath.total_moles == 0) || suiciding)
+		if(!breath || (breath.total_moles() == 0) || suiciding)
 			if(reagents.has_reagent("inaprovaline"))
 				return
 			if(suiciding)
@@ -633,6 +695,7 @@
 				else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
 					if(prob(20))
 						spawn(0) emote(pick("giggle", "laugh"))
+				SA.moles = 0

 		if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(breath.temperature < 260.15)
@@ -644,22 +707,22 @@

 			switch(breath.temperature)
 				if(-INFINITY to 120)
-					apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head")
+					apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
 				if(120 to 200)
-					apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head")
+					apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
 				if(200 to 260)
-					apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head")
+					apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
 				if(360 to 400)
-					apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head")
+					apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)
 				if(400 to 1000)
-					apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head")
+					apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)
 				if(1000 to INFINITY)
-					apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head")
+					apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)

 		//Temporary fixes to the alerts.
@@ -950,7 +1013,8 @@
 	proc/handle_chemicals_in_body()
 		if(reagents) reagents.metabolize(src)

-		if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
+//		if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
+		if(PLANT in mutations)
 			var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 			if(isturf(loc)) //else, there's considered to be no light
 				var/turf/T = loc
@@ -966,7 +1030,7 @@
 				adjustToxLoss(-1)
 				adjustOxyLoss(-1)

-		//The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
+/*		//The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
 		if(FAT in mutations)
 			if(overeatduration < 100)
 				src << "\blue You feel fit again!"
@@ -975,7 +1039,7 @@
 				update_mutations(0)
 				update_inv_w_uniform(0)
 				update_inv_wear_suit()
-/*		else
+		else
 			if(overeatduration > 500)
 				src << "\red You suddenly feel blubbery!"
 				mutations.Add(FAT)
@@ -983,7 +1047,8 @@
 				update_mutations(0)
 				update_inv_w_uniform(0)
 				update_inv_wear_suit()
-AND YOU */
+*/
+
 		// nutrition decrease
 		if (nutrition > 0 && stat != 2)
 			nutrition = max (0, nutrition - HUNGER_FACTOR)
@@ -995,7 +1060,8 @@ AND YOU */
 			if(overeatduration > 1)
 				overeatduration -= 2 //doubled the unfat rate

-		if(dna && dna.mutantrace == "plant")
+//		if(dna && dna.mutantrace == "plant")
+		if(PLANT in mutations)
 			if(nutrition < 200)
 				take_overall_damage(2,0)

@@ -1015,6 +1081,19 @@ AND YOU */
 			dizziness = max(0, dizziness - 3)
 			jitteriness = max(0, jitteriness - 3)

+
+		if(life_tick % 10 == 0)
+			// handle trace chemicals for autopsy
+			for(var/datum/organ/O in organs)
+				for(var/chemID in O.trace_chemicals)
+					O.trace_chemicals[chemID] = O.trace_chemicals[chemID] - 1
+					if(O.trace_chemicals[chemID] <= 0)
+						O.trace_chemicals.Remove(chemID)
+		for(var/datum/reagent/A in reagents.reagent_list)
+			// add chemistry traces to a random organ
+			var/datum/organ/O = pick(organs)
+			O.trace_chemicals[A.name] = 100
+
 		updatehealth()

 		return //TODO: DEFERRED
@@ -1078,8 +1157,9 @@ AND YOU */
 			else if(sleeping)
 				handle_dreams()
 				adjustHalLoss(-5)
-				if(mind.active || immune_to_ssd)
-					sleeping = max(sleeping-1, 0)
+				if (mind)
+					if(mind.active || immune_to_ssd)
+						sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS
 				if( prob(10) && health && !hal_crit )
@@ -1128,6 +1208,13 @@ AND YOU */

 			if(druggy)
 				druggy = max(druggy-1, 0)
+
+			// Increase germ_level regularly
+			if(prob(40))
+				germ_level += 1
+			// If you're dirty, your gloves will become dirty, too.
+			if(gloves && germ_level > gloves.germ_level && prob(10))
+				gloves.germ_level += 1
 		return 1

 	proc/handle_regular_hud_updates()
@@ -1219,9 +1306,13 @@ AND YOU */
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			if(dna)
 				switch(dna.mutantrace)
-					if("lizard","metroid")
+					if("metroid")
 						see_in_dark = 3
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
+					if("lizard")
+						see_in_dark = 3
+					if("tajaran")
+						see_in_dark = 8
 					else
 						see_in_dark = 2

@@ -1394,7 +1485,13 @@ AND YOU */
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)
 			else
-				if(!client.adminobs)			reset_view(null)
+				var/isRemoteObserve = 0
+				if((mRemote in mutations) && remoteview_target)
+					if(remoteview_target.stat==CONSCIOUS)
+						isRemoteObserve = 1
+				if(!isRemoteObserve && client && !client.adminobs)
+					remoteview_target = null
+					reset_view(null)
 		return 1

 	proc/handle_random_events()
@@ -1496,4 +1593,4 @@ AND YOU */
 			Paralyse(rand(15,28))

 #undef HUMAN_MAX_OXYLOSS
-#undef HUMAN_CRIT_MAX_OXYLOSS
+#undef HUMAN_CRIT_MAX_OXYLOSS
@@ -218,107 +218,133 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/proc/update_body(var/update_icons=1)
 	if(stand_icon)	del(stand_icon)
 	if(lying_icon)	del(lying_icon)
-	if(dna && dna.mutantrace)	return
+
+	var/husk_color_mod = rgb(96,88,80)
+	var/hulk_color_mod = rgb(48,224,40)
+	var/plant_color_mod = rgb(144,224,144)

 	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
 	var/fat = (FAT in src.mutations)
+	var/hulk = (HULK in src.mutations)
 	var/skeleton = (SKELETON in src.mutations)
+	var/plant = (PLANT in src.mutations)

 	var/g = "m"
 	if(gender == FEMALE)	g = "f"

-	// whether to draw the individual limbs
-	var/individual_limbs = 0
-
-	//Base mob icon
-	if(husk)
-		stand_icon = new /icon('icons/mob/human.dmi', "husk_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "husk_l")
-	else if(fat)
-		stand_icon = new /icon('icons/mob/human.dmi', "fatbody_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "fatbody_l")
-	else if(skeleton)
-		stand_icon = new /icon('icons/mob/human.dmi', "skeleton_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "skeleton_l")
+	var/icon/icobase
+	if(skeleton)
+		icobase = 'icons/mob/human_races/r_skeleton.dmi'
+	else if(dna)
+		switch(dna.mutantrace)
+			if("tajaran")
+				icobase = 'icons/mob/human_races/r_tajaran.dmi'
+			if("lizard")
+				icobase = 'icons/mob/human_races/r_lizard.dmi'
+			if("skrell")
+				icobase = 'icons/mob/human_races/r_skrell.dmi'
+			else
+				icobase = 'icons/mob/human_races/r_human.dmi'
 	else
-		stand_icon = new /icon('icons/mob/human.dmi', "torso_[g]_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "torso_[g]_l")
-		individual_limbs = 1
+		icobase = 'icons/mob/human_races/r_human.dmi'

-	// Draw each individual limb
-	if(individual_limbs)
-		stand_icon.Blend(new /icon('icons/mob/human.dmi', "chest_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('icons/mob/human.dmi', "chest_[g]_l"), ICON_OVERLAY)
+	if(!skeleton)
+		stand_icon = new /icon(icobase, "torso_[g][fat?"_fat":""]")
+		if(husk)
+			stand_icon.ColorTone(husk_color_mod)
+		else if(hulk)
+//			stand_icon.ColorTone(hulk_color_mod)
+			var/list/TONE = ReadRGB(hulk_color_mod)
+			stand_icon.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
+		else if(plant)
+			stand_icon.ColorTone(plant_color_mod)
+	else
+		stand_icon = new /icon(icobase, "torso")

-		var/datum/organ/external/head = get_organ("head")
-		if(head && !(head.status & ORGAN_DESTROYED))
-			stand_icon.Blend(new /icon('icons/mob/human.dmi', "head_[g]_s"), ICON_OVERLAY)
-			lying_icon.Blend(new /icon('icons/mob/human.dmi', "head_[g]_l"), ICON_OVERLAY)
+	var/datum/organ/external/head = get_organ("head")
+	var/has_head = 0
+	if(head && !(head.status & ORGAN_DESTROYED))
+		has_head = 1

-		for(var/datum/organ/external/part in organs)
-			if(!istype(part, /datum/organ/external/groin) \
-				&& !istype(part, /datum/organ/external/chest) \
-				&& !istype(part, /datum/organ/external/head) \
-				&& !(part.status & ORGAN_DESTROYED))
-				var/icon/temp = new /icon('human.dmi', "[part.icon_name]_s")
-				if(part.status & ORGAN_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+	for(var/datum/organ/external/part in organs)
+		if(!istype(part, /datum/organ/external/chest) && !(part.status & ORGAN_DESTROYED))
+			var/icon/temp
+			if(istype(part, /datum/organ/external/groin))
+				if(skeleton)
+					temp = new /icon(icobase, "groin")
+				else
+					temp = new /icon(icobase, "groin_[g]")
+			else if(istype(part, /datum/organ/external/head))
+				if(skeleton)
+					temp = new /icon(icobase, "head")
+				else
+					temp = new /icon(icobase, "head_[g]")
+			else
+				temp = new /icon(icobase, "[part.icon_name]")
+			if(part.status & ORGAN_ROBOT)
+				temp.GrayScale()
+			else if(!skeleton)
+				if(husk)
+					temp.ColorTone(husk_color_mod)
+				else if(hulk)
+//					temp.ColorTone(hulk_color_mod)
+					var/list/TONE = ReadRGB(hulk_color_mod)
+					temp.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
+				else if(plant)
+					temp.ColorTone(plant_color_mod)
+
+			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
+			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
+			if(part.icon_position&(LEFT|RIGHT))
+				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
+				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
+				if(!(part.icon_position & LEFT))
+					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				if(!(part.icon_position & RIGHT))
+					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				stand_icon.Blend(temp2, ICON_OVERLAY)
+				temp2 = new('icons/mob/human.dmi',"blank")
+				if(part.icon_position & LEFT)
+					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				if(part.icon_position & RIGHT)
+					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				stand_icon.Blend(temp2, ICON_UNDERLAY)
+			else
 				stand_icon.Blend(temp, ICON_OVERLAY)
-				temp = new /icon('human.dmi', "[part.icon_name]_l")
-				if(part.status & ORGAN_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-				lying_icon.Blend(temp , ICON_OVERLAY)
-
-		stand_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('human.dmi', "groin_[g]_l"), ICON_OVERLAY)
-
-	if (husk)
-		var/icon/husk_s = new /icon('human.dmi', "husk_s")
-		var/icon/husk_l = new /icon('human.dmi', "husk_l")
-
-		for(var/datum/organ/external/part in organs)
-			if(!istype(part, /datum/organ/external/groin) \
-				&& !istype(part, /datum/organ/external/chest) \
-				&& !istype(part, /datum/organ/external/head) \
-				&& (part.status & ORGAN_DESTROYED))
-				husk_s.Blend(new /icon('dam_mask.dmi', "[part.icon_name]"), ICON_SUBTRACT)
-				husk_l.Blend(new /icon('dam_mask.dmi', "[part.icon_name]2"), ICON_SUBTRACT)
-
-		stand_icon.Blend(husk_s, ICON_OVERLAY)
-		lying_icon.Blend(husk_l, ICON_OVERLAY)

 	//Skin tone
-	if(!skeleton)
+	if(!skeleton && !husk && !hulk && !plant)
 		if(s_tone >= 0)
 			stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-			lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 		else
 			stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-			lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)

-	//Eyes
-	if(!skeleton)
-		var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
-		var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
-		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-		eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-		stand_icon.Blend(eyes_s, ICON_OVERLAY)
-		lying_icon.Blend(eyes_l, ICON_OVERLAY)
-	// Note: These used to be in update_face(), and the fact they're here will make it difficult to create a disembodied head
-	var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
-	var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
-	eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-	eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-	stand_icon.Blend(eyes_s, ICON_OVERLAY)
-	lying_icon.Blend(eyes_l, ICON_OVERLAY)
+	if(husk)
+		var/icon/mask = new(stand_icon)
+		var/icon/husk_over = new(icobase,"overlay_husk")
+		mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0)
+		husk_over.Blend(mask, ICON_ADD)
+		stand_icon.Blend(husk_over, ICON_OVERLAY)
+
+	if(has_head)
+		//Eyes
+		if(!skeleton)
+			var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
+			eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+			stand_icon.Blend(eyes_s, ICON_OVERLAY)

 	//Mouth	(lipstick!)
 	if(lip_style)	//skeletons are allowed to wear lipstick no matter what you think, agouri.
 		stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)

 	//Underwear
 	if(underwear >0 && underwear < 12)
 		if(!fat && !skeleton)
 			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+
+	lying_icon = stand_icon.MakeLying()
+
 	if(update_icons)
 		update_icons()

@@ -417,27 +443,29 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/fat
 	if( FAT in mutations )
 		fat = "fat"
-	var/g = "m"
-	if (gender == FEMALE)	g = "f"
+//	var/g = "m"
+//	if (gender == FEMALE)	g = "f"
 //BS12 EDIT
 	if(dna)
 		switch(dna.mutantrace)
 			if("golem","metroid")
-				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_l")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_s")
-			if("lizard", "tajaran", "skrell")
-				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
-			if("plant")
-				if(stat == DEAD)	//TODO
-					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
-				else
-					overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
-					overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
+				var/icon/I = new('icons/effects/genetics.dmi',"[dna.mutantrace][fat]_s")
+				overlays_standing[MUTANTRACE_LAYER]	= image(I)
+				overlays_lying[MUTANTRACE_LAYER]	= image(I.MakeLying())
+//			if("lizard", "tajaran", "skrell")
+//				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
+//				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
+//			if("plant")
+//				if(stat == DEAD)	//TODO
+//					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
+//				else
+//					overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
+//					overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
 			else
 				overlays_lying[MUTANTRACE_LAYER]	= null
 				overlays_standing[MUTANTRACE_LAYER]	= null
-	update_body(0)
+	if(!dna || !(dna.mutantrace in list("golem","metroid")))
+		update_body(0)
 	update_hair(0)
 	if(update_icons)   update_icons()

@@ -481,17 +509,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 		var/image/lying		= image("icon_state" = "[t_color]_l")
 		var/image/standing	= image("icon_state" = "[t_color]_s")

-		if(FAT in mutations)
-			if(w_uniform.flags&ONESIZEFITSALL)
-				lying.icon		= 'icons/mob/uniform_fat.dmi'
-				standing.icon	= 'icons/mob/uniform_fat.dmi'
-			else
-				src << "\red You burst out of \the [w_uniform]!"
-				drop_from_inventory(w_uniform)
-				return
-		else
-			lying.icon		= 'icons/mob/uniform.dmi'
-			standing.icon	= 'icons/mob/uniform.dmi'
+
+		lying.icon		= 'icons/mob/uniform.dmi'
+		standing.icon	= 'icons/mob/uniform.dmi'

 		if(w_uniform.blood_DNA)
 			lying.overlays		+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "uniformblood2")
@@ -638,35 +658,21 @@ proc/get_damage_icon_part(damage_state, body_part)
 		var/image/lying		= image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]2")
 		var/image/standing	= image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")

-		if(FAT in mutations)
-			if(!wear_suit.flags&ONESIZEFITSALL)
-				src << "\red You burst out of \the [wear_suit]!"
-				var/obj/item/clothing/c = wear_suit
-				wear_suit = null
-				if(client)
-					client.screen -= c
-				c.loc = loc
-				c.dropped(src)
-				c.layer = initial(c.layer)
-				lying		= null
-				standing	= null
+		if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
+			drop_from_inventory(handcuffed)
+			drop_l_hand()
+			drop_r_hand()

-		else
-			if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
-				drop_from_inventory(handcuffed)
-				drop_l_hand()
-				drop_r_hand()
-
-			if(wear_suit.blood_DNA)
-				var/t_state
-				if( istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat) )
-					t_state = "armor"
-				else if( istype(wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat) )
-					t_state = "coat"
-				else
-					t_state = "suit"
-				lying.overlays		+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood2")
-				standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood")
+		if(wear_suit.blood_DNA)
+			var/t_state
+			if( istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat) )
+				t_state = "armor"
+			else if( istype(wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat) )
+				t_state = "coat"
+			else
+				t_state = "suit"
+			lying.overlays		+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood2")
+			standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood")

 		overlays_lying[SUIT_LAYER]		= lying
 		overlays_standing[SUIT_LAYER]	= standing
@@ -16,6 +16,55 @@
 	src.adding += using
 	action_intent = using

+//intent small hud objects
+	var/icon/ico
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
+	using = new /obj/screen( src )
+	using.name = "help"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	help_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
+	using = new /obj/screen( src )
+	using.name = "disarm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	disarm_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "grab"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	grab_intent = using
+
+	ico = new(ui_style, "black")
+	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
+	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
+	using = new /obj/screen( src )
+	using.name = "harm"
+	using.icon = ico
+	using.screen_loc = ui_acti
+	using.layer = 21
+	src.adding += using
+	hurt_intent = using
+
+//end intent small hud objects
+
 	using = new /obj/screen()
 	using.name = "mov_intent"
 	using.dir = SOUTHWEST
@@ -551,7 +551,7 @@
 				if (!( machine.check_eye(src) ))
 					reset_view(null)
 			else
-				if(!client.adminobs)
+				if(client && !client.adminobs)
 					reset_view(null)

 		return 1
@@ -25,7 +25,7 @@
 		dna = new /datum/dna( null )
 		dna.real_name = real_name
 		dna.uni_identity = "00600200A00E0110148FC01300B009"
-		dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
+		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
 		dna.unique_enzymes = md5(name)
 				//////////blah
 		var/gendervar
@@ -40,6 +40,8 @@
 /mob/living/proc/burn_skin(burn_amount)
 	if(istype(src, /mob/living/carbon/human))
 		//world << "DEBUG: burn_skin(), mutations=[mutations]"
+		if(mShock in src.mutations) //shockproof
+			return 0
 		if (COLD_RESISTANCE in src.mutations) //fireproof
 			return 0
 		var/mob/living/carbon/human/H = src	//make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
@@ -57,6 +57,6 @@
 		P.on_hit(src,2)
 		return 2
 	if(!P.nodamage)
-		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone)
+		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, used_weapon = "Projectile([P.name])")
 	P.on_hit(src, absorb)
-	return absorb
+	return absorb
@@ -1,6 +1,7 @@
 /mob/living/Logout()
 	..()
-	if(!key && mind)	//key and mind have become seperated.
-		mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
-	if(!immune_to_ssd && sleeping < 2 && mind.active)
-		sleeping = 2
+	if (mind)
+		if(!key)	//key and mind have become seperated.
+			mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
+		if(!immune_to_ssd && sleeping < 2 && mind.active)
+			sleeping = 2
@@ -372,7 +372,7 @@ var/list/department_radio_keys = list(

 	var/rendered = null
 	if (length(heard_a))
-		var/message_a = say_quote(message)
+		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj)

 		if (italics)
 			message_a = "<i>[message_a]</i>"
@@ -117,9 +117,20 @@
 		return

 		//if(icon_state == initial(icon_state))
-	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
+	var/icontype = ""
+	var/list/icons = list("Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
+	if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
+		icons += "B.A.N.N.E.D."
+	if (src.name == "M00X-BC" && src.ckey == "searif")
+		icons += "M00X-BC"
+	if (src.name == "TRIBUNAL" && src.ckey == "serithi")
+		icons += "Tribunal"
+		icons += "Tribunal Malfunctioning"
+	if (src.name == "Skuld" && src.ckey == "ravensdale")
+		icons += "Skuld"
 /*	if(icontype == "Clown")
 		icon_state = "ai-clown2"*/
+	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
 	if(icontype == "Monochrome")
 		icon_state = "ai-mono"
 	else if(icontype == "Blue")
@@ -134,6 +145,14 @@
 		icon_state = "ai-malf"
 	else if(icontype == "Static")
 		icon_state = "ai-static"
+	else if(icontype == "M00X-BC")
+		icon_state = "ai-searif"
+	else if(icontype == "Tribunal")
+		icon_state = "ai-tribunal"
+	else if(icontype == "Tribunal Malfunctioning")
+		icon_state = "ai-tribunal-malf"
+	else if(icontype == "Skuld")
+		icon_state = "ai-ravensdale"
 	//else
 			//usr <<"You can only change your display once!"
 			//return
@@ -689,3 +708,25 @@
 				src.current = camera
 				src.current.SetLuminosity(AI_CAMERA_LUMINOSITY)
 		camera_light_on = world.timeofday + 1 * 20 // Update the light every 2 seconds.
+
+
+/mob/living/silicon/ai/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		if(anchored)
+			user.visible_message("\blue \The [user] starts to unbolt \the [src] from the plating...")
+			if(!do_after(user,40))
+				user.visible_message("\blue \The [user] decides not to unbolt \the [src].")
+				return
+			user.visible_message("\blue \The [user] finishes unfastening \the [src]!")
+			anchored = 0
+			return
+		else
+			user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...")
+			if(!do_after(user,40))
+				user.visible_message("\blue \The [user] decides not to bolt \the [src].")
+				return
+			user.visible_message("\blue \The [user] finishes fastening down \the [src]!")
+			anchored = 1
+			return
+	else
+		return ..()
@@ -1,8 +1,9 @@
 /mob/living/silicon/ai/death(gibbed)
 	if(stat == DEAD)	return
 	stat = DEAD
-	icon_state = "ai-crash"
-
+	if (src.name == "Skuld" && src.ckey == "ravensdale")//checks ID of AI and player to see if it needs to pull the custom death sprite and goes to blue-screen if it doesn't
+		icon_state = "ai-ravensdale-crash"
+	else icon_state = "ai-crash"
 	update_canmove()
 	if(src.eyeobj)
 		src.eyeobj.setLoc(get_turf(src))
@@ -90,7 +90,7 @@
 					src.see_in_dark = 0
 					src.see_invisible = SEE_INVISIBLE_LIVING

-					if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item))
+					if (((!loc.master.power_equip) || istype(T, /turf/space)) && !istype(src.loc,/obj/item) && !istype(get_area(src), /area/shuttle))
 						if (src:aiRestorePowerRoutine==0)
 							src:aiRestorePowerRoutine = 1

@@ -195,10 +195,13 @@
 			m_type = 2

 		if("law")
-			message = "<B>[src]</B> shows its legal authorization barcode."
+			if (istype(module,/obj/item/weapon/robot_module/security))
+				message = "<B>[src]</B> shows its legal authorization barcode."

-			playsound(src.loc, 'biamthelaw.ogg', 50, 0)
-			m_type = 2
+				playsound(src.loc, 'biamthelaw.ogg', 50, 0)
+				m_type = 2
+			else
+				src << "You are not THE LAW, pal."
 		else
 			src << text("Invalid Emote: []", act)
 	if ((message && src.stat == 0))
@@ -140,16 +140,16 @@
 		src.sight |= SEE_MOBS
 		src.sight |= SEE_OBJS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+		src.see_invisible = SEE_INVISIBLE_MINIMUM
 	else if (src.sight_mode & BORGMESON && src.sight_mode & BORGTHERM)
 		src.sight |= SEE_TURFS
 		src.sight |= SEE_MOBS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+		src.see_invisible = SEE_INVISIBLE_MINIMUM
 	else if (src.sight_mode & BORGMESON)
 		src.sight |= SEE_TURFS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+		src.see_invisible = SEE_INVISIBLE_MINIMUM
 	else if (src.sight_mode & BORGTHERM)
 		src.sight |= SEE_MOBS
 		src.see_in_dark = 8
@@ -255,7 +255,7 @@
 			if (!( src.machine.check_eye(src) ))
 				src.reset_view(null)
 		else
-			if(!client.adminobs)
+			if(client && !client.adminobs)
 				reset_view(null)

 	return 1
@@ -6,7 +6,7 @@
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
 	var/list/alarms_to_show = list()
 	var/list/alarms_to_clear = list()
-
+	immune_to_ssd = 1

 	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)
@@ -912,4 +912,4 @@ note dizziness decrements automatically in the mob's Life() proc.
 	return ""

 /mob/proc/flash_weak_pain()
-	flick("weak_pain",pain)
+	flick("weak_pain",pain)
@@ -226,4 +226,4 @@
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand

-	var/immune_to_ssd = 0
+	var/immune_to_ssd = 0
@@ -112,6 +112,12 @@
 			killing = 0
 			hud1.icon_state = "disarm/kill"
 			return
+            
+		if(ishuman(affecting))
+			var/mob/living/carbon/human/H = affecting
+			var/datum/organ/external/head = H.get_organ("head")
+			head.add_autopsy_data("Strangulation", 0)
+            
 		affecting.Weaken(5) // Should keep you down unless you get help.
 		affecting.Stun(5) // It will hamper your voice, being choked and all.
 		affecting.losebreath = min(affecting.losebreath + 2, 3)
@@ -293,4 +299,4 @@
 /obj/item/weapon/grab/Del()
 	del(hud1)
 	..()
-	return
+	return
@@ -147,24 +147,7 @@
 			return 1

 		if(href_list["ready"])
-			var/num_old_slots = GetAvailableAlienPlayerSlots()
-			var/new_slots = num_old_slots
-			if(!ready)
-				if(num_old_slots >= 1 || preferences.species == "Human")
-					ready = 1
-					new_slots = GetAvailableAlienPlayerSlots()
-				else
-					src << "\red Unable to declare ready. Too many players have already elected to play as aliens."
-			else
-				ready = 0
-				new_slots = GetAvailableAlienPlayerSlots()
-
-			if(num_old_slots < 1 && new_slots >= 1)
-				for(var/mob/new_player/N in world)
-					N << "\blue A new alien player slot has opened."
-			else if(num_old_slots >= 1 && new_slots < 1)
-				for(var/mob/new_player/N in world)
-					N << "\red New alien players can no longer enter the game."
+			ready = !ready

 		if(href_list["refresh"])
 			src << browse(null, "window=playersetup") //closes the player setup window
@@ -205,9 +188,6 @@
 				if(!is_alien_whitelisted(src, preferences.species) && config.usealienwhitelist)
 					src << alert("You are currently not whitelisted to play [preferences.species].")
 					return 0
-				else if(GetAvailableAlienPlayerSlots() < 1)
-					src << "\red Unable to join game. Too many players have already joined as aliens."
-					return 0

 			LateChoices()

@@ -356,15 +336,10 @@
 			src << alert("[rank] is not available. Please try another.")
 			return 0

-		var/num_old_slots = GetAvailableAlienPlayerSlots()
-		var/new_slots = num_old_slots
 		if(preferences.species != "Human")
 			if(!is_alien_whitelisted(src, preferences.species) && config.usealienwhitelist)
 				src << alert("You are currently not whitelisted to play [preferences.species].")
 				return 0
-			else if(num_old_slots < 1)
-				src << "\red Unable to join game. Too many players have already joined as aliens."
-				return 0

 		job_master.AssignRole(src, rank, 1)

@@ -384,14 +359,6 @@
 			ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.	//TODO!!!!! ~Carn
 			AnnounceArrival(character, rank)

-			new_slots = GetAvailableAlienPlayerSlots()
-			if(num_old_slots < 1 && new_slots >= 1)
-				for(var/mob/new_player/N in world)
-					N << "\blue A new alien player slot has opened."
-			else if(num_old_slots >= 1 && new_slots < 1)
-				for(var/mob/new_player/N in world)
-					N << "\red New alien players can no longer enter the game."
-
 		else
 			character.Robotize()
 		del(src)
@@ -492,22 +459,3 @@
 	proc/close_spawn_windows()
 		src << browse(null, "window=latechoices") //closes late choices window
 		src << browse(null, "window=playersetup") //closes the player setup window
-
-//limits the number of alien players in a game
-/proc/GetAvailableAlienPlayerSlots()
-	if(!config.limitalienplayers)
-		return 9999
-
-	var/num_players = 0
-
-	//check new players
-	for(var/mob/new_player/N in world)
-		if(N.preferences && N.ready)
-			num_players++
-
-	//check players already spawned, only count humans or aliens
-	for(var/mob/living/carbon/human/H in world)
-		if(H.ckey)
-			num_players++
-
-	return round(num_players * (config.alien_to_human_ratio / 100))
@@ -360,23 +360,27 @@
 							else
 								usr << "\blue You don't have an oxygen tank."
 		if("act_intent")
-			usr.a_intent_change("right")
-/*		if("help")
+			if(issilicon(usr))
+				if(usr.a_intent == "help")
+					usr.a_intent = "hurt"
+					usr.hud_used.action_intent.icon_state = "harm"
+				else
+					usr.a_intent = "help"
+					usr.hud_used.action_intent.icon_state = "help"
+			else
+				usr.a_intent_change("right")
+		if("help")
 			usr.a_intent = "help"
-			usr.hud_used.action_intent.icon_state = "help"
-			usr.hud_used.show_intent_icons = 0
+			usr.hud_used.action_intent.icon_state = "intent_help"
 		if("harm")
 			usr.a_intent = "hurt"
-			usr.hud_used.action_intent.icon_state = "harm"
-			usr.hud_used.show_intent_icons = 0
+			usr.hud_used.action_intent.icon_state = "intent_hurt"
 		if("grab")
 			usr.a_intent = "grab"
-			usr.hud_used.action_intent.icon_state = "grab"
-			usr.hud_used.show_intent_icons = 0
+			usr.hud_used.action_intent.icon_state = "intent_grab"
 		if("disarm")
 			usr.a_intent = "disarm"
-			usr.hud_used.action_intent.icon_state = "disarm"
-			usr.hud_used.show_intent_icons = 0	*/
+			usr.hud_used.action_intent.icon_state = "intent_disarm"
 		if("pull")
 			usr.stop_pulling()
 		if("throw")
@@ -226,7 +226,7 @@

 /obj/item/weapon/paper/Topic(href, href_list)
 	..()
-	if((usr.stat || usr.restrained()))
+	if(!usr || (usr.stat || usr.restrained()))
 		return

 	if(href_list["write"])
@@ -527,7 +527,7 @@ obj/structure/cable/proc/cableColor(var/colorC)

 /obj/item/weapon/cable_coil/attack(mob/M as mob, mob/user as mob)
 	if(hasorgans(M))
-		var/datum/organ/external/S = M:organs[user.zone_sel.selecting]
+		var/datum/organ/external/S = M:get_organ(user.zone_sel.selecting)
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
 			return ..()
 		if(S.burn_dam > 0)
@@ -119,6 +119,8 @@
 			if(!unmarked || !C.powernet)
 				if(C.d1 == fdir || C.d2 == fdir)
 					. += C
+				else if(C.d1 == turn(C.d2, 180))
+					. += C
 	return .


@@ -61,7 +61,7 @@


 /obj/machinery/power/smes/proc/chargedisplay()
-	return round(5.5*charge/capacity)
+	return round(5.5*charge/(capacity ? capacity : 5e6))

 #define SMESRATE 0.05			// rate of internal charge to external power

@@ -7,7 +7,7 @@
 	var/obj/item/weapon/cell/power_supply //What type of power cell this uses
 	var/charge_cost = 100 //How much energy is needed to fire.
 	var/cell_type = "/obj/item/weapon/cell"
-	var/projectile_type = "/obj/item/projectile/energy"
+	var/projectile_type = "/obj/item/projectile/beam/practice"
 	var/modifystate

 	emp_act(severity)
@@ -12,7 +12,7 @@
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = "/obj/item/projectile/practice"
+	projectile_type = "/obj/item/projectile/beam/practice"
 	clumsy_check = 0

 obj/item/weapon/gun/energy/laser/retro
@@ -90,7 +90,7 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser tag gun"
 	icon_state = "bluetag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/beam/bluetag"
+	projectile_type = "/obj/item/projectile/beam/lastertag/blue"
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	var/charge_tick = 0
@@ -127,7 +127,7 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser tag gun"
 	icon_state = "redtag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/beam/redtag"
+	projectile_type = "/obj/item/projectile/beam/lastertag/red"
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	var/charge_tick = 0
@@ -111,7 +111,7 @@ var/list/beam_master = list()



-/obj/item/projectile/beam/bluetag
+/obj/item/projectile/beam/lastertag/blue
 	name = "lasertag beam"
 	icon_state = "bluelaser"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
@@ -126,7 +126,7 @@ var/list/beam_master = list()
 				M.Weaken(5)
 		return 1

-/obj/item/projectile/beam/redtag
+/obj/item/projectile/beam/lastertag/red
 	name = "lasertag beam"
 	icon_state = "laser"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
@@ -141,7 +141,7 @@ var/list/beam_master = list()
 				M.Weaken(5)
 		return 1

-/obj/item/projectile/beam/omnitag//A laser tag bolt that stuns EVERYONE
+/obj/item/projectile/beam/lastertag/omni//A laser tag bolt that stuns EVERYONE
 	name = "lasertag beam"
 	icon_state = "omnilaser"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
@@ -79,7 +79,8 @@

 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/living/M = target
-		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
+//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
+		if(ishuman(target) && (PLANT in M.mutations)) //Plantmen possibly get mutated and damaged by the rays.
 			if(prob(15))
 				M.apply_effect((rand(30,80)),IRRADIATE)
 				M.Weaken(5)
@@ -116,7 +117,8 @@

 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/M = target
-		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
+//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
+		if(ishuman(target) && (PLANT in M.mutations)) //These rays make plantmen fat.
 			if(M.nutrition < 500) //sanity check
 				M.nutrition += 30
 		else if (istype(target, /mob/living/carbon/))
@@ -1146,7 +1146,8 @@ datum
 					if(ishuman(M))
 						var/mob/living/carbon/human/H = M
 						if(H.dna)
-							if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage
+//							if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage
+							if(PLANT in H.mutations) //plantmen take a LOT of damage
 								H.adjustToxLoss(10)

 		plasma
@@ -145,7 +145,8 @@

 	bullet_act(var/obj/item/projectile/Proj)
 		if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
-			explode()
+			if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
+				explode()

 	blob_act()
 		explode()
@@ -155,6 +155,9 @@
 		else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 			msg = "[user.name] stuffs [target.name] into the [src]!"
 			user << "You stuff [target.name] into the [src]!"
+			log_attack("<font color='red'>[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.</font>")
+			log_admin("ATTACK: [usr] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.")
+			msg_admin_attack("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.")
 		else
 			return
 		if (target.client)
@@ -102,13 +102,22 @@

 		user.attack_log += text("\[[time_stamp()]\] <font color='blue'>Has used [src.name] on \ref[target]</font>")

-		if (istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage)))
+		if (istype(target, /obj/item))
 			var/obj/item/O = target
 			if (src.amount > 1)
 				var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc))	//Aaannd wrap it up!
 				if(!istype(O.loc, /turf))
 					if(user.client)
 						user.client.screen -= O
+				P.w_class = O.w_class
+				if(P.w_class <= 1.0)
+					P.icon_state = "deliverycrate1"
+				else if (P.w_class <= 2.0)
+					P.icon_state = "deliverycrate2"
+				else if (P.w_class <= 3.0)
+					P.icon_state = "deliverycrate3"
+				else
+					P.icon_state = "deliverycrate4"
 				P.wrapped = O
 				O.loc = P
 				P.add_fingerprint(usr)
@@ -153,8 +153,6 @@
 		if(istype(P,/obj/item/projectile/beam)) src.Artifact_Activate()
 		else if(istype(P,/obj/item/projectile/ion)) src.Artifact_Activate()
 		else if(istype(P,/obj/item/projectile/energy)) src.Artifact_Activate()
-		else if(istype(P,/obj/item/projectile/beam/bluetag)) src.Artifact_Activate()
-		else if(istype(P,/obj/item/projectile/beam/redtag)) src.Artifact_Activate()
 	if (my_effect.trigger == "heat")
 		if(istype(P,/obj/item/projectile/temp)) src.Artifact_Activate()

@@ -205,6 +203,7 @@
 			if(4)
 				display_msg = "vibrates!"
 	else
+		my_effect.HaltEffect()
 		switch(rand(2))
 			if(0)
 				display_msg = "grows dull!"
@@ -223,7 +222,7 @@
 	else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens."

 	if (my_effect.effectmode == "contact" && src.activated && src.charged)
-		my_effect.DoEffect(src)
+		my_effect.DoEffect(user)
 		src.charged = 0
 		src.chargetime = src.recharge

@@ -221,7 +221,7 @@
 				findarti++
 				cur_artifact = A
 			if (findarti == 1)
-				if(cur_artifact.being_used)
+				if(cur_artifact && cur_artifact.being_used)
 					var/message = "<b>[src]</b> states, \"Cannot analyse. Excess energy drain is disrupting signal.\""
 					src.visible_message(message, message)
 				else
@@ -1,3 +1,4 @@
+//

 /datum/artifact_effect
 	var/artifact_id = ""       // Display ID of the spawning artifact
@@ -49,21 +50,18 @@
 /datum/artifact_effect/proc/DoEffect(var/atom/originator)
 	archived_loc = originator.loc
 	if (src.effectmode == "contact")
-		var/mob/user = originator
+		var/mob/living/user = originator
 		if(!user)
 			return
 		switch(src.effecttype)
 			if("healing")
 				//caeltodo
-				/*
 				if (istype(user, /mob/living/carbon/human/))
 					user << "\blue You feel a soothing energy invigorate you."

 					var/mob/living/carbon/human/H = user
-					for(var/A in H.organs)
-						var/datum/organ/external/affecting = null
-						if(!H.organs[A])    continue
-						affecting = H.organs[A]
+					for(var/datum/organ/external/affecting in H.organs)
+						if(!affecting)    continue
 						if(!istype(affecting, /datum/organ/external))    continue
 						affecting.heal_damage(25, 25)    //fixes getting hit after ingestion, killing you when game updates organ health
 						//user:heal_organ_damage(25, 25)
@@ -80,9 +78,7 @@
 						H.vessel.add_reagent("blood",50)
 						spawn(1)
 							H.fixblood()
-						H.update_body()
-						H.update_face()
-						H.UpdateDamageIcon()
+						H.regenerate_icons()
 					return 1
 					//
 				if (istype(user, /mob/living/carbon/monkey/))
@@ -131,7 +127,6 @@
 					user.adjustFireLoss(40)
 					return 1
 				else user << "Nothing happens."
-				*/
 			if("forcefield")
 				while(created_field.len < 16)
 					var/obj/effect/energy_field/E = new (locate(user.x,user.y,user.z))
@@ -148,6 +143,8 @@
 					randomturfs.Add(T)
 				if(randomturfs.len > 0)
 					user << "\red You are suddenly zapped away elsewhere!"
+					if (user.buckled)
+						user.buckled.unbuckle()
 					user.loc = pick(randomturfs)
 					var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 					sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
@@ -156,7 +153,6 @@
 	else if (src.effectmode == "aura")
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in range(src.aurarange,originator))
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -226,7 +222,6 @@
 						D.charge -= 10
 						if(prob(10)) M << "\red SYSTEM ALERT: Energy draining field detected!"
 				return 1
-			*/
 			if("planthelper")
 				for (var/obj/machinery/hydroponics/H in range(src.aurarange,originator))
 					//makes weeds and shrooms and stuff more potent too
@@ -247,7 +242,6 @@
 			O.show_message(text("<b>[]</b> emits a pulse of energy!", originator), 1)
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in range(src.aurarange,originator))
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -298,7 +292,6 @@
 					M.adjustFireLoss(10)
 					M.updatehealth()
 				return 1
-				*/
 			if("cellcharge")
 				for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/B in C.contents)
@@ -343,6 +336,8 @@
 						randomturfs.Add(T)
 					if(randomturfs.len > 0)
 						M << "\red You are displaced by a strange force!"
+						if(M.buckled)
+							M.buckled.unbuckle()
 						M.loc = pick(randomturfs)
 						var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 						sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
@@ -353,7 +348,6 @@
 			O.show_message(text("<b>[]</b> emits a powerful burst of energy!", originator), 1)
 		switch(src.effecttype)
 			//caeltodo
-			/*
 			if("healing")
 				for (var/mob/living/carbon/M in world)
 					if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
@@ -400,7 +394,6 @@
 					M.adjustFireLoss(5)
 					M.updatehealth()
 				return 1
-				*/
 			if("cellcharge")
 				for (var/obj/machinery/power/apc/C in world)
 					for (var/obj/item/weapon/cell/B in C.contents)
@@ -432,6 +425,8 @@
 						randomturfs.Add(T)
 					if(randomturfs.len > 0)
 						M << "\red You are displaced by a strange force!"
+						if(M.buckled)
+							M.buckled.unbuckle()
 						M.loc = pick(randomturfs)
 						var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 						sparks.set_up(3, 0, get_turf(originator)) //no idea what the 0 is
@@ -482,7 +477,3 @@
 			E.loc = locate(originator.x - 2,originator.y - 1,originator.z)
 			E = created_field[16]
 			E.loc = locate(originator.x - 2,originator.y - 2,originator.z)
-
-	/*for(var/obj/effect/energy_field/F in created_field)
-		created_field.Remove(F)
-		del F*/