Merge branch 'bleeding-edge-freeze' into viro

2026-07-13 16:13:19 +01:00 · 2013-07-09 12:49:23 +04:00
parent 50f94ddd93 ae2a9c56ad
commit 1095bd1978
117 changed files with 2329 additions and 2264 deletions
@@ -252,7 +252,6 @@
 #include "code\game\gamemodes\malfunction\malfunction.dm"
 #include "code\game\gamemodes\meteor\meteor.dm"
 #include "code\game\gamemodes\meteor\meteors.dm"
-#include "code\game\gamemodes\ninja\ninja.dm"
 #include "code\game\gamemodes\nuclear\nuclear.dm"
 #include "code\game\gamemodes\nuclear\nuclearbomb.dm"
 #include "code\game\gamemodes\nuclear\pinpointer.dm"
@@ -819,6 +818,8 @@
 #include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\viral_outbreak.dm"
 #include "code\modules\events\wallrot.dm"
+#include "code\modules\ext_scripts\irc.dm"
+#include "code\modules\ext_scripts\python.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"
@@ -27,7 +27,7 @@ var/global/datum/money_account/vendor_account

 		//add the account
 		station_account.transaction_log.Add(T)
-		for(var/obj/machinery/account_database/A in world)
+		for(var/obj/machinery/account_database/A in machines)
 			A.accounts.Add(station_account)

 /proc/create_department_account(department)
@@ -50,7 +50,7 @@ var/global/datum/money_account/vendor_account

 	//add the account
 	department_account.transaction_log.Add(T)
-	for(var/obj/machinery/account_database/A in world)
+	for(var/obj/machinery/account_database/A in machines)
 		A.accounts.Add(department_account)

 	department_accounts[department] = department_account
@@ -194,7 +194,7 @@ var/global/datum/money_account/vendor_account
 	if(href_list["choice"])
 		switch(href_list["choice"])
 			if("sync_accounts")
-				for(var/obj/machinery/account_database/A in world)
+				for(var/obj/machinery/account_database/A in machines)
 					for(var/datum/money_account/M in src.accounts)
 						if(!A.accounts.Find(M))
 							A.accounts.Add(M)
@@ -257,7 +257,7 @@ var/global/datum/money_account/vendor_account

 /obj/machinery/account_database/proc/add_account_across_all(var/new_owner_name = "Default user", var/starting_funds = 0, var/pre_existing = 0)
 	var/datum/money_account/M = add_account(new_owner_name, starting_funds, pre_existing)
-	for(var/obj/machinery/account_database/D in world)
+	for(var/obj/machinery/account_database/D in machines)
 		if(D == src)
 			continue
 		D.accounts.Add(M)
@@ -46,7 +46,7 @@
 	D.name = "small parcel - 'EFTPOS access code'"

 /obj/item/device/eftpos/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if(DB.z == src.z)
 			linked_db = DB
 			break
@@ -35,7 +35,7 @@
 	New()
 		//pick a random temple to link to
 		var/list/waypoints = list()
-		for(var/obj/effect/landmark/temple/destination/T in world)
+		for(var/obj/effect/landmark/temple/destination/T in landmarks_list)
 			waypoints.Add(T)
 			if(!T)
 				return
@@ -163,7 +163,7 @@
 		num_spawned++

 	//make some randomly pathing rivers
-	for(var/obj/effect/landmark/river_waypoint/W in world)
+	for(var/obj/effect/landmark/river_waypoint/W in landmarks_list)
 		if (W.z != src.z || W.connected)
 			continue

@@ -236,7 +236,7 @@
 		num_spawned++

 	//get any path nodes placed on the map
-	for(var/obj/effect/landmark/path_waypoint/W in world)
+	for(var/obj/effect/landmark/path_waypoint/W in landmarks_list)
 		if (W.z == src.z)
 			path_nodes.Add(W)

@@ -67,7 +67,7 @@ log transactions
 		break

 /obj/machinery/atm/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
 			linked_db = DB
 			break
@@ -35,7 +35,7 @@
 	if(current)
 		dat += specific()
 	else
-		for(var/obj/machinery/alarm/alarm in world)
+		for(var/obj/machinery/alarm/alarm in machines)
 			dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
 			switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
 				if (0)
@@ -141,7 +141,10 @@

 					//Sets the temperature the built-in heater/cooler tries to maintain.
 					if(env == "temperature")
-						current.target_temperature = (selected[2] + selected[3])/2
+						if(current.target_temperature < selected[2])
+							current.target_temperature = selected[2]
+						if(current.target_temperature > selected[3])
+							current.target_temperature = selected[3]

 					spawn(1)
 						updateUsrDialog()
@@ -49,7 +49,7 @@ var/sent_emergency_team = 0
 	// Shamelessly stolen nuke code
 	var/nuke_code
 	var/temp_code
-	for(var/obj/machinery/nuclearbomb/N in world)
+	for(var/obj/machinery/nuclearbomb/N in machines)
 		temp_code = text2num(N.r_code)
 		if(temp_code)
 			nuke_code = N.r_code
@@ -94,7 +94,7 @@ var/sent_emergency_team = 0

 	command_alert("Sensors indicate that [station_name()] has entered Code Red and is in need of assistance. We will prepare and dispatch an emergency response team to deal with the situation.", "NMV Icarus Command")

-	for(var/obj/effect/landmark/L in world)
+	for(var/obj/effect/landmark/L in landmarks_list)
 		if(L.name == "Response Team")
 			leader_selected = member_number == 1?1:0 // The last person selected will be the leader

@@ -75,21 +75,31 @@ connection
 			var/list/connections = air_master.turfs_with_connections[ref_A]
 			connections.Remove(src)

-		//Ensure we delete the right values by sanity checkign right before deletion.
-		Sanitize()
-
-		//Remove connection from current zones.
+		//Remove connection from zones.
 		if(A)
 			if(A.zone && A.zone.connections)
 				A.zone.connections.Remove(src)
 				if(!A.zone.connections.len)
 					A.zone.connections = null
+
+		if(istype(zone_A) && (!A || A.zone != zone_A))
+			if(zone_A.connections)
+				zone_A.connections.Remove(src)
+				if(!zone_A.connections.len)
+					zone_A.connections = null
+
 		if(B)
 			if(B.zone && B.zone.connections)
 				B.zone.connections.Remove(src)
 				if(!B.zone.connections.len)
 					B.zone.connections = null

+		if(istype(zone_B) && (!B || B.zone != zone_B))
+			if(zone_B.connections)
+				zone_B.connections.Remove(src)
+				if(!zone_B.connections.len)
+					zone_B.connections = null
+
 		//Disconnect zones while handling unusual conditions.
 		//	e.g. loss of a zone on a turf
 		if(A && A.zone && B && B.zone)
@@ -20,20 +20,19 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)


 turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
-	if(fire_protection > world.time-300) return
+	if(fire_protection > world.time-300)
+		return 0
+	if(locate(/obj/fire) in src)
+		return 1
 	var/datum/gas_mixture/air_contents = return_air()
 	if(!air_contents || exposed_temperature < PLASMA_MINIMUM_BURN_TEMPERATURE)
 		return 0

 	var/igniting = 0
-	if(locate(/obj/fire) in src)
-		return 1
-	var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
 	var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in src
-	if(air_contents.calculate_firelevel(liquid) > vsc.IgnitionLevel && (fuel || liquid || air_contents.toxins > 0.5))
+	
+	if(air_contents.check_combustability(liquid))
 		igniting = 1
-		if(air_contents.oxygen < 0.5)
-			return 0

 		if(! (locate(/obj/fire) in src))

@@ -63,89 +62,93 @@ obj

 		process()
 			. = 1
-
-			if(firelevel > vsc.IgnitionLevel)
-
-				var/turf/simulated/floor/S = loc
-				if(!S.zone) del src //Cannot exist where zones are broken.
-
-				if(istype(S))
-					var
-						datum/gas_mixture/air_contents = S.return_air()
-						//Get whatever trace fuels are in the area
-						datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
-						//Also get liquid fuels on the ground.
-						obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in S
-
-					var/datum/gas_mixture/flow = air_contents.remove_ratio(vsc.fire_consuption_rate)
-					//The reason we're taking a part of the air instead of all of it is so that it doesn't jump to
-					//the fire's max temperature instantaneously.
-
-					firelevel = air_contents.calculate_firelevel(liquid)
-
-					//Ensure that there is an appropriate amount of fuel and O2 here.
-					if(firelevel > 0.25 && flow.oxygen > 0.3 && (air_contents.toxins || fuel || liquid))
-
-						for(var/direction in cardinal)
-							if(S.air_check_directions&direction) //Grab all valid bordering tiles
-
-								var/turf/simulated/enemy_tile = get_step(S, direction)
-
-								if(istype(enemy_tile))
-									//If extinguisher mist passed over the turf it's trying to spread to, don't spread and
-									//reduce firelevel.
-									if(enemy_tile.fire_protection > world.time-30)
-										firelevel -= 1.5
-										continue
-
-									//Spread the fire.
-									if(!(locate(/obj/fire) in enemy_tile))
-										if( prob( firelevel*10 ) && S.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, S, 0,0))
-											new/obj/fire(enemy_tile,firelevel)
-
-					if(flow)
-
-						//Ensure adequate oxygen and fuel.
-						if(flow.oxygen > 0.3 && (flow.toxins || fuel || liquid))
-
-							//Change icon depending on the fuel, and thus temperature.
-							if(firelevel > 6)
-								icon_state = "3"
-								SetLuminosity(7)
-							else if(firelevel > 2.5)
-								icon_state = "2"
-								SetLuminosity(5)
-							else
-								icon_state = "1"
-								SetLuminosity(3)
-
-							//Ensure flow temperature is higher than minimum fire temperatures.
-							flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)
-
-							//Burn the gas mixture.
-							flow.zburn(liquid)
-							if(fuel && fuel.moles <= 0.00001)
-								air_contents.trace_gases.Remove(fuel)
-
-						else
-
-							del src
-
-
-						S.assume_air(flow) //Then put it back where you found it.
-
-					else
-						del src
-				else
-					del src
-			else
+			
+			//get location and check if it is in a proper ZAS zone
+			var/turf/simulated/floor/S = loc
+			if(!S.zone)
 				del src
-
-
+			
+			if(!istype(S))
+				del src
+				
+			var/datum/gas_mixture/air_contents = S.return_air()
+			//get liquid fuels on the ground.
+			var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in S
+			//and the volatile stuff from the air
+			var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases
+			
+			//since the air is processed in fractions, we need to make sure not to have any minuscle residue or
+			//the amount of moles might get to low for some functions to catch them and thus result in wonky behaviour
+			if(air_contents.oxygen < 0.001)
+				air_contents.oxygen = 0
+			if(air_contents.toxins < 0.001)
+				air_contents.toxins = 0
+			if(fuel)
+				if(fuel.moles < 0.001)
+					air_contents.trace_gases.Remove(fuel)
+			
+			//check if there is something to combust
+			if(!air_contents.check_combustability(liquid))
+				del src
+			
+			//get a firelevel and set the icon
+			firelevel = air_contents.calculate_firelevel(liquid)
+			
+			if(firelevel > 6)
+				icon_state = "3"
+				SetLuminosity(7)
+			else if(firelevel > 2.5)
+				icon_state = "2"
+				SetLuminosity(5)
+			else
+				icon_state = "1"
+				SetLuminosity(3)
+				
+			//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
 			for(var/mob/living/carbon/human/M in loc)
-				M.FireBurn(firelevel) //Burn the humans!
+				M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!

+			
+			//spread!
+			for(var/direction in cardinal)
+				if(S.air_check_directions&direction) //Grab all valid bordering tiles

+					var/turf/simulated/enemy_tile = get_step(S, direction)
+
+					if(istype(enemy_tile))
+						//If extinguisher mist passed over the turf it's trying to spread to, don't spread and
+						//reduce firelevel.
+						if(enemy_tile.fire_protection > world.time-30)
+							firelevel -= 1.5
+							continue
+
+						//Spread the fire.
+						if(!(locate(/obj/fire) in enemy_tile))
+							if( prob( 50 + 50 * (firelevel/vsc.fire_firelevel_multiplier) ) && S.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, S, 0,0))
+								new/obj/fire(enemy_tile,firelevel)
+			
+			//seperate part of the present gas
+			//this is done to prevent the fire burning all gases in a single pass
+			var/datum/gas_mixture/flow = air_contents.remove_ratio(vsc.fire_consuption_rate)
+			
+///////////////////////////////// FLOW HAS BEEN CREATED /// DONT DELETE THE FIRE UNTIL IT IS MERGED BACK OR YOU WILL DELETE AIR ///////////////////////////////////////////////
+			
+			if(flow)
+				if(flow.check_combustability(liquid))
+					//Ensure flow temperature is higher than minimum fire temperatures.
+						//this creates some energy ex nihilo but is necessary to get a fire started
+						//lets just pretend this energy comes from the ignition source and dont mention this again
+					//flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)
+					
+					//burn baby burn!
+					flow.zburn(liquid,1)
+				
+				//merge the air back
+				S.assume_air(flow)
+
+///////////////////////////////// FLOW HAS BEEN REMERGED /// feel free to delete the fire again from here on //////////////////////////////////////////////////////////////////
+
+					
 		New(newLoc,fl)
 			..()

@@ -175,14 +178,15 @@ turf/simulated/apply_fire_protection()
 	fire_protection = world.time


-datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid)
-	//This proc is similar to fire(), but uses a simple logarithm to calculate temp, and is thus more stable with ZAS.
-	if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE)
-		var
-			total_fuel = toxins
-
-			datum/gas/volatile_fuel/fuel = locate() in trace_gases
+datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid,force_burn)
+	var/value = 0
+	
+	if((temperature > PLASMA_MINIMUM_BURN_TEMPERATURE || force_burn) && check_combustability(liquid) )
+		var/total_fuel = 0 
+		var/datum/gas/volatile_fuel/fuel = locate() in trace_gases

+		total_fuel += toxins
+		
 		if(fuel)
 		//Volatile Fuel
 			total_fuel += fuel.moles
@@ -192,65 +196,93 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid)
 			if(liquid.amount <= 0)
 				del liquid
 			else
-				total_fuel += liquid.amount*15
+				total_fuel += liquid.amount

-		if(! (fuel || toxins || liquid) )
-			return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway.
+		//Calculate the firelevel.
+		var/firelevel = calculate_firelevel(liquid)

-		if(oxygen > 0.3)
+		//get the current inner energy of the gas mix
+		//this must be taken here to prevent the addition or deletion of energy by a changing heat capacity
+		var/starting_energy = temperature * heat_capacity()

-				//Calculate the firelevel.
-			var/firelevel = calculate_firelevel(liquid)
+		//determine the amount of oxygen used
+		var/total_oxygen = min(oxygen, 2 * total_fuel)
+		
+		//determine the amount of fuel actually used
+		var/used_fuel_ratio = min(oxygen / 2 , total_fuel) / total_fuel
+		total_fuel = total_fuel * used_fuel_ratio

-				//Reaches a maximum practical temperature of around 4500.
+		var/total_reactants = total_fuel + total_oxygen

-			//Increase temperature.
-			temperature = max( vsc.fire_temperature_multiplier*log(0.04*firelevel + 1.24) , temperature )
+		//determine the amount of reactants actually reacting
+		var/used_reactants_ratio = min( max(total_reactants * firelevel / vsc.fire_firelevel_multiplier, 0.2), total_reactants) / total_reactants

-			var/total_reactants = min(oxygen, 2*total_fuel) + total_fuel
+		//remove and add gasses as calculated
+		oxygen -= min(oxygen, total_oxygen * used_reactants_ratio )

-			//Consume some gas.
-			var/consumed_gas = max( min( total_reactants, vsc.fire_gas_combustion_ratio*firelevel ), 0.2)
+		toxins -= min(toxins, toxins * used_fuel_ratio * used_reactants_ratio )

-			oxygen -= min(oxygen, (total_reactants-total_fuel)*consumed_gas/total_reactants )
+		carbon_dioxide += max(2 * total_fuel, 0)

-			toxins -= min(toxins, toxins*consumed_gas/total_reactants )
+		if(fuel)
+			fuel.moles -= fuel.moles * used_fuel_ratio * used_reactants_ratio
+			if(fuel.moles <= 0) del fuel

-			carbon_dioxide += max(consumed_gas, 0)
+		if(liquid)
+			liquid.amount -= liquid.amount * used_fuel_ratio * used_reactants_ratio
+			if(liquid.amount <= 0) del liquid

-			if(fuel)
-				fuel.moles -= fuel.moles*consumed_gas/total_reactants
-				if(fuel.moles <= 0) del fuel
+		//calculate the energy produced by the reaction and then set the new temperature of the mix
+		temperature = (starting_energy + vsc.fire_fuel_energy_release * total_fuel) / heat_capacity()
+		
+		update_values()
+		value = total_reactants * used_reactants_ratio
+	return value

