Merge pull request #88 from Strumpetplaya/master

Fixed runtime error involving cyborgs and fibers.
This commit is contained in:
headswe
2011-12-10 08:36:59 -08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -82,6 +82,6 @@ client/verb/showrevinfo()
set category = "OOC"
set name = "Show Server Revision"
var/output = "Sorry, the revision info is unavailable."
output = shell("cat /home/bay12/live/data/gitcommit")
output = file2text("/home/bay12/live/data/gitcommit")
usr << browse(output,"window=revdata");
return
+1 -1
View File
@@ -81,10 +81,10 @@
/atom/proc/add_fingerprint(mob/living/M as mob)
if(isnull(M)) return
if(isnull(M.key)) return
add_fibers(M)
if (!( src.flags ) & 256)
return
if (ishuman(M))
add_fibers(M)
var/mob/living/carbon/human/H = M
if (!istype(H.dna, /datum/dna))
return 0