Merge branch 'dev' into virus-racism

code/controllers/master_controller.dm

@@ -30,6 +30,7 @@ datum/controller/game_controller
 	var/total_cost		= 0
 
 	var/last_thing_processed
+	var/mob/list/expensive_mobs = list()
 
 datum/controller/game_controller/New()
 	//There can be only one master_controller. Out with the old and in with the new.
@@ -227,11 +228,15 @@ datum/controller/game_controller/proc/process()
 
 datum/controller/game_controller/proc/process_mobs()
 	var/i = 1
+	expensive_mobs.Cut()
 	while(i<=mob_list.len)
 		var/mob/M = mob_list[i]
 		if(M)
+			var/clock = world.timeofday
 			last_thing_processed = M.type
 			M.Life()
+			if((world.timeofday - clock) > 1)
+				expensive_mobs += M
 			i++
 			continue
 		mob_list.Cut(i,i+1)

code/game/area/Space Station 13 areas.dm

@@ -1419,6 +1419,10 @@ var/list/ghostteleportlocs = list()
 	name = "Port Emergency Storage"
 	icon_state = "emergencystorage"
 
+/area/storage/emergency3
+	name = "Central Emergency Storage"
+	icon_state = "emergencystorage"
+
 /area/storage/tech
 	name = "Technical Storage"
 	icon_state = "auxstorage"

code/game/machinery/airlock_control.dm

@@ -90,7 +90,7 @@ obj/machinery/door/airlock/Bumped(atom/AM)
 
 			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 	return
-		
+
 obj/machinery/door/airlock/proc/set_frequency(new_frequency)
 	radio_controller.remove_object(src, frequency)
 	if(new_frequency)
@@ -131,7 +131,7 @@ obj/machinery/airlock_sensor
 
 	var/on = 1
 	var/alert = 0
-
+	var/previousPressure
 
 obj/machinery/airlock_sensor/update_icon()
 	if(on)
@@ -153,21 +153,23 @@ obj/machinery/airlock_sensor/attack_hand(mob/user)
 
 obj/machinery/airlock_sensor/process()
 	if(on)
-		var/datum/signal/signal = new
-		signal.transmission_method = 1 //radio signal
-		signal.data["tag"] = id_tag
-		signal.data["timestamp"] = world.time
-
 		var/datum/gas_mixture/air_sample = return_air()
-
 		var/pressure = round(air_sample.return_pressure(),0.1)
-		alert = (pressure < ONE_ATMOSPHERE*0.8)
 
-		signal.data["pressure"] = num2text(pressure)
+		if(abs(pressure - previousPressure) > 0.001 || previousPressure == null)
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.data["tag"] = id_tag
+			signal.data["timestamp"] = world.time
+			signal.data["pressure"] = num2text(pressure)
 
-		radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
+			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 
-	update_icon()
+			previousPressure = pressure
+
+			alert = (pressure < ONE_ATMOSPHERE*0.8)
+
+			update_icon()
 
 obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
 	radio_controller.remove_object(src, frequency)
@@ -179,7 +181,6 @@ obj/machinery/airlock_sensor/initialize()
 
 obj/machinery/airlock_sensor/New()
 	..()
-
 	if(radio_controller)
 		set_frequency(frequency)
 

code/game/objects/closets/walllocker.dm

@@ -20,6 +20,13 @@
 	var/amount = 2 // spawns each items X times.
 	icon_state = "emerg"
 
+/obj/structure/closet/walllocker/emerglocker/toggle(mob/user as mob)
+	src.attack_hand(user)
+	return 
+
+/obj/structure/closet/walllocker/emerglocker/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	return 
+
 /obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
 	if (istype(user, /mob/living/silicon/ai))	//Added by Strumpetplaya - AI shouldn't be able to
 		return									//activate emergency lockers.  This fixes that.  (Does this make sense, the AI can't call attack_hand, can it? --Mloc)

code/game/objects/items.dm

@@ -379,10 +379,6 @@
 					if(!disable_warning)
 						usr << "You somehow have a suit with no defined allowed items for suit storage, stop that."
 					return 0
-				if(src.w_class > 3)
-					if(!disable_warning)
-						usr << "The [name] is too big to attach."
-					return 0
 				if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) )
 					return 1
 				return 0

code/modules/surgery/generic.dm

@@ -6,6 +6,8 @@
 /datum/surgery_step/generic/
 	can_infect = 1
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if (isslime(target))
+			return 0
 		if (target_zone == "eyes")	//there are specific steps for eye surgery
 			return 0
 		if (!hasorgans(target))
@@ -112,6 +114,8 @@
 	max_duration = 110
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(isslime(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		return ..() && affected.open == 0 && target_zone != "mouth"
 

code/modules/surgery/implant.dm

@@ -106,6 +106,8 @@
 	max_duration = 100
 
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		if(isslime(target))
+			return 0
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		var/can_fit = !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
 		return ..() && can_fit