-			if(liquid)
-				liquid.amount -= liquid.amount*consumed_gas/(total_reactants)
-				if(liquid.amount <= 0) del liquid
-
-			update_values()
-			return consumed_gas
-	return 0
+datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid)
+	//this check comes up very often and is thus centralized here to ease adding stuff
+	
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases	
+	var/value = 0
+	
+	if(oxygen && (toxins || fuel || liquid))
+		value = 1
+	
+	return value

 datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fuel/liquid)
-		//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
-	var
-		datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
+	
+	var/datum/gas/volatile_fuel/fuel = locate() in trace_gases
+	var/total_fuel = 0
+	var/firelevel = 0
+	
+	if(check_combustability(liquid))
+	
+		total_fuel += toxins

-	var/total_fuel = toxins - 0.5
+		if(liquid)
+			total_fuel += liquid.amount

-	if(liquid)
-		total_fuel += (liquid.amount*15)
+		if(fuel)
+			total_fuel += fuel.moles

-	if(fuel)
-		total_fuel += fuel.moles
-
-	var/total_combustables = (total_fuel + oxygen)
-	if(total_fuel <= 0 || oxygen <= 0)
-		return 0
-
-	return max( 0, vsc.fire_firelevel_multiplier*(total_combustables/(total_combustables + nitrogen))*log(2*total_combustables/oxygen)*log(total_combustables/total_fuel))
+		var/total_combustables = (total_fuel + oxygen)
+		
+		if(total_fuel > 0 && oxygen > 0)
+			
+			//slows down the burning when the concentration of the reactants is low
+			var/dampening_multiplier = total_combustables / (total_combustables + nitrogen + carbon_dioxide)
+			//calculates how close the mixture of the reactants is to the optimum
+			var/mix_multiplier = 1 / (1 + (5 * ((oxygen / total_combustables) ^2)))
+			//toss everything together
+			firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * dampening_multiplier
+			
+	return max( 0, firelevel)


-/mob/living/carbon/human/proc/FireBurn(var/firelevel)
+/mob/living/carbon/human/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+// mostly using the old proc from Sky until I can think of something better
 	//Burns mobs due to fire. Respects heat transfer coefficients on various body parts.
 	//Due to TG reworking how fireprotection works, this is kinda less meaningful.

@@ -261,8 +293,9 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 		legs_exposure = 1
 		arms_exposure = 1

-	var/mx = min(max(0.1,firelevel / 20),10)
-	var/last_temperature = vsc.fire_temperature_multiplier*log(0.04*firelevel + 1.24)
+	//determine the multiplier
+	//minimize this for low-pressure enviroments
+	var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)

 	//Get heat transfer coefficients for clothing.
 	//skytodo: kill anyone who breaks things then orders me to fix them
@@ -293,4 +326,3 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue
 	apply_damage(0.4*mx*arms_exposure, BURN, "r_arm", 0, 0, "Fire")

 	//flash_pain()
-#undef ZAS_FIRE_CONSUMPTION_RATE
@@ -1,25 +1,18 @@
 var/global/vs_control/vsc = new

 vs_control/var
-	IgnitionLevel = 0.5
-	IgnitionLevel_DESC = "Determines point at which fire can ignite"
-
 	fire_consuption_rate = 0.25
 	fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
 	fire_consuption_rate_DESC = "Ratio of air removed and combusted per tick."

 	fire_firelevel_multiplier = 25
 	fire_firelevel_multiplier_NAME = "Fire - Firelevel Constant"
-	fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects the combustion and ignition of gas mixes."
-
-	fire_temperature_multiplier = 1700
-	fire_temperature_multiplier_NAME = "Fire - Temperature Multiplier"
-	fire_temperature_multiplier_DESC = "Base value for fire temperatures."
-
-	fire_gas_combustion_ratio = 0.25
-	fire_gas_combustion_ratio_NAME = "Fire - Gas Conversion Ratio"
-	fire_gas_combustion_ratio_DESC = "The rate at which oxygen and plasma are converted to CO2, expressed in terms of the firelevel."
+	fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects mainly the extingiushing of fires."

+	fire_fuel_energy_release = 397000
+	fire_fuel_energy_release_NAME = "Fire - Fuel energy release"
+	fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance"
+	

 	airflow_lightest_pressure = 20
 	airflow_lightest_pressure_NAME = "Airflow - Small Movement Threshold %"
@@ -229,7 +222,6 @@ vs_control
 				plc.CONTAMINATION_LOSS = 0.075

 			if("ZAS - Normal")
-				IgnitionLevel = 0.5
 				airflow_lightest_pressure = 20
 				airflow_light_pressure = 35
 				airflow_medium_pressure = 50
@@ -244,7 +236,6 @@ vs_control
 				airflow_mob_slowdown = 1

 			if("ZAS - Forgiving")
-				IgnitionLevel = 1
 				airflow_lightest_pressure = 45
 				airflow_light_pressure = 60
 				airflow_medium_pressure = 120
@@ -259,7 +250,6 @@ vs_control
 				airflow_mob_slowdown = 0

 			if("ZAS - Dangerous")
-				IgnitionLevel = 0.4
 				airflow_lightest_pressure = 15
 				airflow_light_pressure = 30
 				airflow_medium_pressure = 45
@@ -274,7 +264,6 @@ vs_control
 				airflow_mob_slowdown = 2

 			if("ZAS - Hellish")
-				IgnitionLevel = 0.3
 				airflow_lightest_pressure = 20
 				airflow_light_pressure = 30
 				airflow_medium_pressure = 40
@@ -330,4 +319,4 @@ pl_control
 					newvalue = roll(txt)
 			else
 				newvalue = vars[V]
-			vars[V] = newvalue
+			vars[V] = newvalue
@@ -385,7 +385,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output)
 		// slowly than small rooms, preserving our good old "hollywood-style"
 		// oh-shit effect when large rooms get breached, but still having small
 		// rooms remain pressurized for long enough to make escape possible.
-		share_size = max(1, max(size - 5, 1) + unsimulated_tiles.len)
+		share_size = max(1, max(size + 3, 1) + unsimulated_tiles.len)
 		correction_ratio = share_size / unsimulated_tiles.len

 	for(var/turf/T in unsimulated_tiles)
@@ -1198,7 +1198,7 @@ proc/oview_or_orange(distance = world.view , center = usr , type)

 proc/get_mob_with_client_list()
 	var/list/mobs = list()
-	for(var/mob/M in world)
+	for(var/mob/M in mob_list)
 		if (M.client)
 			mobs += M
 	return mobs
@@ -77,7 +77,6 @@
 	var/alert_desc_delta = "The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."

 	var/forbid_singulo_possession = 0
-	var/useircbot = 0

 	//game_options.txt configs

@@ -119,6 +118,11 @@
 	var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
 	var/ghost_interaction = 0

+	var/use_irc_bot = 0
+	var/main_irc = ""
+	var/admin_irc = ""
+	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
+

 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -363,8 +367,8 @@
 				if("allow_holidays")
 					Holiday = 1

-				if("useircbot")
-					useircbot = 1
+				if("use_irc_bot")
+					use_irc_bot = 1

 				if("ticklag")
 					Ticklag = text2num(value)
@@ -403,6 +407,21 @@
 				if("ghost_interaction")
 					config.ghost_interaction = 1

+				if("main_irc")
+					config.main_irc = value
+
+				if("admin_irc")
+					config.admin_irc = value
+
+				if("python_path")
+					if(value)
+						config.python_path = value
+					else
+						if(world.system_type == UNIX)
+							config.python_path = "/usr/bin/env python2"
+						else //probably windows, if not this should work anyway
+							config.python_path = "python"
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"

@@ -84,12 +84,12 @@ datum/controller/game_controller/proc/setup_objects()

 	world << "\red \b Initializing pipe networks"
 	sleep(-1)
-	for(var/obj/machinery/atmospherics/machine in world)
+	for(var/obj/machinery/atmospherics/machine in machines)
 		machine.build_network()

 	world << "\red \b Initializing atmos machinery."
 	sleep(-1)
-	for(var/obj/machinery/atmospherics/unary/U in world)
+	for(var/obj/machinery/atmospherics/unary/U in machines)
 		if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
 			var/obj/machinery/atmospherics/unary/vent_pump/T = U
 			T.broadcast_status()
@@ -131,7 +131,7 @@ datum/shuttle_controller

 							start_location.move_contents_to(end_location, null, NORTH)

-							for(var/obj/machinery/door/unpowered/D in world)
+							for(var/obj/machinery/door/unpowered/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.locked = 0
@@ -153,7 +153,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod1/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)

-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -173,7 +173,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod2/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)

-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -193,7 +193,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod3/centcom)
 							start_location.move_contents_to(end_location, null, NORTH)

-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -213,7 +213,7 @@ datum/shuttle_controller
 							end_location = locate(/area/shuttle/escape_pod5/centcom)
 							start_location.move_contents_to(end_location, null, EAST)

-							for(var/obj/machinery/door/D in world)
+							for(var/obj/machinery/door/D in machines)
 								if( get_area(D) == end_location )
 									spawn(0)
 										D.open()
@@ -280,9 +280,12 @@ datum/shuttle_controller
 						for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
 							bug.gib()

+						for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
+							pest.gib()
+
 						start_location.move_contents_to(end_location)
 						settimeleft(SHUTTLELEAVETIME)
-						send2irc("Server", "The Emergency Shuttle has docked with the station.")
+						//send2irc("Server", "The Emergency Shuttle has docked with the station.")
 						captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
 						world << sound('sound/AI/shuttledock.ogg')

@@ -1,5 +1,7 @@
 var/datum/controller/vote/vote = new()

+var/global/list/round_voters = list() //Keeps track of the individuals voting for a given round, for use in forcedrafting.
+
 datum/controller/vote
 	var/initiator = null
 	var/started_time = null
@@ -119,6 +121,11 @@ datum/controller/vote
 				for(var/option in winners)
 					text += "\t[option]\n"
 			. = pick(winners)
+
+			for(var/key in current_votes)
+				if(choices[current_votes[key]] == .)
+					round_voters += key // Keep track of who voted for the winning round.
+
 			text += "<b>Vote Result: [.]</b>"
 		else
 			text += "<b>Vote Result: Inconclusive - No Votes!</b>"
@@ -270,9 +277,9 @@ datum/controller/vote
 				var/votes = choices[choices[i]]
 				if(!votes)	votes = 0
 				if(current_votes[C.ckey] == i)
-					. += "<li><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a> ([votes] votes)</b></li>"
+					. += "<li><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></li>"
 				else
-					. += "<li><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a> ([votes] votes)</li>"
+					. += "<li><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></li>"

 			. += "</ul><hr>"
 			if(admin)
@@ -217,7 +217,7 @@ datum/mind
 				text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
 				text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
 				var/code
-				for (var/obj/machinery/nuclearbomb/bombue in world)
+				for (var/obj/machinery/nuclearbomb/bombue in machines)
 					if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 						code = bombue.r_code
 						break
@@ -719,7 +719,7 @@ datum/mind
 						usr << "\red Equipping a syndicate failed!"
 				if("tellcode")
 					var/code
-					for (var/obj/machinery/nuclearbomb/bombue in world)
+					for (var/obj/machinery/nuclearbomb/bombue in machines)
 						if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 							code = bombue.r_code
 							break
@@ -80,17 +80,7 @@
 			var/name = t.fields["name"]
 			var/rank = t.fields["rank"]
 			var/real_rank = t.fields["real_rank"]
-
-			var/active = 0
-			for(var/mob/M in player_list) if(M.name == name)
-				// For dead ones, have a chance to get their status wrong
-				if(M.stat == 2)
-					active = M.x % 2 // Should be good enough, avoids their status flipping constantly
-					break
-				else if(M.client && M.client.inactivity <= 10 * 60 * 10)
-					active = 1
-					break
-			isactive[name] = active ? "Active" : "SSD"
+			isactive[name] = t.fields["p_stat"]

 			//world << "[name]: [rank]"

@@ -53,7 +53,7 @@
 						aiPlayer.cancelAlarm("Power", src, source)
 					else
 						aiPlayer.triggerAlarm("Power", src, cameras, source)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				if(a.z == source.z)
 					if(state == 1)
 						a.cancelAlarm("Power", src, source)
@@ -75,12 +75,12 @@
 					cameras += C
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.triggerAlarm("Atmosphere", src, cameras, src)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				a.triggerAlarm("Atmosphere", src, cameras, src)
 		else if (atmosalm == 2)
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.cancelAlarm("Atmosphere", src, src)
-			for(var/obj/machinery/computer/station_alert/a in world)
+			for(var/obj/machinery/computer/station_alert/a in machines)
 				a.cancelAlarm("Atmosphere", src, src)
 		atmosalm = danger_level
 		return 1
@@ -105,7 +105,7 @@
 			cameras += C
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			aiPlayer.triggerAlarm("Fire", src, cameras, src)
-		for (var/obj/machinery/computer/station_alert/a in world)
+		for (var/obj/machinery/computer/station_alert/a in machines)
 			a.triggerAlarm("Fire", src, cameras, src)

 /area/proc/firereset()
@@ -122,7 +122,7 @@
 					D.open()
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			aiPlayer.cancelAlarm("Fire", src, src)
-		for (var/obj/machinery/computer/station_alert/a in world)
+		for (var/obj/machinery/computer/station_alert/a in machines)
 			a.cancelAlarm("Fire", src, src)

 /area/proc/readyalert()
@@ -81,7 +81,7 @@
 		var/playercount = 0
 		var/traitorcount = 0
 		var/possible_traitors[0]
-		for(var/mob/living/player in world)
+		for(var/mob/living/player in mob_list)

 			if (player.client && player.stat != 2)
 				playercount += 1
@@ -153,7 +153,7 @@
 		//message_admins("Checking number of players")
 		var/playercount = 0
 		var/traitorcount = 0
-		for(var/mob/living/player in world)
+		for(var/mob/living/player in mob_list)

 			if (player.client && player.stat != 2)
 				playercount += 1
@@ -19,7 +19,7 @@
 			intercepttext += "Message ends."
 		if(2)
 			var/nukecode = "ERROR"
-			for(var/obj/machinery/nuclearbomb/bomb in world)
+			for(var/obj/machinery/nuclearbomb/bomb in machines)
 				if(bomb && bomb.r_code)
 					if(bomb.z == 1)
 						nukecode = bomb.r_code
@@ -39,7 +39,7 @@
 					aiPlayer.set_zeroth_law(law)
 					aiPlayer << "Laws Updated: [law]"

-	for(var/obj/machinery/computer/communications/comm in world)
+	for(var/obj/machinery/computer/communications/comm in machines)
 		comm.messagetitle.Add(interceptname)
 		comm.messagetext.Add(intercepttext)
 		if(!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
@@ -186,7 +186,7 @@
 	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
 	//world << sound('sound/AI/aliens.ogg')
 	var/list/vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
+	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
 		if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
 			if(temp_vent.network.normal_members.len > 50) // Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
@@ -325,7 +325,7 @@
 				apc.overload_lighting()

 	else
-		for(var/obj/machinery/power/apc/apc in world)
+		for(var/obj/machinery/power/apc/apc in machines)
 			apc.overload_lighting()

 	return
@@ -436,7 +436,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 					M.add_ion_law("THE STATION IS [who2pref] [who2]")

 	if(botEmagChance)
-		for(var/obj/machinery/bot/bot in world)
+		for(var/obj/machinery/bot/bot in machines)
 			if(prob(botEmagChance))
 				bot.Emag()

@@ -869,25 +869,27 @@ ________________________________________________________________________________
 	if(s_active)
 		cancel_stealth()
 	else
-		spawn(0)
-			anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
+		anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
 		s_active=!s_active
-		U.update_icons()	//update their icons
+		icon_state = U.gender==FEMALE ? "s-ninjasf" : "s-ninjas"
+		U.regenerate_icons()	//update their icons
 		U << "\blue You are now invisible to normal detection."
 		for(var/mob/O in oviewers(U))
 			O.show_message("[U.name] vanishes into thin air!",1)
+		U.invisibility = INVISIBILITY_OBSERVER
 	return

 /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
 	var/mob/living/carbon/human/U = affecting
 	if(s_active)
-		spawn(0)
-			anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
+		anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
 		s_active=!s_active
-		U.update_icons()	//update their icons
 		U << "\blue You are now visible."
+		U.invisibility = 0
 		for(var/mob/O in oviewers(U))
 			O.show_message("[U.name] appears from thin air!",1)
+		icon_state = U.gender==FEMALE ? "s-ninjanf" : "s-ninjan"
+		U.regenerate_icons()	//update their icons
 		return 1
 	return 0

@@ -521,7 +521,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 	mind.assigned_role = "MODE"
 	mind.special_role = "Ninja"

-	ticker.mode.ninjas |= mind
+	//ticker.mode.ninjas |= mind
 	return 1

 /mob/living/carbon/human/proc/equip_space_ninja(safety=0)//Safety in case you need to unequip stuff for existing characters.
@@ -195,7 +195,7 @@ Implants;
 	if(escaped_on_pod_5 > 0)
 		feedback_set("escaped_on_pod_5",escaped_on_pod_5)

-	send2irc("Server", "Round just ended.")
+	send2mainirc("A round of [src.name] has ended - [surviving_total] survivors, [ghosts] ghosts.")

 	return 0

@@ -243,7 +243,7 @@ Implants;
 			else
 				intercepttext += "<b>[M.name]</b>, the <b>[M.mind.assigned_role]</b> <br>"

-	for (var/obj/machinery/computer/communications/comm in world)
+	for (var/obj/machinery/computer/communications/comm in machines)
 		if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
 			var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc )
 			intercept.name = "paper- 'Cent. Com. Status Summary'"
