diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index a265cd2e1e..edf5b0e843 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -141,7 +141,11 @@ return 0 if (!( src.flags ) & 256) return - if (src.blood_DNA.len) + if(!blood_DNA) + var/turf/Z = get_turf(src) + world << "\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list! Tell a dev!" + 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 diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f92aeae669..4b3620e67a 100644 --- a/code/game/machinery/computer/security.dm +++ b/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) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index 517a5f07e9..7025f14295 100755 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -101,6 +101,10 @@ t = "huge" else if ((usr.mutations & CLUMSY) && prob(50)) t = "funny-looking" + if(!blood_DNA) + var/turf/Z = get_turf(src) + world << "\red ERROR: [src] at [Z.x], [Z.y], [Z.z] is missing it's blood_DNA list! Tell a dev!" + 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