cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a sanity check, added some feedback stuff to help identify WTF is happening with blood.

Browse Source
This commit is contained in:
SkyMarshal
2012-02-14 19:57:05 -07:00
parent 9d12cf6c12
commit 5e332d297d
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/atom_procs.dm
View File

@@ -141,7 +141,11 @@
return 0 return 0
if (!( src.flags ) & 256) if (!( src.flags ) & 256)
return 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. 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 var/obj/item/source2 = src
source2.icon_old = src.icon source2.icon_old = src.icon

12
code/game/machinery/computer/security.dm
View File

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

4
code/game/objects/items/item.dm
View File

@@ -101,6 +101,10 @@
t = "huge" t = "huge"
else else
if ((usr.mutations & CLUMSY) && prob(50)) t = "funny-looking" 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) usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA.len ? "" : "bloody ",src, src.name, t)
if(src.desc) if(src.desc)
usr << src.desc usr << src.desc