@@ -264,8 +264,8 @@ Implants;
 /datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=0)
 	var/list/players = list()
 	var/list/candidates = list()
-	var/list/drafted = list()
-	var/datum/mind/applicant = null
+	//var/list/drafted = list()
+	//var/datum/mind/applicant = null

 	var/roletext
 	switch(role)
@@ -277,29 +277,40 @@ Implants;
 		if(BE_CULTIST)		roletext="cultist"
 		if(BE_NINJA)		roletext="ninja"

-	// Ultimate randomizing code right here
+	// Assemble a list of active players without jobbans.
 	for(var/mob/new_player/player in player_list)
-		if(player.client && player.ready)
-			players += player
+		if( player.client && player.ready )
+			if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext))
+				players += player

-	// Shuffling, the players list is now ping-independent!!!
-	// Goodbye antag dante
+	// Shuffle the players list so that it becomes ping-independent.
 	players = shuffle(players)

+	// Get a list of all the people who want to be the antagonist for this round
 	for(var/mob/new_player/player in players)
-		if(player.client && player.ready)
-			if(player.client.prefs.be_special & role)
-				if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, roletext)) //Nodrak/Carn: Antag Job-bans
-					candidates += player.mind				// Get a list of all the people who want to be the antagonist for this round
-					log_debug("[player.key] had [roletext] enabled, so drafting them.")
+		if(player.client.prefs.be_special & role)
+			log_debug("[player.key] had [roletext] enabled, so we are drafting them.")
+			candidates += player.mind
+			players -= player

+	// If we don't have enough antags, draft people who voted for the round.
+	if(candidates.len < recommended_enemies)
+		for(var/key in round_voters)
+			for(var/mob/new_player/player in players)
+				if(player.ckey == key)
+					log_debug("[player.key] voted for this round, so we are drafting them.")
+					candidates += player.mind
+					players -= player
+					break
+
+	// Remove candidates who want to be antagonist but have a job that precludes it
 	if(restricted_jobs)
 		for(var/datum/mind/player in candidates)
-			for(var/job in restricted_jobs)					// Remove people who want to be antagonist but have a job already that precludes it
+			for(var/job in restricted_jobs)
 				if(player.assigned_role == job)
 					candidates -= player

-	if(candidates.len < recommended_enemies)
+	/*if(candidates.len < recommended_enemies)
 		for(var/mob/new_player/player in players)
 			if(player.client && player.ready)
 				if(!(player.client.prefs.be_special & role)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one
@@ -349,6 +360,7 @@ Implants;

 		else												// Not enough scrubs, ABORT ABORT ABORT
 			break
+	*/

 	return candidates		// Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies
 							//			recommended_enemies if the number of people with that role set to yes is less than recomended_enemies,
@@ -108,7 +108,7 @@ var/global/datum/controller/gameticker/ticker

 	//setup the money accounts
 	if(!centcomm_account_db)
-		for(var/obj/machinery/account_database/check_db in world)
+		for(var/obj/machinery/account_database/check_db in machines)
 			if(check_db.z == 2)
 				centcomm_account_db = check_db
 				break
@@ -142,7 +142,7 @@ var/global/datum/controller/gameticker/ticker
 		if(C.holder)
 			admins_number++
 	if(admins_number == 0)
-		send2irc("Server", "Round just started with no admins online!")
+		send2adminirc("Round has started with no admins online.")

 	supply_shuttle.process() 		//Start the supply shuttle regenerating points -- TLE
 	master_controller.process()		//Start master_controller.process()
@@ -569,6 +569,7 @@ datum/objective/steal
 					for(var/mob/living/silicon/ai/M in C)
 						if(istype(M, /mob/living/silicon/ai) && M.stat != 2) //See if any AI's are alive inside that card.
 							return 1
+
 				for(var/obj/item/clothing/suit/space/space_ninja/S in all_items) //Let an AI downloaded into a space ninja suit count
 					if(S.AI && S.AI.stat != 2)
 						return 1
@@ -61,6 +61,9 @@
 					t1 = "<font color='red'>*dead*</font>"
 				else
 			dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
+			if(iscarbon(occupant))
+				var/mob/living/carbon/C = occupant
+				dat += text("[]\t-Pulse, bpm: []</FONT><BR>", (C.pulse == PULSE_NONE || C.pulse == PULSE_THREADY ? "<font color='red'>" : "<font color='blue'>"), C.get_pulse(GETPULSE_TOOL))
 			dat += text("[]\t-Brute Damage %: []</FONT><BR>", (occupant.getBruteLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getBruteLoss())
 			dat += text("[]\t-Respiratory Damage %: []</FONT><BR>", (occupant.getOxyLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getOxyLoss())
 			dat += text("[]\t-Toxin Content %: []</FONT><BR>", (occupant.getToxLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getToxLoss())
@@ -48,7 +48,10 @@
 #define RCON_YES	3

 //1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
-#define MAX_ENERGY_CHANGE 2000
+#define MAX_ENERGY_CHANGE 1000
+
+#define MAX_TEMPERATURE 90
+#define MIN_TEMPERATURE -40

 //all air alarms in area are connected via magic
 /area
@@ -85,6 +88,7 @@
 	var/area_uid
 	var/area/alarm_area
 	var/danger_level = 0
+	var/buildstage = 2 //2 is built, 1 is building, 0 is frame.

 	var/target_temperature = T0C+20
 	var/regulating_temperature = 0
@@ -104,8 +108,26 @@
 		TLV["temperature"] =	list(20, 40, 140, 160) // K
 		target_temperature = 90

-	New()
+	New(var/loc, var/dir, var/building = 0)
 		..()
+
+		if(building)
+			if(loc)
+				src.loc = loc
+
+			if(dir)
+				src.dir = dir
+
+			buildstage = 0
+			wiresexposed = 1
+			pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
+			pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
+			update_icon()
+			return
+
+		first_run()
+
+	proc/first_run()
 		alarm_area = get_area(src)
 		if (alarm_area.master)
 			alarm_area = alarm_area.master
@@ -128,7 +150,7 @@


 	process()
-		if((stat & (NOPOWER|BROKEN)) || shorted)
+		if((stat & (NOPOWER|BROKEN)) || shorted || buildstage != 2)
 			return

 		var/turf/simulated/location = loc
@@ -137,18 +159,21 @@
 		var/datum/gas_mixture/environment = location.return_air()

 		//Handle temperature adjustment here.
-		if(environment.temperature < target_temperature - 10 || environment.temperature > target_temperature + 10 || regulating_temperature)
+		if(environment.temperature < target_temperature - 2 || environment.temperature > target_temperature + 2 || regulating_temperature)
 			//If it goes too far, we should adjust ourselves back before stopping.
+			if(get_danger_level(target_temperature, TLV["temperature"]))
+				return
+
 			if(!regulating_temperature)
 				regulating_temperature = 1
 				visible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
 				"You hear a click and a faint electronic hum.")

-			if(target_temperature > T0C + 90)
-				target_temperature = T0C + 90
+			if(target_temperature > T0C + MAX_TEMPERATURE)
+				target_temperature = T0C + MAX_TEMPERATURE

-			if(target_temperature < T0C - 40)
-				target_temperature = T0C - 40
+			if(target_temperature < T0C + MIN_TEMPERATURE)
+				target_temperature = T0C + MIN_TEMPERATURE

 			var/datum/gas_mixture/gas = location.remove_air(0.25*environment.total_moles)
 			var/heat_capacity = gas.heat_capacity()
@@ -480,6 +505,14 @@
 		var/wireFlag = AAlarmIndexToFlag[wireIndex]
 		return ((AAlarmwires & wireFlag) == 0)

+	proc/allWiresCut()
+		var/i = 1
+		while(i<=5)
+			if(AAlarmwires & AAlarmIndexToFlag[i])
+				return 0
+			i++
+		return 1
+
 	proc/cut(var/wireColor)
 		var/wireFlag = AAlarmWireColorToFlag[wireColor]
 		var/wireIndex = AAlarmWireColorToIndex[wireColor]
@@ -603,6 +636,9 @@
 	interact(mob/user)
 		user.set_machine(src)

+		if(buildstage!=2)
+			return
+
 		if ( (get_dist(src, user) > 1 ))
 			if (!istype(user, /mob/living/silicon))
 				user.machine = null
@@ -709,7 +745,7 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		else if (other_dangerlevel==1)
 			output += "Notice: <span class='dl1'>Low Concentration of Unknown Particles Detected</span><br>"

-		output += "Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]</span>K<br>"
+		output += "Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]</span>K ([round(environment.temperature - T0C, 0.1)]C)<br>"

 		//Overall status
 		output += "Local Status: "
@@ -727,7 +763,7 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		return output

 	proc/rcon_text()
-		var/dat = "<b>Remote Control:</b><br>"
+		var/dat = "<table width=\"100%\"><td align=\"center\"><b>Remote Control:</b><br>"
 		if(rcon_setting == RCON_NO)
 			dat += "<b>Off</b>"
 		else
@@ -741,7 +777,11 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 		if(rcon_setting == RCON_YES)
 			dat += "<b>On</b>"
 		else
-			dat += "<a href='?src=\ref[src];rcon=[RCON_YES]'>On</a>"
+			dat += "<a href='?src=\ref[src];rcon=[RCON_YES]'>On</a></td>"
+
+		//Hackish, I know.  I didn't feel like bothering to rework all of this.
+		dat += "<td align=\"center\"><b>Thermostat:</b><br><a href='?src=\ref[src];temperature=1'>[target_temperature - T0C]C</a></td></table>"
+
 		return dat

 	proc/return_controls()
@@ -985,10 +1025,6 @@ table tr:first-child th:first-child { border: none;}
 						if(selected[3] > selected[4])
 							selected[3] = selected[4]

-					//Sets the temperature the built-in heater/cooler tries to maintain.
-					if(env == "temperature")
-						target_temperature = (selected[2] + selected[3])/2
-
 					apply_mode()

 		if(href_list["screen"])
@@ -1015,6 +1051,16 @@ table tr:first-child th:first-child { border: none;}
 			mode = text2num(href_list["mode"])
 			apply_mode()

+		if(href_list["temperature"])
+			var/list/selected = TLV["temperature"]
+			var/max_temperature = min(selected[3] - T0C, MAX_TEMPERATURE)
+			var/min_temperature = max(selected[2] - T0C, MIN_TEMPERATURE)
+			var/input_temperature = input("What temperature would you like the system to mantain? (Capped between [min_temperature]C and [max_temperature]C)", "Thermostat Controls") as num|null
+			if(!input_temperature || input_temperature > max_temperature || input_temperature < min_temperature)
+				usr << "Temperature must be between [min_temperature]C and [max_temperature]C"
+			else
+				target_temperature = input_temperature + T0C
+
 		if (href_list["AAlarmwires"])
 			var/t1 = text2num(href_list["AAlarmwires"])
 			if (!( istype(usr.equipped(), /obj/item/weapon/wirecutters) ))
@@ -1048,28 +1094,74 @@ table tr:first-child th:first-child { border: none;}
 		update_icon()
 		return
 */
-	if(istype(W, /obj/item/weapon/screwdriver))  // Opening that Air Alarm up.
-		//user << "You pop the Air Alarm's maintence panel open."
-		wiresexposed = !wiresexposed
-		user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
-		update_icon()
-		return
+	src.add_fingerprint(user)

-	if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
-		return attack_hand(user)
+	switch(buildstage)
+		if(2)
+			if(istype(W, /obj/item/weapon/screwdriver))  // Opening that Air Alarm up.
+				//user << "You pop the Air Alarm's maintence panel open."
+				wiresexposed = !wiresexposed
+				user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
+				update_icon()
+				return

+			if (wiresexposed && ((istype(W, /obj/item/device/multitool) || istype(W, /obj/item/weapon/wirecutters))))
+				return attack_hand(user)
+
+			if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
+				if(stat & (NOPOWER|BROKEN))
+					user << "It does nothing"
+					return
+				else
+					if(allowed(usr) && !isWireCut(AALARM_WIRE_IDSCAN))
+						locked = !locked
+						user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface."
+						updateUsrDialog()
+					else
+						user << "\red Access denied."
+			return
+
+		if(1)
+			if(istype(W, /obj/item/weapon/cable_coil))
+				var/obj/item/weapon/cable_coil/coil = W
+				if(coil.amount < 5)
+					user << "You need more cable for this!"
+					return
+
+				user << "You wire \the [src]!"
+				coil.amount -= 5
+				if(!coil.amount)
+					del(coil)
+
+				buildstage = 2
+				update_icon()
+				first_run()
+
+			else if(istype(W, /obj/item/weapon/crowbar))
+				user << "You pry out the circuit!"
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				spawn(20)
+					var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics()
+					circuit.loc = user.loc
+					buildstage = 0
+					update_icon()
+			return
+		if(0)
+			if(istype(W, /obj/item/weapon/airalarm_electronics))
+				user << "You insert the circuit!"
+				del(W)
+				buildstage = 1
+				update_icon()
+
+				/* Commented out due to RUNTIMES, RUNTIMES EVERYWHERE.
+				else if(istype(W, /obj/item/weapon/wrench))
+					user << "You remove the fire alarm assembly from the wall!"
+					var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame()
+					frame.loc = user.loc
+					playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+					del(src) */
+			return

-	else if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
-		if(stat & (NOPOWER|BROKEN))
-			user << "It does nothing"
-		else
-			if(allowed(usr) && !isWireCut(AALARM_WIRE_IDSCAN))
-				locked = !locked
-				user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface."
-				updateUsrDialog()
-			else
-				user << "\red Access denied."
-		return
 	return ..()

 /obj/machinery/alarm/power_change()
@@ -1218,15 +1310,6 @@ FIRE ALARM
 						user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
 					else
 						user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
-
-				else if (istype(W, /obj/item/weapon/wirecutters))
-					buildstage = 1
-					playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
-					var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil()
-					coil.amount = 5
-					coil.loc = user.loc
-					user << "You cut the wires from \the [src]"
-					update_icon()
 			if(1)
 				if(istype(W, /obj/item/weapon/cable_coil))
 					var/obj/item/weapon/cable_coil/coil = W
@@ -55,6 +55,7 @@
 <B>Fire Damage:</B> [src.victim.getFireLoss()]<BR>
 <B>Suffocation Damage:</B> [src.victim.getOxyLoss()]<BR>
 <B>Patient Status:</B> [src.victim.stat ? "Non-Responsive" : "Stable"]<BR>
+<B>Heartbeat rate:</B> [victim.get_pulse(GETPULSE_TOOL)]<BR>
 "}
 	else
 		src.victim = null
@@ -151,12 +151,19 @@
 			src.active1 = null
 			src.active2 = null
 		else if (href_list["login"])
-			if (istype(usr, /mob/living/silicon))
+			if (istype(usr, /mob/living/silicon/ai))
 				src.active1 = null
 				src.active2 = null
-				src.authenticated = 1
+				src.authenticated = usr.name
 				src.rank = "AI"
 				src.screen = 1
+			else if (istype(usr, /mob/living/silicon/robot))
+				src.active1 = null
+				src.active2 = null
+				src.authenticated = usr.name
+				var/mob/living/silicon/robot/R = usr
+				src.rank = R.braintype
+				src.screen = 1
 			else if (istype(src.scan, /obj/item/weapon/card/id))
 				src.active1 = null
 				src.active2 = null
@@ -400,7 +407,7 @@
 				var/counter = 1
 				while(src.active2.fields[text("com_[]", counter)])
 					counter++
-				src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", src.authenticated, src.rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")

 			if (href_list["del_c"])
 				if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
@@ -235,5 +235,12 @@ var/prison_shuttle_timeleft = 0
 						AM.Move(D)
 					if(istype(T, /turf/simulated))
 						del(T)
+
+				for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
+					bug.gib()
+
+				for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
+					pest.gib()
+
 				start_location.move_contents_to(end_location)
 		return
@@ -245,12 +245,19 @@ What a mess.*/
 				active2 = null

 			if("Log In")
-				if (istype(usr, /mob/living/silicon))
-					active1 = null
-					active2 = null
-					authenticated = 1
-					rank = "AI"
-					screen = 1
+				if (istype(usr, /mob/living/silicon/ai))
+					src.active1 = null
+					src.active2 = null
+					src.authenticated = usr.name
+					src.rank = "AI"
+					src.screen = 1
+				else if (istype(usr, /mob/living/silicon/robot))
+					src.active1 = null
+					src.active2 = null
+					src.authenticated = usr.name
+					var/mob/living/silicon/robot/R = usr
+					src.rank = R.braintype
+					src.screen = 1
 				else if (istype(scan, /obj/item/weapon/card/id))
 					active1 = null
 					active2 = null
@@ -362,7 +369,7 @@ What a mess.*/
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]", authenticated, rank, time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+				active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")

 			if ("Delete Record (ALL)")
 				if (active1)
