From 58d7da9008051a957e63fccd5769a95dcbab6048 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 15 Feb 2012 10:26:22 -0700 Subject: [PATCH] Missing blood_DNA now goes into admin logs and stuff. --- code/game/atom_procs.dm | 16 ++++++++++++---- code/game/objects/items/item.dm | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 07431ef85c..3ae04a7cb3 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -143,7 +143,8 @@ return 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!" + 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. @@ -247,7 +248,8 @@ return 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!" + 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 ) @@ -260,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) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index 7025f14295..c37a7919ca 100755 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -103,7 +103,8 @@ 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!" + 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)