-New corridor airlocks! They will replace the regular glass airlocks in the corridor but they have an extra feature. They stay open by default and close/open automatically based on the local area's air alarm alert.

-Got rid of a magic number in implants.
-Robots cannot hide their items in food anymore.
-Updated changelog with disease naming.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5077 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/machinery/doors/alarmlock.dm

@@ -0,0 +1,43 @@
+/obj/machinery/door/airlock/alarmlock
+
+	name = "Glass Alarm Airlock"
+	icon = 'icons/obj/doors/Doorglass.dmi'
+	opacity = 0
+	doortype = 7
+	glass = 1
+
+	var/datum/radio_frequency/air_connection
+	var/air_frequency = 1437
+	autoclose = 0
+
+/obj/machinery/door/airlock/alarmlock/New()
+	..()
+	air_connection = new
+
+/obj/machinery/door/airlock/alarmlock/initialize()
+	..()
+	radio_controller.remove_object(src, air_frequency)
+	air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM)
+	open()
+
+
+/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
+	..()
+	if(stat & (NOPOWER|BROKEN))
+		return
+
+	var/alarm_area = signal.data["zone"]
+	var/alert = signal.data["alert"]
+
+	var/area/our_area = get_area(src)
+	if (our_area.master)
+		our_area = our_area.master
+
+	if(alarm_area == our_area.name)
+		switch(alert)
+			if("severe")
+				autoclose = 1
+				close()
+			if("minor", "clear")
+				autoclose = 0
+				open()

code/game/objects/items/weapons/implants/implant.dm

@@ -130,7 +130,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 	trigger(emote, source as mob)
 		if(emote == "deathgasp")
-			src.activate(50)
+			src.activate(src.reagents.total_volume)
 		return
 
 

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

@@ -118,7 +118,6 @@
 		usr << "\blue \The [src] was bitten multiple times!"
 
 /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
 	if((slices_num <= 0 || !slices_num) || !slice_path)
 		return 1
 	var/inaccurate = 0
@@ -137,6 +136,8 @@
 		)
 		inaccurate = 1
 	else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
+		if(!iscarbon(user))
+			return 1
 		user << "\red You slip [W] inside [src]."
 		user.u_equip(W)
 		if ((user.client && user.s_active != src))