@@ -77,6 +77,12 @@ var/specops_shuttle_timeleft = 0
 		if(istype(T, /turf/simulated))
 			del(T)

+	for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
+		bug.gib()
+
+	for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
+		pest.gib()
+
 	start_location.move_contents_to(end_location)

 	for(var/turf/T in get_area_turfs(end_location) )
@@ -162,6 +162,12 @@ var/syndicate_elite_shuttle_timeleft = 0
 		if(istype(T, /turf/simulated))
 			del(T)

+	for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
+		bug.gib()
+
+	for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
+		pest.gib()
+
 	start_location.move_contents_to(end_location)

 	for(var/turf/T in get_area_turfs(end_location) )
@@ -87,7 +87,7 @@
 		<B>Current cell temperature:</B> [temp_text]K<BR>
 		<B>Cryo status:</B> [ on ? "<A href='?src=\ref[src];start=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];start=1'>On</A>"]<BR>
 		[beaker_text]<BR><BR>
-		<B>Current occupant:</B> [occupant ? "<BR>Name: [occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(occupant.getToxLoss(),0.1)]<BR>Body temperature: [occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
+		<B>Current occupant:</B> [occupant ? "<BR>Name: [occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(occupant.getToxLoss(),0.1)]<BR>Body temperature: [occupant.bodytemperature]<BR>Heartbeat rate: [occupant.get_pulse(GETPULSE_TOOL)]" : "<FONT color=red>None</FONT>"]<BR>
 		"}
 	user.set_machine(src)
 	user << browse(dat, "window=cryo")
@@ -6,10 +6,12 @@ var/list/doppler_arrays = list()


 /obj/machinery/doppler_array/New()
+	..()
 	doppler_arrays += src

 /obj/machinery/doppler_array/Del()
 	doppler_arrays -= src
+	..()

 /obj/machinery/doppler_array/process()
 	return PROCESS_KILL
@@ -114,6 +114,7 @@ Class Procs:
 	machines += src

 /obj/machinery/Del()
+	machines -= src
 	..()

 /obj/machinery/process()//If you dont use process or power why are you here
@@ -69,6 +69,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			icon_state = "req_comp0"

 /obj/machinery/requests_console/New()
+	..()
 	name = "[department] Requests Console"
 	allConsoles += src
 	//req_console_departments += department
@@ -23,7 +23,7 @@
 										"diamond"=0,
 										"plasma"=0,
 										"uranium"=0,
-										"bananium"=0
+										//"bananium"=0 No need to state what it can no longer hold
 										)
 	var/res_max_amount = 200000
 	var/datum/research/files
@@ -89,7 +89,7 @@
 						/obj/item/mecha_parts/part/durand_right_leg,
 						/obj/item/mecha_parts/part/durand_armour
 					),
-	"H.O.N.K"=list(
+	/*"H.O.N.K"=list(
 						/obj/item/mecha_parts/chassis/honker,
 						/obj/item/mecha_parts/part/honker_torso,
 						/obj/item/mecha_parts/part/honker_head,
@@ -97,7 +97,7 @@
 						/obj/item/mecha_parts/part/honker_right_arm,
 						/obj/item/mecha_parts/part/honker_left_leg,
 						/obj/item/mecha_parts/part/honker_right_leg
-						),
+						), No need for HONK stuff*/
 	"Exosuit Equipment"=list(
 						/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,
 						/obj/item/mecha_parts/mecha_equipment/tool/drill,
@@ -111,9 +111,9 @@
 						///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING
 						/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
 						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg,
-						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar,
-						/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar,
-						/obj/item/mecha_parts/mecha_equipment/weapon/honker
+						///obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, HONK-related mech part
+						///obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar, Also HONK-related
+						///obj/item/mecha_parts/mecha_equipment/weapon/honker Thirdly HONK-related
 						),

 	"Robotic Upgrade Modules" = list(
@@ -680,8 +680,8 @@
 			type = /obj/item/stack/sheet/mineral/plasma
 		if("uranium")
 			type = /obj/item/stack/sheet/mineral/uranium
-		if("bananium")
-			type = /obj/item/stack/sheet/mineral/clown
+		/*if("bananium")
+			type = /obj/item/stack/sheet/mineral/clown Sorry, but no more clown mechs, even if you do manage to get to the clown planet.*/
 		else
 			return 0
 	var/result = 0
@@ -739,9 +739,9 @@
 			if(src.resources["diamond"] >= 2000)
 				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
 				G.amount = round(src.resources["diamond"] / G.perunit)
-			if(src.resources["bananium"] >= 2000)
+			/*if(src.resources["bananium"] >= 2000)
 				var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc)
-				G.amount = round(src.resources["bananium"] / G.perunit)
+				G.amount = round(src.resources["bananium"] / G.perunit) Sorry, but no bananium allowed*/
 			del(src)
 			return 1
 		else
@@ -765,8 +765,8 @@
 			material = "metal"
 		if(/obj/item/stack/sheet/glass)
 			material = "glass"
-		if(/obj/item/stack/sheet/mineral/clown)
-			material = "bananium"
+		/*if(/obj/item/stack/sheet/mineral/clown)
+			material = "bananium"*/
 		if(/obj/item/stack/sheet/mineral/uranium)
 			material = "uranium"
 		else
@@ -87,8 +87,8 @@
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
 					foundVirus++
-			//if(patient.virus2)
-			//	foundVirus++
+			if(patient.virus2)
+				foundVirus++

 			holder = patient.hud_list[HEALTH_HUD]
 			if(patient.stat == 2)
@@ -1,4 +1,4 @@
-/obj/effect/sign/barsign
+/obj/effect/sign/double/barsign
 	icon = 'barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
@@ -137,12 +137,12 @@
 	OT.master = V

 	PT.air_contents.temperature = PLASMA_FLASHPOINT
-	PT.air_contents.toxins = 15
-	PT.air_contents.carbon_dioxide = 33
+	PT.air_contents.toxins = 3
+	PT.air_contents.carbon_dioxide = 17
 	PT.air_contents.update_values()

 	OT.air_contents.temperature = PLASMA_FLASHPOINT
-	OT.air_contents.oxygen = 48
+	OT.air_contents.oxygen = 20
 	OT.air_contents.update_values()

 	var/obj/item/device/assembly/S
@@ -171,4 +171,4 @@

 	V.update_icon()

-	del(src)
+	del(src)
@@ -349,13 +349,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<ul>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=1'><img src=pda_notes.png> Notekeeper</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=2'><img src=pda_mail.png> Messenger</a></li>"
+				dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
 				//dat += "<li><a href='byond://?src=\red[src];choice=chatroom'><img src=pda_chatroom.png> Nanotrasen Relay Chat</a></li>"

 				if (cartridge)
 					if (cartridge.access_clown)
 						dat += "<li><a href='byond://?src=\ref[src];choice=Honk'><img src=pda_honk.png> Honk Synthesizer</a></li>"
-					if (cartridge.access_manifest)
-						dat += "<li><a href='byond://?src=\ref[src];choice=41'><img src=pda_notes.png> View Crew Manifest</a></li>"
 					if(cartridge.access_status_display)
 						dat += "<li><a href='byond://?src=\ref[src];choice=42'><img src=pda_status.png> Set Status Display</a></li>"
 					dat += "</ul>"
@@ -500,7 +499,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
 						dat += " <img src=pda_locked.png>"
 					dat += "</li>"

-
+			if (41) //crew manifest
+				dat += "<h4><img src=pda_notes.png> Crew Manifest</h4>"
+				dat += "Entries cannot be modified from this terminal.<br><br>"
+				if(data_core)
+					dat += data_core.get_manifest(1) // make it monochrome
+				dat += "<br>"

 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
 				dat += cart
@@ -572,6 +576,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					mode = 0
 				if("chatroom") // chatroom hub
 					mode = 5
+				if("41") //Manifest
+					mode = 41


 //MAIN FUNCTIONS===================================
@@ -700,7 +706,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 									difficulty += P.cartridge.access_engine
 									difficulty += P.cartridge.access_clown
 									difficulty += P.cartridge.access_janitor
-									difficulty += P.cartridge.access_manifest * 2
 								else
 									difficulty += 2

@@ -11,7 +11,6 @@
 	var/access_engine = 0
 	var/access_atmos = 0
 	var/access_medical = 0
-	var/access_manifest = 1 // Make all jobs able to access the manifest
 	var/access_clown = 0
 	var/access_mime = 0
 	var/access_janitor = 0
@@ -68,7 +67,6 @@
 		icon_state = "cart-s"
 		access_security = 1
 		access_medical = 1
-		access_manifest = 1


 	janitor
@@ -132,13 +130,11 @@
 	head
 		name = "Easy-Record DELUXE"
 		icon_state = "cart-h"
-		access_manifest = 1
 		access_status_display = 1

 	hop
 		name = "HumanResources9001"
 		icon_state = "cart-h"
-		access_manifest = 1
 		access_status_display = 1
 		access_quartermaster = 1
 		access_janitor = 1
@@ -152,7 +148,6 @@
 	hos
 		name = "R.O.B.U.S.T. DELUXE"
 		icon_state = "cart-hos"
-		access_manifest = 1
 		access_status_display = 1
 		access_security = 1

@@ -164,7 +159,6 @@
 	ce
 		name = "Power-On DELUXE"
 		icon_state = "cart-ce"
-		access_manifest = 1
 		access_status_display = 1
 		access_engine = 1
 		access_atmos = 1
@@ -172,7 +166,6 @@
 	cmo
 		name = "Med-U DELUXE"
 		icon_state = "cart-cmo"
-		access_manifest = 1
 		access_status_display = 1
 		access_reagent_scanner = 1
 		access_medical = 1
@@ -180,7 +173,6 @@
 	rd
 		name = "Signal Ace DELUXE"
 		icon_state = "cart-rd"
-		access_manifest = 1
 		access_status_display = 1
 		access_reagent_scanner = 1
 		access_atmos = 1
@@ -194,7 +186,6 @@
 		name = "Value-PAK Cartridge"
 		desc = "Now with 200% more value!"
 		icon_state = "cart-c"
-		access_manifest = 1
 		access_engine = 1
 		access_security = 1
 		access_medical = 1
@@ -276,14 +267,6 @@ Code:
 [radio:code]
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=1'>+</a>
 <a href='byond://?src=\ref[src];choice=Signal Code;scode=5'>+</a><br>"}
-			if (41) //crew manifest
-
-				menu = "<h4><img src=pda_notes.png> Crew Manifest</h4>"
-				menu += "Entries cannot be modified from this terminal.<br><br>"
-				if(data_core)
-					menu += data_core.get_manifest(1) // make it monochrome
-				menu += "<br>"
-

 			if (42) //status displays
 				menu = "<h4><img src=pda_status.png> Station Status Display Interlink</h4>"
@@ -179,6 +179,7 @@ MASS SPECTROMETER
 				user.show_message("\red <b>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl")
 			else
 				user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl")
+		user.show_message("\blue Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font>")
 	src.add_fingerprint(user)
 	return

@@ -32,7 +32,6 @@
 	R.icon_state = "robot"
 	del(R.module)
 	R.module = null
-	R.modtype = "robot"
 	R.updatename("Default")
 	R.status_flags |= CANPUSH
 	R.updateicon()
@@ -52,6 +51,7 @@
 /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 	R.name = heldname
+	R.custom_name = heldname
 	R.real_name = heldname

 	return 1
@@ -147,7 +147,7 @@
 		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
 		for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
 			R.internals = src
-		R.icon_state="Miner+j"
+		//R.icon_state="Miner+j"
 		return 1


@@ -127,7 +127,7 @@
 		"/obj/item/device/flashlight",
 		"/obj/item/device/pda",
 		"/obj/item/device/radio/headset",
-		"/obj/item/weapon/melee/baton",
+		"/obj/item/weapon/melee",
 		"/obj/item/taperoll/police",
 		"/obj/item/weapon/gun/energy/taser"
 		)
@@ -125,7 +125,7 @@
 		"You hear an ominous click.")
 		icon_state = "telebaton_1"
 		item_state = "telebaton_1"
-		w_class = 4
+		w_class = 3
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
 	else
@@ -449,12 +449,12 @@
 		if(S.brute_dam)
 			S.heal_damage(15,0,0,1)
 			if(user != M)
-				user.visible_message("\red You patch some dents on \the [M]'s [S.display_name]",\
-				"\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
+				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
+				"\red You patch some dents on \the [M]'s [S.display_name]",\
 				"You hear a welder.")
 			else
-				user.visible_message("\red You patch some dents on your [S.display_name]",\
-				"\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
+				user.visible_message("\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
+				"\red You patch some dents on your [S.display_name]",\
 				"You hear a welder.")
 		else
 			user << "Nothing to fix!"
@@ -1,4 +1,4 @@
-/obj/structure/sign/barsign
+/obj/structure/sign/double/barsign
 	icon = 'barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
@@ -19,20 +19,60 @@
 		else
 	return

-
 /obj/structure/sign/blob_act()
 	del(src)
 	return

+/obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
+	if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double))
+		user << "You unfasten the sign with your [tool]."
+		var/obj/item/sign/S = new(src.loc)
+		S.name = name
+		S.desc = desc
+		S.icon_state = icon_state
+		//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
+		//S.icon = I.Scale(24, 24)
+		S.sign_state = icon_state
+		del(src)
+	else ..()

-/obj/structure/sign/map
+/obj/item/sign
+	name = "sign"
+	desc = ""
+	icon = 'icons/obj/decals.dmi'
+	w_class = 3		//big
+	var/sign_state = ""
+
+/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction
+	if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc))
+		var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
+		if(direction == "Cancel") return
+		var/obj/structure/sign/S = new(user.loc)
+		switch(direction)
+			if("North")
+				S.pixel_y = 32
+			if("East")
+				S.pixel_x = 32
+			if("South")
+				S.pixel_y = -32
+			if("West")
+				S.pixel_x = -32
+			else return
+		S.name = name
+		S.desc = desc
+		S.icon_state = sign_state
+		user << "You fasten \the [S] with your [tool]."
+		del(src)
+	else ..()
+
+/obj/structure/sign/double/map
 	name = "station map"
 	desc = "A framed picture of the station."

-/obj/structure/sign/map/left
+/obj/structure/sign/double/map/left
 	icon_state = "map-left"

-/obj/structure/sign/map/right
+/obj/structure/sign/double/map/right
 	icon_state = "map-right"

 /obj/structure/sign/securearea
@@ -75,13 +115,11 @@
 	desc = "A warning sign which reads 'DANGER: FIRE'"
 	icon_state = "fire"

-
 /obj/structure/sign/nosmoking_1
 	name = "\improper NO SMOKING"
 	desc = "A warning sign which reads 'NO SMOKING'"
 	icon_state = "nosmoking"

-
 /obj/structure/sign/nosmoking_2
 	name = "\improper NO SMOKING"
 	desc = "A warning sign which reads 'NO SMOKING'"
@@ -112,14 +150,14 @@
 	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
 	icon_state = "atmosplaque"

-/obj/structure/sign/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
+/obj/structure/sign/double/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
 	name = "The Maltese Falcon"
 	desc = "The Maltese Falcon, Space Bar and Grill."

-/obj/structure/sign/maltesefalcon/left
+/obj/structure/sign/double/maltesefalcon/left
 	icon_state = "maltesefalcon-left"

-/obj/structure/sign/maltesefalcon/right
+/obj/structure/sign/double/maltesefalcon/right
 	icon_state = "maltesefalcon-right"

 /obj/structure/sign/science			//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
@@ -19,7 +19,7 @@ client/verb/JoinResponseTeam()
 		var/leader_selected = (response_team_members.len == 0)


-		for (var/obj/effect/landmark/L in world) if (L.name == "Commando")
+		for (var/obj/effect/landmark/L in landmarks_list) if (L.name == "Commando")

 			var/new_name = input(usr, "Pick a name","Name") as null|text
 			if(!new_name) return
@@ -43,9 +43,10 @@ client/verb/JoinResponseTeam()
 proc/percentage_dead()
 	var/total = 0
 	var/deadcount = 0
-	for(var/mob/living/carbon/human/H in world) if(H.mind) // I *think* monkeys gone human don't have a mind
-		if(H.stat == 2) deadcount++
-		total++
+	for(var/mob/living/carbon/human/H in mob_list)
+		if(H.client) // Monkeys and mice don't have a client, amirite?
+			if(H.stat == 2) deadcount++
+			total++

 	if(total == 0) return 0
 	else return round(100 * deadcount / total)
@@ -54,7 +55,7 @@ proc/percentage_dead()
 proc/percentage_antagonists()
 	var/total = 0
 	var/antagonists = 0
-	for(var/mob/living/carbon/human/H in world)
+	for(var/mob/living/carbon/human/H in mob_list)
 		if(is_special_character(H) >= 1)
 			antagonists++
 		total++
@@ -5,7 +5,7 @@

 	temperature = TCMB
 	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
