Merge pull request #431 from SkyMarshal/master

Replaceing old pull request.  It got merged by accident and I reverted it.

baystation12.dme

@@ -517,7 +517,7 @@
 #include "code\game\machinery\computer\id.dm"
 #include "code\game\machinery\computer\lockdown.dm"
 #include "code\game\machinery\computer\medical.dm"
-#include "code\game\machinery\computer\Operating.dm"
+#include "code\game\machinery\computer\operating.dm"
 #include "code\game\machinery\computer\power.dm"
 #include "code\game\machinery\computer\robot.dm"
 #include "code\game\machinery\computer\security.dm"

code/defines/obj/weapon.dm

@@ -558,7 +558,7 @@
 	flags = FPRINT | TABLEPASS| CONDUCT
 	force = 5.0
 	throwforce = 7.0
-	item_state = "cane"
+	item_state = "browncane"
 	w_class = 2.0
 	m_amt = 50
 

code/game/atom_procs.dm

@@ -141,7 +141,12 @@
 		return 0
 	if (!( src.flags ) & 256)
 		return
-	if (src.blood_DNA.len)
+	if(!blood_DNA)
+		var/turf/Z = get_turf(src)
+		message_admins("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		log_game("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		return
+	if (blood_DNA.len)
 		if (istype(src, /obj/item)&&!istype(src, /obj/item/weapon/melee/energy))//Only regular items. Energy melee weapon are not affected.
 			var/obj/item/source2 = src
 			source2.icon_old = src.icon
@@ -241,6 +246,12 @@
 
 	if (!( src.flags ) & 256)
 		return
+	if(!blood_DNA)
+		var/turf/Z = get_turf(src)
+		message_admins("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		log_game("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		blood_DNA = list()
+		return
 	if ( src.blood_DNA.len )
 		if (istype (src, /mob/living/carbon))
 			var/obj/item/source2 = src
@@ -251,14 +262,20 @@
 			var/obj/item/source2 = src
 			source2.blood_DNA = list()
 //			var/icon/I = new /icon(source2.icon_old, source2.icon_state)
-			source2.icon = source2.icon_old
-			source2.update_icon()
+			if(source2.icon_old)
+				source2.icon = source2.icon_old
+				source2.update_icon()
+			else
+				source2.icon = initial(icon)
+				source2.update_icon()
 		if (istype(src, /turf/simulated))
 			var/obj/item/source2 = src
 			source2.blood_DNA = list()
 			if(source2.icon_old)
 				var/icon/I = new /icon(source2.icon_old, source2.icon_state)
 				source2.icon = I
+			else
+				source2.icon = initial(icon)
 	if(src.fingerprints && src.fingerprints.len)
 		var/done = 0
 		while(!done)

code/game/machinery/computer/security.dm

@@ -507,14 +507,14 @@ What a mess.*/
 							del(active2)
 
 					if ("Delete Record (ALL) Execute")
-						for(var/datum/data/record/R in data_core.medical)
-							if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
-								del(R)
-							else
+						if (active1)
+							for(var/datum/data/record/R in data_core.medical)
+								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+									del(R)
+								else
+							del(active1)
 						if (active2)
 							del(active2)
-						if (active1)
-							del(active1)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
 	add_fingerprint(usr)

code/game/objects/items/item.dm

@@ -101,6 +101,11 @@
 			t = "huge"
 		else
 	if ((usr.mutations & CLUMSY) && prob(50)) t = "funny-looking"
+	if(!blood_DNA)
+		var/turf/Z = get_turf(src)
+		message_admins("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		log_game("\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list!")
+		return
 	usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA.len ? "" : "bloody ",src, src.name, t)
 	if(src.desc)
 		usr << src.desc

code/modules/assembly/infrared.dm

@@ -45,6 +45,13 @@
 		if(scanning)
 			src.overlays += text("infrared_old2")
 			src.small_icon_state_overlays += text("infrared_on")
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(1)
+		else
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(0)
 		if(holder)
 			holder.update_icon()
 		return
@@ -129,6 +136,7 @@
 		if (href_list["state"])
 			src.scanning = !(src.scanning)
 			update_icon()
+			processing_objects.Add(src)
 
 		if (href_list["visible"])
 			src.visible = !(src.visible)

code/modules/assembly/proximity.dm

@@ -90,6 +90,13 @@
 		if(scanning)
 			overlays += text("prox_scanning")
 			small_icon_state_overlays += text("prox_scanning")
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(1)
+		else
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(0)
 		if(holder)
 			holder.update_icon()
 
@@ -126,10 +133,12 @@
 
 		if(href_list["scanning"])
 			toggle_scan()
+			processing_objects.Add(src)
 
 		if(href_list["time"])
 			timing = text2num(href_list["time"])
 			update_icon()
+			processing_objects.Add(src)
 
 		if(href_list["tp"])
 			var/tp = text2num(href_list["tp"])

code/modules/assembly/timer.dm

@@ -64,6 +64,13 @@
 		if(timing)
 			overlays += text("timer_timing")
 			small_icon_state_overlays += text("timer_timing")
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(1)
+		else
+			if(master && istype(master, /obj/item/weapon/chem_grenade))
+				var/obj/item/weapon/chem_grenade/M = master
+				M.c_state(0)
 		if(holder)
 			holder.update_icon()
 		return
@@ -92,6 +99,7 @@
 
 		if(href_list["time"])
 			timing = text2num(href_list["time"])
+			processing_objects.Add(src)
 			update_icon()
 
 		if(href_list["tp"])

code/modules/chemical/Chemistry-Reagents.dm

@@ -540,6 +540,21 @@ datum
 			description = "A colorless, odorless, tasteless gas."
 			reagent_state = GAS
 			color = "#808080" // rgb: 128, 128, 128
+			reaction_obj(var/obj/O, var/volume)
+				if((!O) || (!volume))	return 0
+				src = null
+				var/turf/the_turf = get_turf(O)
+				var/datum/gas_mixture/napalm = new
+				napalm.nitrogen = volume*10
+				napalm.temperature = T0C
+				the_turf.assume_air(napalm)
+			reaction_turf(var/turf/T, var/volume)
+				src = null
+				var/datum/gas_mixture/napalm = new
+				napalm.nitrogen = volume*10
+				napalm.temperature = T0C
+				T.assume_air(napalm)
+				return
 
 		hydrogen
 			name = "Hydrogen"

code/modules/chemical/Chemistry-Tools.dm

@@ -209,7 +209,7 @@
 
 	attack_self(mob/user as mob)
 		if(active == 2)
-			attached_device.attack_self(usr)
+			attached_device.attack_self(user)
 			return
 		user.machine = src
 		var/dat = {"<B> Grenade properties: </B>
@@ -289,6 +289,13 @@
 				if(beaker_two)
 					beaker_two.loc = get_turf(src.loc)
 
+		c_state(var/i = 0)
+			if(i)
+				icon_state = initial(icon_state) + "_armed"
+			else
+				icon_state = initial(icon_state) + "_locked"
+			return
+
 	large
 		name = "Large Chem Grenade"
 		desc = "An oversized grenade that affects a larger area."
@@ -305,6 +312,7 @@
 
 		New()
 			..()
+			attached_device = new /obj/item/device/assembly/timer(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
@@ -324,6 +332,7 @@
 
 		New()
 			..()
+			attached_device = new /obj/item/device/assembly/timer(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
@@ -343,6 +352,7 @@
 
 		New()
 			..()
+			attached_device = new /obj/item/device/assembly/timer(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)