-	heat_capacity = 700000
+//	heat_capacity = 700000 No.

 /turf/space/New()
 	if(!istype(src, /turf/space/transit))
@@ -186,7 +186,7 @@ var/global/floorIsLava = 0
 		dat += "No notes found."
 	else
 		dat += "<table>"
-		sortList(note_keys)
+		note_keys = sortList(note_keys)

 		// Display the notes on the current page
 		var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE
@@ -210,7 +210,7 @@ var/global/floorIsLava = 0
 		for(var/index = 1, index <= number_pages, index++)
 			if(index == page)
 				dat += "<b>"
-			dat += "<a href='?src=\ref[src];notes=list;index='[index]'>[index]</a> "
+			dat += "<a href='?src=\ref[src];notes=list;index=[index]'>[index]</a> "
 			if(index == page)
 				dat += "</b>"

@@ -469,6 +469,7 @@
 					dat += "<tr><td><i>Wizard not found!</i></td></tr>"
 			dat += "</table>"

+		/*
 		if(ticker.mode.ninjas.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Ninjas</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/ninja in ticker.mode.ninjas)
@@ -480,6 +481,7 @@
 				else
 					dat += "<tr><td><i>Ninja not found!</i></td></tr>"
 			dat += "</table>"
+		*/

 		if(ticker.mode.cult.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Cultists</B></td><td></td></tr>"
@@ -2466,4 +2466,6 @@
 		switch(href_list["notes"])
 			if("show")
 				show_player_info(ckey)
+			if("list")
+				PlayerNotesPage(text2num(href_list["index"]))
 		return
@@ -106,15 +106,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
 		if(!admin_number_afk)
-			send2irc(ckey, "[original_msg] - No admins online")
+			send2adminirc("ADMINHELP from [key_name(src)]: [original_msg] - !!No admins online!!")
 		else
-			send2irc(ckey, "[original_msg] - All admins AFK ([admin_number_afk])")
+			send2adminirc("ADMINHELP from [key_name(src)]: [original_msg] - !!All admins AFK ([admin_number_afk])!!")
 	else
-		send2irc(ckey, original_msg)
+		send2adminirc("ADMINHELP from [key_name(src)]: [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
-
-proc/send2irc(msg,msg2)
-	if(config.useircbot)
-		shell("python [config.nudge_script_path] [msg] [msg2]")
-	return
@@ -462,7 +462,8 @@ client/proc/one_click_antag()
 			candidates.Remove(G)

 	if(candidates.len)
-		var/raiders = 4
+		var/max_raiders = 6
+		var/raiders = max_raiders
 		//Spawns vox raiders and equips them.
 		for (var/obj/effect/landmark/L in world)
 			if(L.name == "Response Team")
@@ -484,18 +485,17 @@ client/proc/one_click_antag()
 				new_vox << "\red Don't forget to turn on your nitrogen internals!"

 				raiders--
-			if(raiders > 4)
+			if(raiders > max_raiders)
 				return 0
 	else
 		return 0
 	return 1

 /datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)
+
 	var/mob/living/carbon/human/new_vox = new(spawn_location.loc)

 	new_vox.gender = pick(MALE, FEMALE)
-	var/datum/preferences/A = new() //Randomize appearance for the raider.
-	A.randomize_appearance_for(new_vox)
 	new_vox.h_style = "Short Vox Quills"
 	new_vox.regenerate_icons()

@@ -1,3 +1,5 @@
+var/global/vox_tick = 1
+
 /mob/living/carbon/human/proc/equip_vox_raider()

 	var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src)
@@ -8,7 +10,7 @@
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
 	equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/vox(src), slot_gloves) // AS ABOVE.

-	switch(rand(1,4)) // Come up with a better way of doing this - ticker of some sort maybe.
+	switch(vox_tick)
 		if(1) // Vox raider!
 			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit)
 			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(src), slot_head)
@@ -41,14 +43,16 @@
 			W.cell.charge = 500
 			equip_to_slot_or_del(W, slot_r_hand)

+			var/obj/item/stack/rods/A = new(src)
+			A.amount = 20
+			equip_to_slot_or_del(A, slot_l_hand)
+
 		if(4) // Vox medic!
 			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit)
 			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/pressure(src), slot_head)
 			equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt) // Who needs actual surgical tools?
 			equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
-			equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray(src), slot_l_store)
-
-			equip_to_slot_or_del(new /obj/item/weapon/circular_saw(src), slot_l_hand)
+			equip_to_slot_or_del(new /obj/item/weapon/circular_saw(src), slot_l_store)
 			equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/medical, slot_r_hand)

 	equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask)
@@ -63,4 +67,7 @@
 	W.registered_name = real_name
 	equip_to_slot_or_del(W, slot_wear_id)

+	vox_tick++
+	if (vox_tick > 4) vox_tick = 1
+
 	return 1
@@ -46,11 +46,15 @@
 		if(!M.client)	return
 		var/client/C = M.client
 		var/image/holder
-		for(var/mob/living/carbon/human/patient in view(M))
+		for(var/mob/living/carbon/human/patient in view(get_turf(M)))
+			if(M.see_invisible < patient.invisibility)
+				continue
 			var/foundVirus = 0
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
 					foundVirus++
+			if(patient.virus2)
+				foundVirus++
 			if(!C) continue

 			holder = patient.hud_list[HEALTH_HUD]
@@ -90,7 +94,9 @@
 	if(!M.client)	return
 	var/client/C = M.client
 	var/image/holder
-	for(var/mob/living/carbon/human/perp in view(M))
+	for(var/mob/living/carbon/human/perp in view(get_turf(M)))
+		if(M.see_invisible < perp.invisibility)
+			continue
 		if(!C) continue
 		var/perpname = perp.name
 		holder = perp.hud_list[ID_HUD]
@@ -791,6 +791,25 @@
 	flags = FPRINT|TABLEPASS
 	w_class = 1
 	slot_flags = SLOT_MASK
+	var/obj/item/held //Item inside locket.
+
+/obj/item/clothing/tie/fluff/konaa_hirano/attack_self(mob/user as mob)
+	if(held)
+		user << "You open [src] and [held] falls out."
+		held.loc = get_turf(user)
+		src.held = null
+
+/obj/item/clothing/tie/fluff/konaa_hirano/attackby(var/obj/item/O as obj, mob/user as mob)
+	if(istype(O,/obj/item/weapon/paper))
+		if(held)
+			usr << "[src] already has something inside it."
+		else
+			usr << "You slip [O] into [src]."
+			user.drop_item()
+			O.loc = src
+			src.held = O
+		return
+	..()

 //////  Medallion - Nasir Khayyam - Jamini

@@ -21,7 +21,7 @@

 /datum/event/alien_infestation/start()
 	var/list/vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
+	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
 		if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
 			if(temp_vent.network.normal_members.len > 50)	//Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
@@ -0,0 +1,14 @@
+/proc/send2irc(var/channel, var/msg)
+	if(config.use_irc_bot)
+		ext_python("ircbot_message.py", "[channel] [msg]")
+	return
+
+/proc/send2mainirc(var/msg)
+	if(config.use_irc_bot && config.main_irc)
+		ext_python("ircbot_message.py", "[config.main_irc] [msg]")
+	return
+
+/proc/send2adminirc(var/msg)
+	if(config.use_irc_bot && config.admin_irc)
+		ext_python("ircbot_message.py", "[config.admin_irc] [msg]")
+	return
@@ -0,0 +1,9 @@
+/proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
+	if(scriptsprefix) script = "scripts/" + script
+
+	if(world.system_type == MS_WINDOWS)
+		script = replacetext(script, "/", "\\")
+
+	var/command = config.python_path + " " + script + " " + args
+
+	return shell(command)
@@ -86,6 +86,9 @@ proc/move_mining_shuttle()
 		for(var/mob/living/carbon/bug in toArea) // If someone somehow is still in the shuttle's docking area...
 			bug.gib()

+		for(var/mob/living/simple_animal/pest in toArea) // And for the other kind of bug...
+			pest.gib()
+
 		fromArea.move_contents_to(toArea)
 		if (mining_shuttle_location)
 			mining_shuttle_location = 0
@@ -455,4 +455,26 @@
 	<BR>"}
 	user << browse(dat, text("window=mob[];size=325x500", name))
 	onclose(user, "mob[name]")
-	return
+	return
+
+//generates realistic-ish pulse output based on preset levels
+/mob/living/carbon/proc/get_pulse(var/method)	//method 0 is for hands, 1 is for machines, more accurate
+	var/temp = 0								//see setup.dm:694
+	switch(src.pulse)
+		if(PULSE_NONE)
+			return "0"
+		if(PULSE_SLOW)
+			temp = rand(40, 60)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_NORM)
+			temp = rand(60, 90)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_FAST)
+			temp = rand(90, 120)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_2FAST)
+			temp = rand(120, 160)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_THREADY)
+			return method ? ">250" : "extremely weak and fast, patient's artery feels like a thread"
+//			output for machines^	^^^^^^^output for people^^^^^^^^^
@@ -18,4 +18,6 @@
 	//Surgery info
 	var/datum/surgery_status/op_stage = new/datum/surgery_status
 	//Active emote/pose
-	var/pose = null
+	var/pose = null
+
+	var/pulse = PULSE_NORM	//current pulse level
@@ -209,19 +209,13 @@
 			spawn(15)
 				usr << "\blue [t_He] has a pulse!"

-	if (src.stat == 2 || (status_flags & FAKEDEATH))
-		if(distance <= 1)
-			if(istype(usr, /mob/living/carbon/human) && usr.stat == 0)
-				for(var/mob/O in viewers(usr.loc, null))
-					O.show_message("[usr] checks [src]'s pulse.", 1)
+	if(distance <= 1)
+		if(istype(usr, /mob/living/carbon/human) && usr.stat == 0)
 			spawn(15)
-				var/foundghost = 0
-				if(src.client)
-					foundghost = 1
-				if(!foundghost)
-					usr << "<span class='deadsay'>[t_He] has no pulse and [t_his] soul has departed...</span>"
+				if(pulse == PULSE_NONE)
+					usr << "<span class='deadsay'>[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...</span>"
 				else
-					usr << "<span class='deadsay'>[t_He] has no pulse...</span>"
+					usr << "<span class='deadsay'>[t_He] has a pulse!</span>"

 	msg += "<span class='warning'>"

@@ -387,60 +381,50 @@
 		msg += "[t_He] [t_is] repulsively uncanny!\n"


-	if(istype(usr, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = usr
-		if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-			if(usr.stat ||  H != usr) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
-				return													  //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten
+	if(hasHUD(usr,"security"))
+		var/perpname = "wot"
+		var/criminal = "None"

-			var/perpname = "wot"
-			var/criminal = "None"
-
-			if(wear_id)
-				var/obj/item/weapon/card/id/I = wear_id.GetID()
-				if(I)
-					perpname = I.registered_name
-				else
-					perpname = name
+		if(wear_id)
+			var/obj/item/weapon/card/id/I = wear_id.GetID()
+			if(I)
+				perpname = I.registered_name
 			else
 				perpname = name
+		else
+			perpname = name

-			if(perpname)
-				for (var/datum/data/record/E in data_core.general)
-					if(E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.security)
-							if(R.fields["id"] == E.fields["id"])
-								criminal = R.fields["criminal"]
-
-
-				msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=\ref[src];criminal=1'>\[[criminal]\]</a>\n"
-				msg += "<span class = 'deptradio'>Security records:</span> <a href='?src=\ref[src];secrecord=`'>\[View\]</a>  <a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>\n"
-				//msg += "\[Set Hostile Identification\]\n"
-
-	if(istype(usr, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = usr
-		if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-			var/perpname = "wot"
-			var/medical = "None"
-
-			if(wear_id)
-				if(istype(wear_id,/obj/item/weapon/card/id))
-					perpname = wear_id:registered_name
-				else if(istype(wear_id,/obj/item/device/pda))
-					var/obj/item/device/pda/tempPda = wear_id
-					perpname = tempPda.owner
-			else
-				perpname = src.name
-
+		if(perpname)
 			for (var/datum/data/record/E in data_core.general)
-				if (E.fields["name"] == perpname)
-					for (var/datum/data/record/R in data_core.general)
-						if (R.fields["id"] == E.fields["id"])
-							medical = R.fields["p_stat"]
+				if(E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.security)
+						if(R.fields["id"] == E.fields["id"])
+							criminal = R.fields["criminal"]

+			msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=\ref[src];criminal=1'>\[[criminal]\]</a>\n"
+			msg += "<span class = 'deptradio'>Security records:</span> <a href='?src=\ref[src];secrecord=`'>\[View\]</a>  <a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>\n"

-			msg += "<span class = 'deptradio'>Physical status:</span> <a href='?src=\ref[src];medical=1'>\[[medical]\]</a>\n"
-			msg += "<span class = 'deptradio'>Medical records:</span> <a href='?src=\ref[src];medrecord=`'>\[View\]</a> <a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>\n"
+	if(hasHUD(usr,"medical"))
+		var/perpname = "wot"
+		var/medical = "None"
+
+		if(wear_id)
+			if(istype(wear_id,/obj/item/weapon/card/id))
+				perpname = wear_id:registered_name
+			else if(istype(wear_id,/obj/item/device/pda))
+				var/obj/item/device/pda/tempPda = wear_id
+				perpname = tempPda.owner
+		else
+			perpname = src.name
+
+		for (var/datum/data/record/E in data_core.general)
+			if (E.fields["name"] == perpname)
+				for (var/datum/data/record/R in data_core.general)
+					if (R.fields["id"] == E.fields["id"])
+						medical = R.fields["p_stat"]
+
+		msg += "<span class = 'deptradio'>Physical status:</span> <a href='?src=\ref[src];medical=1'>\[[medical]\]</a>\n"
+		msg += "<span class = 'deptradio'>Medical records:</span> <a href='?src=\ref[src];medrecord=`'>\[View\]</a> <a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>\n"


 	if(print_flavor_text()) msg += "[print_flavor_text()]\n"
@@ -452,3 +436,26 @@
 		msg += "\n[t_He] is [pose]"

 	usr << msg
+
+//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
+/proc/hasHUD(mob/M as mob, hudtype)
+	if(istype(M, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		switch(hudtype)
+			if("security")
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)
+			if("medical")
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/health)
+			else
+				return 0
+	else if(istype(M, /mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = M
+		switch(hudtype)
+			if("security")
+				return istype(R.module_state_1, /obj/item/borg/sight/hud/sec) || istype(R.module_state_2, /obj/item/borg/sight/hud/sec) || istype(R.module_state_3, /obj/item/borg/sight/hud/sec)
+			if("medical")
+				return istype(R.module_state_1, /obj/item/borg/sight/hud/med) || istype(R.module_state_2, /obj/item/borg/sight/hud/med) || istype(R.module_state_3, /obj/item/borg/sight/hud/med)
+			else
+				return 0
+	else
+		return 0
@@ -499,267 +499,258 @@
 			return

 	if (href_list["criminal"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
+		if(hasHUD(usr,"security"))

-				/* // Uncomment if you want sechuds to need security access
-				var/allowed_access = 0
-				if(H.wear_id)
-					var/list/access = H.wear_id.GetAccess()
-					if(access_security in access)
-						allowed_access = 1
-						return
-
-				if(!allowed_access)
-					H << "<span class='warning'>ERROR: Invalid Access</span>"
-					return
-				*/
-
-				var/modified = 0
-				var/perpname = "wot"
-				if(wear_id)
-					var/obj/item/weapon/card/id/I = wear_id.GetID()
-					if(I)
-						perpname = I.registered_name
-					else
-						perpname = name
+			var/modified = 0
+			var/perpname = "wot"
+			if(wear_id)
+				var/obj/item/weapon/card/id/I = wear_id.GetID()
+				if(I)
+					perpname = I.registered_name
 				else
 					perpname = name
+			else
+				perpname = name

-				if(perpname)
-					for (var/datum/data/record/E in data_core.general)
-						if (E.fields["name"] == perpname)
-							for (var/datum/data/record/R in data_core.security)
-								if (R.fields["id"] == E.fields["id"])
-
-									var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")
-
-									if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-										if(setcriminal != "Cancel")
-											R.fields["criminal"] = setcriminal
-											modified = 1
-
-											spawn()
-												H.handle_regular_hud_updates()
-
-				if(!modified)
-					usr << "\red Unable to locate a data core entry for this person."
-
-	if (href_list["secrecord"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-				var/perpname = "wot"
-				var/read = 0
-
-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
+			if(perpname)
 				for (var/datum/data/record/E in data_core.general)
 					if (E.fields["name"] == perpname)
 						for (var/datum/data/record/R in data_core.security)
 							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-									usr << "<b>Name:</b> [R.fields["name"]]	<b>Criminal Status:</b> [R.fields["criminal"]]"
-									usr << "<b>Minor Crimes:</b> [R.fields["mi_crim"]]"
-									usr << "<b>Details:</b> [R.fields["mi_crim_d"]]"
-									usr << "<b>Major Crimes:</b> [R.fields["ma_crim"]]"
-									usr << "<b>Details:</b> [R.fields["ma_crim_d"]]"
-									usr << "<b>Notes:</b> [R.fields["notes"]]"
-									usr << "<a href='?src=\ref[src];secrecordComment=`'>\[View Comment Log\]</a>"
-									read = 1

-				if(!read)
-					usr << "\red Unable to locate a data core entry for this person."
+								var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")

-	if (href_list["secrecordComment"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-				var/perpname = "wot"
-				var/read = 0
-
-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.security)
-							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-									read = 1
-									var/counter = 1
-									while(R.fields[text("com_[]", counter)])
-										usr << text("[]", R.fields[text("com_[]", counter)])
-										counter++
-									if (counter == 1)
-										usr << "No comment found"
-									usr << "<a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>"
-
-				if(!read)
-					usr << "\red Unable to locate a data core entry for this person."
-
-	if (href_list["secrecordadd"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-				var/perpname = "wot"
-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.security)
-							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))
-									var/t1 = copytext(sanitize(input("Add Comment:", "Sec. records", null, null)  as message),1,MAX_MESSAGE_LEN)
-									if ((!( t1 ) || src.stat || src.restrained() || !(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud))))
-										return
-									var/counter = 1
-									while(R.fields[text("com_[]", counter)])
-										counter++
-									R.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]",H.get_authentification_name(), H.get_assignment(), time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
-
-	if (href_list["medical"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-				var/perpname = "wot"
-				var/modified = 0
-
-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.general)
-							if (R.fields["id"] == E.fields["id"])
-
-								var/setmedical = input(usr, "Specify a new medical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("*Deceased*", "*Unconscious*", "Physically Unfit", "Active", "Cancel")
-
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-									if(setmedical != "Cancel")
-										R.fields["p_stat"] = setmedical
+								if(hasHUD(usr, "security"))
+									if(setcriminal != "Cancel")
+										R.fields["criminal"] = setcriminal
 										modified = 1

 										spawn()
-											H.handle_regular_hud_updates()
+											if(istype(usr,/mob/living/carbon/human))
+												var/mob/living/carbon/human/U = usr
+												U.handle_regular_hud_updates()
+											if(istype(usr,/mob/living/silicon/robot))
+												var/mob/living/silicon/robot/U = usr
+												U.handle_regular_hud_updates()

-				if(!modified)
-					usr << "\red Unable to locate a data core entry for this person."
+			if(!modified)
+				usr << "\red Unable to locate a data core entry for this person."
+
+	if (href_list["secrecord"])
+		if(hasHUD(usr,"security"))
+			var/perpname = "wot"
+			var/read = 0
+
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.security)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"security"))
+								usr << "<b>Name:</b> [R.fields["name"]]	<b>Criminal Status:</b> [R.fields["criminal"]]"
+								usr << "<b>Minor Crimes:</b> [R.fields["mi_crim"]]"
+								usr << "<b>Details:</b> [R.fields["mi_crim_d"]]"
+								usr << "<b>Major Crimes:</b> [R.fields["ma_crim"]]"
+								usr << "<b>Details:</b> [R.fields["ma_crim_d"]]"
+								usr << "<b>Notes:</b> [R.fields["notes"]]"
+								usr << "<a href='?src=\ref[src];secrecordComment=`'>\[View Comment Log\]</a>"
+								read = 1
+
+			if(!read)
+				usr << "\red Unable to locate a data core entry for this person."
+
+	if (href_list["secrecordComment"])
+		if(hasHUD(usr,"security"))
+			var/perpname = "wot"
+			var/read = 0
+
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.security)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"security"))
+								read = 1
+								var/counter = 1
+								while(R.fields[text("com_[]", counter)])
+									usr << text("[]", R.fields[text("com_[]", counter)])
+									counter++
+								if (counter == 1)
+									usr << "No comment found"
+								usr << "<a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>"
+
+			if(!read)
+				usr << "\red Unable to locate a data core entry for this person."
+
+	if (href_list["secrecordadd"])
+		if(hasHUD(usr,"security"))
+			var/perpname = "wot"
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.security)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"security"))
+								var/t1 = copytext(sanitize(input("Add Comment:", "Sec. records", null, null)  as message),1,MAX_MESSAGE_LEN)
+								if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"security")) )
+									return
+								var/counter = 1
+								while(R.fields[text("com_[]", counter)])
+									counter++
+								if(istype(usr,/mob/living/carbon/human))
+									var/mob/living/carbon/human/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
+								if(istype(usr,/mob/living/silicon/robot))
+									var/mob/living/silicon/robot/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
+
+	if (href_list["medical"])
+		if(hasHUD(usr,"medical"))
+			var/perpname = "wot"
+			var/modified = 0
+
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.general)
+						if (R.fields["id"] == E.fields["id"])
+
+							var/setmedical = input(usr, "Specify a new medical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("*Deceased*", "*Unconscious*", "Physically Unfit", "Active", "Cancel")
+
+							if(hasHUD(usr,"medical"))
+								if(setmedical != "Cancel")
+									R.fields["p_stat"] = setmedical
+									modified = 1
+
+									spawn()
+										if(istype(usr,/mob/living/carbon/human))
+											var/mob/living/carbon/human/U = usr
+											U.handle_regular_hud_updates()
+										if(istype(usr,/mob/living/silicon/robot))
+											var/mob/living/silicon/robot/U = usr
+											U.handle_regular_hud_updates()
+
+			if(!modified)
+				usr << "\red Unable to locate a data core entry for this person."

 	if (href_list["medrecord"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-				var/perpname = "wot"
-				var/read = 0
+		if(hasHUD(usr,"medical"))
+			var/perpname = "wot"
+			var/read = 0

-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.medical)
-							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-									usr << "<b>Name:</b> [R.fields["name"]]	<b>Blood Type:</b> [R.fields["b_type"]]"
-									usr << "<b>DNA:</b> [R.fields["b_dna"]]"
-									usr << "<b>Minor Disabilities:</b> [R.fields["mi_dis"]]"
-									usr << "<b>Details:</b> [R.fields["mi_dis_d"]]"
-									usr << "<b>Major Disabilities:</b> [R.fields["ma_dis"]]"
-									usr << "<b>Details:</b> [R.fields["ma_dis_d"]]"
-									usr << "<b>Notes:</b> [R.fields["notes"]]"
-									usr << "<a href='?src=\ref[src];medrecordComment=`'>\[View Comment Log\]</a>"
-									read = 1
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.medical)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"medical"))
+								usr << "<b>Name:</b> [R.fields["name"]]	<b>Blood Type:</b> [R.fields["b_type"]]"
+								usr << "<b>DNA:</b> [R.fields["b_dna"]]"
+								usr << "<b>Minor Disabilities:</b> [R.fields["mi_dis"]]"
+								usr << "<b>Details:</b> [R.fields["mi_dis_d"]]"
+								usr << "<b>Major Disabilities:</b> [R.fields["ma_dis"]]"
+								usr << "<b>Details:</b> [R.fields["ma_dis_d"]]"
+								usr << "<b>Notes:</b> [R.fields["notes"]]"
+								usr << "<a href='?src=\ref[src];medrecordComment=`'>\[View Comment Log\]</a>"
+								read = 1

-				if(!read)
-					usr << "\red Unable to locate a data core entry for this person."
+			if(!read)
+				usr << "\red Unable to locate a data core entry for this person."

 	if (href_list["medrecordComment"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-				var/perpname = "wot"
-				var/read = 0
+		if(hasHUD(usr,"medical"))
+			var/perpname = "wot"
+			var/read = 0

-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.medical)
-							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-									read = 1
-									var/counter = 1
-									while(R.fields[text("com_[]", counter)])
-										usr << text("[]", R.fields[text("com_[]", counter)])
-										counter++
-									if (counter == 1)
-										usr << "No comment found"
-									usr << "<a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>"
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.medical)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"medical"))
+								read = 1
+								var/counter = 1
+								while(R.fields[text("com_[]", counter)])
+									usr << text("[]", R.fields[text("com_[]", counter)])
+									counter++
+								if (counter == 1)
+									usr << "No comment found"
+								usr << "<a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>"

-				if(!read)
-					usr << "\red Unable to locate a data core entry for this person."
+			if(!read)
+				usr << "\red Unable to locate a data core entry for this person."

 	if (href_list["medrecordadd"])
-		if(istype(usr, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = usr
-			if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-				var/perpname = "wot"
-				if(wear_id)
-					if(istype(wear_id,/obj/item/weapon/card/id))
-						perpname = wear_id:registered_name
-					else if(istype(wear_id,/obj/item/device/pda))
-						var/obj/item/device/pda/tempPda = wear_id
-						perpname = tempPda.owner
-				else
-					perpname = src.name
-				for (var/datum/data/record/E in data_core.general)
-					if (E.fields["name"] == perpname)
-						for (var/datum/data/record/R in data_core.medical)
-							if (R.fields["id"] == E.fields["id"])
-								if(istype(H.glasses, /obj/item/clothing/glasses/hud/health))
-									var/t1 = copytext(sanitize(input("Add Comment:", "Med. records", null, null)  as message),1,MAX_MESSAGE_LEN)
-									if ((!( t1 ) || src.stat || src.restrained() || !(istype(H.glasses, /obj/item/clothing/glasses/hud/health))))
-										return
-									var/counter = 1
-									while(R.fields[text("com_[]", counter)])
-										counter++
-									R.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], 2053<BR>[]",H.get_authentification_name(), H.get_assignment(), time2text(world.realtime, "DDD MMM DD hh:mm:ss"), t1)
+		if(hasHUD(usr,"medical"))
+			var/perpname = "wot"
+			if(wear_id)
+				if(istype(wear_id,/obj/item/weapon/card/id))
+					perpname = wear_id:registered_name
+				else if(istype(wear_id,/obj/item/device/pda))
+					var/obj/item/device/pda/tempPda = wear_id
+					perpname = tempPda.owner
+			else
+				perpname = src.name
+			for (var/datum/data/record/E in data_core.general)
+				if (E.fields["name"] == perpname)
+					for (var/datum/data/record/R in data_core.medical)
+						if (R.fields["id"] == E.fields["id"])
+							if(hasHUD(usr,"medical"))
+								var/t1 = copytext(sanitize(input("Add Comment:", "Med. records", null, null)  as message),1,MAX_MESSAGE_LEN)
+								if ( !(t1) || usr.stat || usr.restrained() || !(hasHUD(usr,"medical")) )
+									return
+								var/counter = 1
+								while(R.fields[text("com_[]", counter)])
+									counter++
+								if(istype(usr,/mob/living/carbon/human))
+									var/mob/living/carbon/human/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
+								if(istype(usr,/mob/living/silicon/robot))
+									var/mob/living/silicon/robot/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557<BR>[t1]")
 	..()
 	return

@@ -1166,21 +1157,22 @@ mob/living/carbon/human/yank_out_object()
 			if(O == selection)
 				affected = organ
 	if(self)
-		src << "<span class='warning'>You attempt to get a good grip on the [selection] in your [affected] with bloody fingers.</span>"
+		src << "<span class='warning'>You attempt to get a good grip on the [selection] in your [affected.display_name] with bloody fingers.</span>"
 	else
-		U << "<span class='warning'>You attempt to get a good grip on the [selection] in [S]'s [affected] with bloody fingers.</span>"
+		U << "<span class='warning'>You attempt to get a good grip on the [selection] in [S]'s [affected.display_name] with bloody fingers.</span>"

 	if(istype(U,/mob/living/carbon/human/)) U.bloody_hands(S)

 	if(!do_after(U, 80))
 		return

-		if(!selection || !affected || !S || !U)
-			return
+	if(!selection || !affected || !S || !U)
+		return
+
 	if(self)
-		visible_message("<span class='warning'><b>[src] rips [selection] out of their [affected] in a welter of blood.</b></span>","<span class='warning'><b>You rip [selection] out of your [affected] in a welter of blood.</b></span>")
+		visible_message("<span class='warning'><b>[src] rips [selection] out of their [affected.display_name] in a welter of blood.</b></span>","<span class='warning'><b>You rip [selection] out of your [affected] in a welter of blood.</b></span>")
 	else
-		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s [affected] in a welter of blood.</b></span>","<span class='warning'><b>[src] rips [selection] out of your [affected] in a welter of blood.</b></span>")
+		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s [affected.display_name] in a welter of blood.</b></span>","<span class='warning'><b>[usr] rips [selection] out of your [affected] in a welter of blood.</b></span>")

 	selection.loc = get_turf(src)
 	affected.implants -= selection
@@ -1217,13 +1209,46 @@ mob/living/carbon/human/yank_out_object()
 				var/msg = null
 				switch(rand(1,3))
 					if(1)
-						msg ="<span class='warning'>A spike of pain jolts your [organ] as you bump [O] inside.</span>"
+						msg ="<span class='warning'>A spike of pain jolts your [organ.display_name] as you bump [O] inside.</span>"
 					if(2)
-						msg ="<span class='warning'>Your movement jostles [O] in your [organ] painfully.</span>"
+						msg ="<span class='warning'>Your movement jostles [O] in your [organ.display_name] painfully.</span>"
 					if(3)
-						msg ="<span class='warning'>[O] in your [organ] twists painfully as you move.</span>"
+						msg ="<span class='warning'>[O] in your [organ.display_name] twists painfully as you move.</span>"
 				src << msg

 				organ.status |= ORGAN_BLEEDING
 				organ.take_damage(rand(1,3), 0, 0)
-				src.adjustToxLoss(rand(1,3))
+				src.adjustToxLoss(rand(1,3))
+
+/mob/living/carbon/human/verb/check_pulse()
+	set category = "Object"
+	set name = "Check pulse"
+	set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds."
+	set src in view(1)
+	var/self = 0
+
+	if(usr.stat == 1 || usr.restrained() || !isliving(usr)) return
+
+	if(usr == src)
+		self = 1
+	if(!self)
+		usr.visible_message("\blue [usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.",\
+		"You begin counting [src]'s pulse")
+	else
+		usr.visible_message("\blue [usr] begins counting their pulse.",\
+		"You begin counting your pulse.")
+
+	if(src.pulse)
+		usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..."
+	else
+		usr << "\red [src] has no pulse!"	//it is REALLY UNLIKELY that a dead person would check his own pulse
+		return
+
+	usr << "Don't move until counting is finished."
+	var/time = world.timeofday
+	sleep(60)
+	if(usr.l_move_time >= time)	//checks if our mob has moved during the sleep()
+		usr << "You moved while counting. Try again."
+	else
+		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
+
@@ -113,6 +113,8 @@

 	handle_regular_hud_updates()

+	pulse = handle_pulse()
+
 	// Grabbing
 	for(var/obj/item/weapon/grab/G in src)
 		G.process()
@@ -1430,5 +1432,34 @@
 		if (shock_stage > 80)
 			Paralyse(rand(15,28))

+	proc/handle_pulse()
+		if(life_tick % 5) return pulse	//update pulse every 5 life ticks (~1 tick/sec, depending on server load)
+
+		if(stat == DEAD)
+			return PULSE_NONE	//that's it, you're dead, nothing can influence your pulse
+
+		var/temp = PULSE_NORM
+
+		if(round(vessel.get_reagent_amount("blood")) <= BLOOD_VOLUME_BAD)	//how much blood do we have
+			temp = PULSE_THREADY	//not enough :(
+
+		if(status_flags & FAKEDEATH)
+			temp = PULSE_NONE		//pretend that we're dead. unlike actual death, can be inflienced by meds
+
+		for(var/datum/reagent/R in reagents.reagent_list)
+			if(R.id in bradycardics)
+				if(temp <= PULSE_THREADY && temp >= PULSE_NORM)
+					temp--
+					break		//one reagent is enough
+								//comment out the breaks to make med effects stack
+		for(var/datum/reagent/R in reagents.reagent_list)				//handles different chems' influence on pulse
+			if(R.id in tachycardics)
+				if(temp <= PULSE_FAST && temp >= PULSE_NONE)
+					temp++
+					break
+
+		return temp
+
+
 #undef HUMAN_MAX_OXYLOSS
 #undef HUMAN_CRIT_MAX_OXYLOSS
@@ -143,14 +143,11 @@ Please contact me on #coderbus IRC. ~Carn x
 			overlays += I
 	else
 		var/stealth = 0
-		if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja) && wear_suit:s_active)
-			stealth = 1
-		else
-			//cloaking devices. //TODO: get rid of this :<
-			for(var/obj/item/weapon/cloaking_device/S in list(l_hand,r_hand,belt,l_store,r_store))
-				if(S.active)
-					stealth = 1
-					break
+		//cloaking devices. //TODO: get rid of this :<
+		for(var/obj/item/weapon/cloaking_device/S in list(l_hand,r_hand,belt,l_store,r_store))
+			if(S.active)
+				stealth = 1
+				break
 		if(stealth)
 			icon = 'icons/mob/human.dmi'
 			icon_state = "body_cloaked"
@@ -725,7 +722,7 @@ proc/get_damage_icon_part(damage_state, body_part)


 /mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
-	if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) )
+	if( wear_mask && ( istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/tie) ) )
 		wear_mask.screen_loc = ui_mask	//TODO
 		var/image/lying		= image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]2")
 		var/image/standing	= image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state]")
@@ -31,6 +31,8 @@ var/list/ai_list = list()
 	var/icon/holo_icon//Default is assigned when AI is created.
 	var/obj/item/device/pda/ai/aiPDA = null
 	var/obj/item/device/multitool/aiMulti = null
+	var/custom_sprite = 0 //For our custom sprites
+//Hud stuff

 	//MALFUNCTION
 	var/datum/AI_Module/module_picker/malf_picker
@@ -125,55 +127,45 @@ var/list/ai_list = list()
 	set name = "Set AI Core Display"
 	if(stat || aiRestorePowerRoutine)
 		return
+	if(!custom_sprite) //Check to see if custom sprite time, checking the appopriate file to change a var
+		var/file = file2text("config/custom_sprites.txt")
+		var/lines = text2list(file, "\n")
+
+		for(var/line in lines)
+		// split & clean up
+			var/list/Entry = text2list(line, "-")
+			for(var/i = 1 to Entry.len)
+				Entry[i] = trim(Entry[i])
+
+			if(Entry.len < 2)
+				continue;
+
+			if(Entry[1] == src.ckey && Entry[2] == src.real_name)
+				custom_sprite = 1 //They're in the list? Custom sprite time
+				icon = 'icons/mob/custom-synthetic.dmi'

 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
-	var/list/icons = list("Monochrome", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
-	if (src.name == "M00X-BC" && src.ckey == "searif")
-		icons += "M00X-BC"
-	if (src.name == "Skuld" && src.ckey == "ravensdale")
-		icons += "Skuld"
-	if (src.name == "REMNANT" && src.ckey == "serithi")
-		icons += "REMNANT"
-	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
-	if(icontype == "Clown")
-		icon_state = "ai-clown2"
-	else if(icontype == "Monochrome")
-		icon_state = "ai-mono"
-	else if(icontype == "Blue")
-		icon_state = "ai"
-	else if(icontype == "Inverted")
-		icon_state = "ai-u"
-	else if(icontype == "Firewall")
-		icon_state = "ai-magma"
-	else if(icontype == "Green")
-		icon_state = "ai-wierd"
-	else if(icontype == "Red")
-		icon_state = "ai-malf"
-	else if(icontype == "Static")
-		icon_state = "ai-static"
-	else if(icontype == "Text")
-		icon_state = "ai-text"
-	else if(icontype == "Smiley")
-		icon_state = "ai-smiley"
-	else if(icontype == "Matrix")
-		icon_state = "ai-matrix"
-	else if(icontype == "Angry")
-		icon_state = "ai-angryface"
-	else if(icontype == "Dorf")
-		icon_state = "ai-dorf"
-	else if(icontype == "Bliss")
-		icon_state = "ai-bliss"
-	else if(icontype == "M00X-BC")
-		icon_state = "ai-searif"
-	else if(icontype == "Triumvirate")
-		icon_state = "ai-triumvirate"
-	else if(icontype == "Triumvirate Static")
-		icon_state = "ai-triumvirate-malf"
-	else if(icontype == "Skuld")
-		icon_state = "ai-ravensdale"
-	else if(icontype == "REMNANT")
-		icon_state = "ai-serithi"
+	if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
+	else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
+	switch(icontype)
+		if("Custom") icon_state = "[src.ckey]-ai"
+		if("Clown") icon_state = "ai-clown2"
+		if("Monochrome") icon_state = "ai-mono"
+		if("Inverted") icon_state = "ai-u"
+		if("Firewall") icon_state = "ai-magma"
+		if("Green") icon_state = "ai-wierd"
+		if("Red") icon_state = "ai-red"
+		if("Static") icon_state = "ai-static"
+		if("Text") icon_state = "ai-text"
+		if("Smiley") icon_state = "ai-smiley"
+		if("Matrix") icon_state = "ai-matrix"
+		if("Angry") icon_state = "ai-angryface"
+		if("Dorf") icon_state = "ai-dorf"
+		if("Bliss") icon_state = "ai-bliss"
+		if("Triumvirate") icon_state = "ai-triumvirate"
+		if("Triumvirate Static") icon_state = "ai-triumvirate-malf"
+		else icon_state = "ai"
 	//else
 			//usr <<"You can only change your display once!"
 			//return
@@ -188,7 +180,7 @@ var/list/ai_list = list()
 				if (malf.apcs >= 3)
 					stat(null, "Time until station control secured: [max(malf.AI_win_timeleft/(malf.apcs/3), 0)] seconds")

-					
+
 /mob/living/silicon/ai/proc/ai_alerts()
 	set category = "AI Commands"
 	set name = "Show Alerts"
@@ -337,10 +329,6 @@ var/list/ai_list = list()
 			else
 				src << "<span class='notice'>Unable to locate the holopad.</span>"

-	if(href_list["say_word"])
-		src.announcement(href_list["say_word"])
-		return
-
 	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawc"])
 		switch(lawcheck[L+1])
@@ -349,6 +337,10 @@ var/list/ai_list = list()
 //		src << text ("Switching Law [L]'s report status to []", lawcheck[L+1])
 		checklaws()

+	if(href_list["say_word"])
+		src.announcement(href_list["say_word"])
+		return
+	
 	if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawi"])
 		switch(ioncheck[L])
@@ -1,10 +1,8 @@
 /mob/living/silicon/ai/death(gibbed)
 	if(stat == DEAD)	return
 	stat = DEAD
-	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 if (src.name == "REMNANT" && src.ckey == "serithi")
-		icon_state = "ai-serithi-crash"
+	if (src.custom_sprite == 1)//check for custom AI sprite, defaulting to blue screen if no.
+		icon_state = "[ckey]-ai-crash"
 	else icon_state = "ai-crash"
 	update_canmove()
 	if(src.eyeobj)
@@ -9,6 +9,8 @@
 		var/image/holder
 		var/turf/T = get_turf_or_move(src.loc)
 		for(var/mob/living/carbon/human/perp in view(T))
+			if(src.see_invisible < perp.invisibility)
+				continue
 			var/perpname = "wot"
 			holder = perp.hud_list[ID_HUD]
 			if(perp.wear_id)
@@ -51,11 +53,14 @@
 		var/image/holder
 		var/turf/T = get_turf_or_move(src.loc)
 		for(var/mob/living/carbon/human/patient in view(T))
-
+			if(src.see_invisible < patient.invisibility)
+				continue
 			var/foundVirus = 0
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
-					foundVirus = 1
+					foundVirus++
+			if(patient.virus2)
+				foundVirus++

 			holder = patient.hud_list[HEALTH_HUD]
 			if(patient.stat == 2)
@@ -39,7 +39,7 @@
 	brute_damage += brute
 	electronics_damage += electronics

-	if(brute_damage + electronics_damage > max_damage) destroy()
+	if(brute_damage + electronics_damage >= max_damage) destroy()

 /datum/robot_component/proc/heal_damage(brute, electronics)
 	if(installed != 1)
@@ -50,7 +50,7 @@
 	electronics_damage = max(0, electronics_damage - electronics)

 /datum/robot_component/proc/is_powered()
-	return installed == 1 && (!energy_consumption || powered)
+	return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (!energy_consumption || powered)


 /datum/robot_component/proc/consume_power()
@@ -6,7 +6,7 @@
 		usr << "<span class='notice'>Something is there but you can't see it.</span>"
 		return

-	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
+	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>[custom_name ? ", [modtype] [braintype]" : ""]!\n"
 	msg += "<span class='warning'>"
 	if (src.getBruteLoss())
 		if (src.getBruteLoss() < 75)
@@ -5,8 +5,6 @@
 /mob/living/silicon/robot/get_active_hand()
 	return module_active

-
-
 /*-------TODOOOOOOOOOO--------*/
 /mob/living/silicon/robot/proc/uneq_active()
 	if(isnull(module_active))
@@ -38,6 +36,7 @@
 		module_active = null
 		module_state_3 = null
 		inv3.icon_state = "inv3"
+	updateicon()

 /mob/living/silicon/robot/proc/uneq_all()
 	module_active = null
@@ -66,7 +65,7 @@
 		contents -= module_state_3
 		module_state_3 = null
 		inv3.icon_state = "inv3"
-
+	updateicon()

 /mob/living/silicon/robot/proc/activated(obj/item/O)
 	if(module_state_1 == O)
@@ -76,4 +75,5 @@
 	else if(module_state_3 == O)
 		return 1
 	else
-		return 0
+		return 0
+	updateicon()
@@ -5,7 +5,6 @@
 	if (src.monkeyizing)
 		return

-
 	src.blinded = null

 	//Status updates, death etc.
@@ -21,9 +20,6 @@
 		process_locks()
 	update_canmove()

-
-
-
 /mob/living/silicon/robot/proc/clamp_values()

 //	SetStunned(min(stunned, 30))
@@ -70,9 +66,7 @@
 		else
 			src.camera.status = 1

-	health = 200 - (getOxyLoss() + getFireLoss() + getBruteLoss())
-
-	if(getOxyLoss() > 50) Paralyse(3)
+	updatehealth()

 	if(src.sleeping)
 		Paralyse(3)
@@ -286,7 +280,7 @@
 		src.module_state_2:screen_loc = ui_inv2
 	if(src.module_state_3)
 		src.module_state_3:screen_loc = ui_inv3
-
+	updateicon()

 /mob/living/silicon/robot/proc/process_killswitch()
 	if(killswitch)
@@ -9,6 +9,8 @@

 	var/sight_mode = 0
 	var/custom_name = ""
+	var/base_icon
+	var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best

 //Hud stuff

@@ -45,7 +47,7 @@
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())
 	var/viewalerts = 0
-	var/modtype = "robot"
+	var/modtype = "Default"
 	var/lower_mod = 0
 	var/jetpack = 0
 	var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
@@ -84,7 +86,7 @@
 		module = new /obj/item/weapon/robot_module/syndicate(src)
 		hands.icon_state = "standard"
 		icon_state = "secborg"
-		modtype = "Synd"
+		modtype = "Security"
 	else
 		laws = new /datum/ai_laws/nanotrasen()
 		connected_ai = select_active_ai_with_fewest_borgs()
@@ -144,11 +146,11 @@
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security","Combat")
+	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
 	if(emagged || security_level > SEC_LEVEL_BLUE)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
-	var/mod = input("Please, select a module!", "Robot", null, null) in modules
+	modtype = input("Please, select a module!", "Robot", null, null) in modules

 	var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
 	var/channels = list()
@@ -156,17 +158,15 @@
 	if(module)
 		return

-	switch(mod)
+	switch(modtype)
 		if("Standard")
 			module = new /obj/item/weapon/robot_module/standard(src)
-			modtype = "Stand"
 			module_sprites["Basic"] = "robot_old"
 			module_sprites["Android"] = "droid"
 			module_sprites["Default"] = "robot"

 		if("Service")
 			module = new /obj/item/weapon/robot_module/butler(src)
-			modtype = "Butler"
 			module_sprites["Waitress"] = "Service"
 			module_sprites["Kent"] = "toiletbot"
 			module_sprites["Bro"] = "Brobot"
@@ -175,15 +175,13 @@

 		if("Miner")
 			module = new /obj/item/weapon/robot_module/miner(src)
-			modtype = "Miner"
-			channels = list("Mining" = 1)
+			channels = list("Supply" = 1)
 			module_sprites["Basic"] = "Miner_old"
 			module_sprites["Advanced Droid"] = "droid-miner"
-			module_sprites["Default"] = "Miner"
+			module_sprites["Treadhead"] = "Miner"

 		if("Medical")
 			module = new /obj/item/weapon/robot_module/medical(src)
-			modtype = "Med"
 			channels = list("Medical" = 1)
 			module_sprites["Basic"] = "Medbot"
 			module_sprites["Advanced Droid"] = "droid-medical"
@@ -192,7 +190,6 @@

 		if("Security")
 			module = new /obj/item/weapon/robot_module/security(src)
-			modtype = "Sec"
 			channels = list("Security" = 1)
 			module_sprites["Basic"] = "secborg"
 			module_sprites["Red Knight"] = "Security"
@@ -201,7 +198,6 @@

 		if("Engineering")
 			module = new /obj/item/weapon/robot_module/engineering(src)
-			modtype = "Eng"
 			channels = list("Engineering" = 1)
 			module_sprites["Basic"] = "Engineering"
 			module_sprites["Antique"] = "engineerrobot"
@@ -209,41 +205,33 @@

 		if("Janitor")
 			module = new /obj/item/weapon/robot_module/janitor(src)
-			modtype = "Jan"
 			module_sprites["Basic"] = "JanBot2"
 			module_sprites["Mopbot"]  = "janitorrobot"
 			module_sprites["Mop Gear Rex"] = "mopgearrex"

 		if("Combat")
 			module = new /obj/item/weapon/robot_module/combat(src)
-			modtype = "Com"
 			module_sprites["Combat Android"] = "droid-combat"
 			channels = list("Security" = 1)

-	//Begin awful custom item checks.
-	if (src.name == "Lucy"  && src.ckey == "rowtree")
-		switch(mod)
-			if("Medical")
-				module_sprites["Lucy"] = "rowtree-medical"
-			if("Security" || "Combat")
-				module_sprites["Lucy"] = "rowtree-security"
-			if("Engineering")
-				module_sprites["Lucy"] = "rowtree-engineering"
-			else
-				module_sprites["Lucy"] = "rowtree-lucy"
+	//Custom_sprite check and entry
+	if (custom_sprite == 1)
+		module_sprites["Custom"] = "[src.ckey]-[modtype]"

-	hands.icon_state = lowertext(mod)
-	feedback_inc("cyborg_[lowertext(mod)]",1)
-	updatename(mod)
+	hands.icon_state = lowertext(modtype)
+	feedback_inc("cyborg_[lowertext(modtype)]",1)
+	updatename()

-	if(mod == "Medical" || mod == "Security" || mod == "Combat")
+	if(modtype == "Medical" || modtype == "Security" || modtype == "Combat")
 		status_flags &= ~CANPUSH

 	choose_icon(6,module_sprites)
 	radio.config(channels)
+	base_icon = icon_state

 /mob/living/silicon/robot/proc/updatename(var/prefix as text)
-
+	if(prefix)
+		modtype = prefix
 	if(istype(mmi, /obj/item/device/mmi/posibrain))
 		braintype = "Android"
 	else
@@ -253,7 +241,7 @@
 	if(custom_name)
 		changed_name = custom_name
 	else
-		changed_name = "[(prefix ? "[prefix] " : "")][braintype]-[num2text(ident)]"
+		changed_name = "[modtype] [braintype]-[num2text(ident)]"
 	real_name = changed_name
 	name = real_name

@@ -264,6 +252,23 @@
 	if (camera)
 		camera.c_tag = changed_name

+	if(!custom_sprite) //Check for custom sprite
+		var/file = file2text("config/custom_sprites.txt")
+		var/lines = text2list(file, "\n")
+
+		for(var/line in lines)
+		// split & clean up
+			var/list/Entry = text2list(line, "-")
+			for(var/i = 1 to Entry.len)
+				Entry[i] = trim(Entry[i])
+
+			if(Entry.len < 2)
+				continue;
+
+			if(Entry[1] == src.ckey && Entry[2] == src.real_name) //They're in the list? Custom sprite time, var and icon change required
+				custom_sprite = 1
+				icon = 'icons/mob/custom-synthetic.dmi'
+
 /mob/living/silicon/robot/verb/Namepick()
 	if(custom_name)
 		return 0
@@ -274,7 +279,7 @@
 		if (newname != "")
 			custom_name = newname

-		updatename("Default")
+		updatename()
 		updateicon()

 /mob/living/silicon/robot/verb/cmd_robot_alerts()
@@ -978,6 +983,14 @@
 	else
 		overlays -= "eyes"

+	if(opened && custom_sprite == 1) //Custom borgs also have custom panels, heh
+		if(wiresexposed)
+			overlays += "[src.ckey]-openpanel +w"
+		else if(cell)
+			overlays += "[src.ckey]-openpanel +c"
+		else
+			overlays += "[src.ckey]-openpanel -c"
+
 	if(opened)
 		if(wiresexposed)
 			overlays += "ov-openpanel +w"
@@ -985,7 +998,16 @@
 			overlays += "ov-openpanel +c"
 		else
 			overlays += "ov-openpanel -c"
-	return
+
+	if(module_active && istype(module_active,/obj/item/borg/combat/shield))
+		overlays += "[icon_state]-shield"
+
+	if(base_icon)
+		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
+			icon_state = "[base_icon]-roll"
+		else
+			icon_state = base_icon
+		return

 //Call when target overlay should be added/removed
 /mob/living/silicon/robot/update_targeted()
@@ -1222,9 +1244,12 @@
 	overlays -= "eyes"
 	updateicon()

-	var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
-	if(choice=="No")
-		choose_icon(triesleft, module_sprites)
+	if (triesleft >= 1)
+		var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
+		if(choice=="No")
+			choose_icon(triesleft, module_sprites)
+		else
+			triesleft = 0
+			return
 	else
-		triesleft = 0
-		return
+		src << "Your icon has been set. You now require a module reset to change it."
@@ -1,18 +1,25 @@
+/mob/living/silicon/robot/updatehealth()
+	if(status_flags & GODMODE)
+		health = 100
+		stat = CONSCIOUS
+		return
+	health = 100 - (getBruteLoss() + getFireLoss())
+	return
+
 /mob/living/silicon/robot/getBruteLoss()
 	var/amount = 0
 	for(var/V in components)
 		var/datum/robot_component/C = components[V]
-		if(C.installed == 1) amount += C.brute_damage
+		if(C.installed != 0) amount += C.brute_damage
 	return amount

 /mob/living/silicon/robot/getFireLoss()
 	var/amount = 0
 	for(var/V in components)
 		var/datum/robot_component/C = components[V]
-		if(C.installed == 1) amount += C.electronics_damage
+		if(C.installed != 0) amount += C.electronics_damage
 	return amount

-
 /mob/living/silicon/robot/adjustBruteLoss(var/amount)
 	if(amount > 0)
 		take_overall_damage(amount, 0)
@@ -46,11 +53,28 @@
 	var/datum/robot_component/picked = pick(parts)
 	picked.heal_damage(brute,burn)

-/mob/living/silicon/robot/take_organ_damage(var/brute, var/burn, var/sharp = 0)
+/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0)
 	var/list/components = get_damageable_components()
-	if(components.len)
+	if(!components.len)
 		return

+	 //Combat shielding absorbs a percentage of damage directly into the cell.
+	if(module_active && istype(module_active,/obj/item/borg/combat/shield))
+		var/obj/item/borg/combat/shield/shield = module_active
+		//Shields absorb a certain percentage of damage based on their power setting.
+		var/absorb_brute = brute*shield.shield_level
+		var/absorb_burn = burn*shield.shield_level
+		var/cost = (absorb_brute+absorb_burn)*100
+
+		cell.charge -= cost
+		if(cell.charge <= 0)
+			cell.charge = 0
+			src << "\red Your shield has overloaded!"
+		else
+			brute -= absorb_brute
+			burn -= absorb_burn
+			src << "\red Your shield absorbs some of the impact!"
+
 	var/datum/robot_component/C = pick(components)
 	C.take_damage(brute,burn,sharp)

@@ -70,9 +94,27 @@

 		parts -= picked

-/mob/living/silicon/robot/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/used_weapon = null)
+/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
 	if(status_flags & GODMODE)	return	//godmode
 	var/list/datum/robot_component/parts = get_damageable_components()
+
+	 //Combat shielding absorbs a percentage of damage directly into the cell.
+	if(module_active && istype(module_active,/obj/item/borg/combat/shield))
+		var/obj/item/borg/combat/shield/shield = module_active
+		//Shields absorb a certain percentage of damage based on their power setting.
+		var/absorb_brute = brute*shield.shield_level
+		var/absorb_burn = burn*shield.shield_level
+		var/cost = (absorb_brute+absorb_burn)*100
+
+		cell.charge -= cost
+		if(cell.charge <= 0)
+			cell.charge = 0
+			src << "\red Your shield has overloaded!"
+		else
+			brute -= absorb_brute
+			burn -= absorb_burn
+			src << "\red Your shield absorbs some of the impact!"
+
 	while(parts.len && (brute>0 || burn>0) )
 		var/datum/robot_component/picked = pick(parts)

@@ -84,4 +126,4 @@
 		brute	-= (picked.brute_damage - brute_was)
 		burn	-= (picked.electronics_damage - burn_was)

-		parts -= picked
+		parts -= picked
@@ -120,3 +120,25 @@
 	add_fingerprint(user)
 	return

+//Personal shielding for the combat module.
+/obj/item/borg/combat/shield
+	name = "personal shielding"
+	desc = "A powerful experimental module that turns aside or absorbs incoming attacks at the cost of charge."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "shock"
+	var/shield_level = 0.5 //Percentage of damage absorbed by the shield.
+
+/obj/item/borg/combat/shield/verb/set_shield_level()
+	set name = "Set shield level"
+	set category = "Object"
+	set src in range(0)
+
+	var/N = input("How much damage should the shield absorb?") in list("5","10","25","50","75","100")
+	if (N)
+		shield_level = text2num(N)/100
+
+/obj/item/borg/combat/mobility
+	name = "mobility module"
+	desc = "By retracting limbs and tucking in its head, a combat android can roll at high speeds."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "shock"
@@ -226,9 +226,10 @@

 	New()
 		src.modules += new /obj/item/borg/sight/thermal(src)
-		src.modules += new /obj/item/weapon/melee/energy/sword(src)
 		src.modules += new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 		src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
+		src.modules += new /obj/item/borg/combat/shield(src)
+		src.modules += new /obj/item/borg/combat/mobility(src)
 		src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
 		src.emag = new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
 		return
@@ -12,4 +12,10 @@

 	tally = speed

+	if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
+		tally-=3
+
 	return tally+config.robot_delay
+
+/mob/living/silicon/robot/Move()
+	..()
@@ -7,26 +7,7 @@

 			message_admins("Admin logout: [key_name(src)]")
 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
-				var/cheesy_message = pick( list(  \
-					"I have no admins online!",\
-					"I'm all alone :(",\
-					"I'm feeling lonely :(",\
-					"I'm so lonely :(",\
-					"Why does nobody love me? :(",\
-					"I want a man :(",\
-					"Where has everyone gone?",\
-					"I need a hug :(",\
-					"Someone come hold me :(",\
-					"I need someone on me :(",\
-					"What happened? Where has everyone gone?",\
-					"Forever alone :("\
-				) )
-
-				if(cheesy_message)
-					cheesy_message += " (No admins online)"
-
-
-				send2irc("Server", "[cheesy_message]")
+				send2adminirc("[key_name(src)] logged out - no more admins online.")
 	..()

 	return 1
@@ -298,7 +298,7 @@ var/list/slot_equipment_priority = list( \

 /mob/verb/memory()
 	set name = "Notes"
-	set category = "OOC"
+	set category = "IC"
 	if(mind)
 		mind.show_memory(src)
 	else
@@ -306,7 +306,7 @@ var/list/slot_equipment_priority = list( \

 /mob/verb/add_memory(msg as message)
 	set name = "Add Note"
-	set category = "OOC"
+	set category = "IC"

 	msg = copytext(msg, 1, MAX_MESSAGE_LEN)
 	msg = sanitize(msg)
@@ -946,7 +946,7 @@ mob/verb/yank_out_object()
 	if(self)
 		visible_message("<span class='warning'><b>[src] rips [selection] out of their body.</b></span>","<span class='warning'><b>You rip [selection] out of your body.</b></span>")
 	else
-		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s body.</b></span>","<span class='warning'><b>[src] rips [selection] out of your body.</b></span>")
+		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s body.</b></span>","<span class='warning'><b>[usr] rips [selection] out of your body.</b></span>")

 	selection.loc = get_turf(src)

@@ -269,6 +269,14 @@


 	proc/AttemptLateSpawn(rank)
+		if (src != usr)
+			return 0
+		if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+			usr << "\red The round is either not ready, or has already finished..."
+			return 0
+		if(!enter_allowed)
+			usr << "\blue There is an administrative lock on entering the game!"
+			return 0
 		if(!IsJobAvailable(rank))
 			src << alert("[rank] is not available. Please try another.")
 			return 0
@@ -128,7 +128,7 @@

 			for(var/area/A in gravity_generator:localareas)
 				var/obj/machinery/gravity_generator/G
-				for(G in world)
+				for(G in machines)
 					if((A.master in G.localareas) && (G.on))
 						break
 				if(!G)
@@ -346,7 +346,7 @@ field_generator power level display
 	//I want to avoid using global variables.
 	spawn(1)
 		var/temp = 1 //stops spam
-		for(var/obj/machinery/singularity/O in world)
+		for(var/obj/machinery/singularity/O in machines)
 			if(O.last_warning && temp)
 				if((world.time - O.last_warning) > 50) //to stop message-spam
 					temp = 0
@@ -42,7 +42,7 @@ var/global/list/uneatable = list(
 		spawn(temp)
 			del(src)
 	..()
-	for(var/obj/machinery/singularity_beacon/singubeacon in world)
+	for(var/obj/machinery/singularity_beacon/singubeacon in machines)
 		if(singubeacon.active)
 			target = singubeacon
 			break
@@ -212,11 +212,11 @@
 /obj/machinery/computer/turbine_computer/New()
 	..()
 	spawn(5)
-		for(var/obj/machinery/compressor/C in world)
+		for(var/obj/machinery/compressor/C in machines)
 			if(id == C.comp_id)
 				compressor = C
 		doors = new /list()
-		for(var/obj/machinery/door/poddoor/P in world)
+		for(var/obj/machinery/door/poddoor/P in machines)
 			if(P.id == id)
 				doors += P

@@ -125,16 +125,20 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).

 		busy = 1
 		use_power(max(1000, (3750*amount/10)))
-		spawn(16)
+		var/stacktype = stack.type
+		stack.use(amount)
+		if(do_after(usr,16))
 			user << "\blue You add [amount] sheets to the [src.name]."
-			if(istype(stack, /obj/item/stack/sheet/glass))
-				g_amount += amount * 3750
-			else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
-				gold_amount += amount * 2000
-			else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
-				diamond_amount += amount * 2000
-			else if(istype(stack, /obj/item/stack/sheet/mineral/uranium))
-				uranium_amount += amount * 2000
-			stack.use(amount)
-			busy = 0
-			src.updateUsrDialog()
+			switch(stacktype)
+				if(/obj/item/stack/sheet/glass)
+					g_amount += amount * 3750
+				if(/obj/item/stack/sheet/mineral/gold)
+					gold_amount += amount * 2000
+				if(/obj/item/stack/sheet/mineral/diamond)
+					diamond_amount += amount * 2000
+				if(/obj/item/stack/sheet/mineral/uranium)
+					uranium_amount += amount * 2000
+		else
+			new stacktype(src.loc, amount)
+		busy = 0
+		src.updateUsrDialog()
@@ -241,7 +241,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	var/pda_msg_amt = 0
 	var/rc_msg_amt = 0

-	for(var/obj/machinery/message_server/MS in world)
+	for(var/obj/machinery/message_server/MS in machines)
 		if(MS.pda_msgs.len > pda_msg_amt)
 			pda_msg_amt = MS.pda_msgs.len
 		if(MS.rc_msgs.len > rc_msg_amt)
@@ -152,28 +152,32 @@ Note: Must be placed west/left of and R&D console to function.
 	icon_state = "protolathe"
 	busy = 1
 	use_power(max(1000, (3750*amount/10)))
-	spawn(16)
+	var/stacktype = stack.type
+	stack.use(amount)
+	if (do_after(user, 16))
 		user << "\blue You add [amount] sheets to the [src.name]."
 		icon_state = "protolathe"
-		if(istype(stack, /obj/item/stack/sheet/metal))
-			m_amount += amount * 3750
-		else if(istype(stack, /obj/item/stack/sheet/glass))
-			g_amount += amount * 3750
-		else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
-			gold_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/silver))
-			silver_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/plasma))
-			plasma_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/uranium))
-			uranium_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
-			diamond_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/clown))
-			clown_amount += amount * 2000
-		else if(istype(stack, /obj/item/stack/sheet/mineral/adamantine))
-			adamantine_amount += amount * 2000
-		stack.use(amount)
-		busy = 0
-		src.updateUsrDialog()
+		switch(stacktype)
+			if(/obj/item/stack/sheet/metal)
+				m_amount += amount * 3750
+			if(/obj/item/stack/sheet/glass)
+				g_amount += amount * 3750
+			if(/obj/item/stack/sheet/mineral/gold)
+				gold_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/silver)
+				silver_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/plasma)
+				plasma_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/uranium)
+				uranium_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/diamond)
+				diamond_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/clown)
+				clown_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/adamantine)
+				adamantine_amount += amount * 2000
+	else
+		new stacktype(src.loc, amount)
+	busy = 0
+	src.updateUsrDialog()
 	return
@@ -116,7 +116,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,

 //Have it automatically push research to the centcomm server so wild griffins can't fuck up R&D's work --NEO
 /obj/machinery/computer/rdconsole/proc/griefProtection()
-	for(var/obj/machinery/r_n_d/server/centcom/C in world)
+	for(var/obj/machinery/r_n_d/server/centcom/C in machines)
 		for(var/datum/tech/T in files.known_tech)
 			C.files.AddTech2Known(T)
 		for(var/datum/design/D in files.known_designs)
@@ -128,7 +128,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	..()
 	files = new /datum/research(src) //Setup the research data holder.
 	if(!id)
-		for(var/obj/machinery/r_n_d/server/centcom/S in world)
+		for(var/obj/machinery/r_n_d/server/centcom/S in machines)
 			S.initialize()
 			break

@@ -322,7 +322,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			griefProtection() //Putting this here because I dont trust the sync process
 			spawn(30)
 				if(src)
-					for(var/obj/machinery/r_n_d/server/S in world)
+					for(var/obj/machinery/r_n_d/server/S in machines)
 						var/server_processed = 0
 						if(S.disabled)
 							continue
@@ -49,6 +49,9 @@ proc/move_research_shuttle()
 		for(var/mob/living/carbon/bug in toArea) // If someone somehow is still in the shuttle's docking area...
 			bug.gib()

+		for(var/mob/living/simple_animal/pest in toArea) // And for the other kind of bug...
+			pest.gib()
+
 		fromArea.move_contents_to(toArea)
 		if (research_shuttle_location)
 			research_shuttle_location = 0
@@ -93,7 +93,7 @@

 //Backup files to centcomm to help admins recover data after greifer attacks
 /obj/machinery/r_n_d/server/proc/griefProtection()
-	for(var/obj/machinery/r_n_d/server/centcom/C in world)
+	for(var/obj/machinery/r_n_d/server/centcom/C in machines)
 		for(var/datum/tech/T in files.known_tech)
 			C.files.AddTech2Known(T)
 		for(var/datum/design/D in files.known_designs)
@@ -170,7 +170,7 @@
 	..()
 	var/list/no_id_servers = list()
 	var/list/server_ids = list()
-	for(var/obj/machinery/r_n_d/server/S in world)
+	for(var/obj/machinery/r_n_d/server/S in machines)
 		switch(S.server_id)
 			if(-1)
 				continue
@@ -219,20 +219,20 @@
 		temp_server = null
 		consoles = list()
 		servers = list()
-		for(var/obj/machinery/r_n_d/server/S in world)
+		for(var/obj/machinery/r_n_d/server/S in machines)
 			if(S.server_id == text2num(href_list["access"]) || S.server_id == text2num(href_list["data"]) || S.server_id == text2num(href_list["transfer"]))
 				temp_server = S
 				break
 		if(href_list["access"])
 			screen = 1
-			for(var/obj/machinery/computer/rdconsole/C in world)
+			for(var/obj/machinery/computer/rdconsole/C in machines)
 				if(C.sync)
 					consoles += C
 		else if(href_list["data"])
 			screen = 2
 		else if(href_list["transfer"])
 			screen = 3
-			for(var/obj/machinery/r_n_d/server/S in world)
+			for(var/obj/machinery/r_n_d/server/S in machines)
 				if(S == src)
 					continue
 				servers += S
@@ -283,7 +283,7 @@
 		if(0) //Main Menu
 			dat += "Connected Servers:<BR><BR>"

-			for(var/obj/machinery/r_n_d/server/S in world)
+			for(var/obj/machinery/r_n_d/server/S in machines)
 				if(istype(S, /obj/machinery/r_n_d/server/centcom) && !badmin)
 					continue
 				dat += "[S.name] || "
@@ -20,7 +20,7 @@
 				B.charge += 25
 		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 25
-		for (var/mob/living/silicon/robot/M in world)
+		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
 				D.charge += 25
 				M << "\blue SYSTEM ALERT: Energy boost detected!"
@@ -33,7 +33,7 @@
 				B.charge += rand() * 100
 		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge += 250
-		for (var/mob/living/silicon/robot/M in world)
+		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
 				D.charge += rand() * 100
 				M << "\blue SYSTEM ALERT: Energy boost detected!"
@@ -22,7 +22,7 @@
 				B.charge = max(B.charge - 50,0)
 		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 100,0)
-		for (var/mob/living/silicon/robot/M in world)
+		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
 				D.charge = max(D.charge - 50,0)
 				M << "\red SYSTEM ALERT: Energy drain detected!"
@@ -35,7 +35,7 @@
 				B.charge = max(B.charge - rand() * 150,0)
 		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 250,0)
-		for (var/mob/living/silicon/robot/M in world)
+		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
 				D.charge = max(D.charge - rand() * 150,0)
 				M << "\red SYSTEM ALERT: Energy drain detected!"
@@ -51,7 +51,7 @@
 		if(w.isOn())
 			if(w.get_fuel() >= 4 && !src.method)
 				if(inside)
-					inside.loc = src.loc
+					inside.loc = get_turf(src)
 					for(var/mob/M in viewers(world.view, user))
 						M.show_message("<span class='info'>[src] burns away revealing [inside].</span>",1)
 				else
--- a/Show More
+++ b/Show More