Merge pull request #453 from SkyMarshal/master

Map update, fixed more disposal problems, and missing power line to AI core.
This commit is contained in:
Albert Iordache
2012-02-18 01:09:02 -08:00
10 changed files with 6663 additions and 6639 deletions
+3
View File
@@ -137,6 +137,9 @@ MASS SPECTROMETER
return
if(src.loc != user)
return 0
if(istype(A,/obj/item/weapon/f_card))
user << "Haha, nice try. Cheater. (It would break stuff anyways.)"
return
src.add_fingerprint(user)
if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
if(!isnull(A.blood_DNA.len))
@@ -283,7 +283,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
if(M.stat == 2)
var/turf/t = get_turf(M)
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
a.autosay("[mobname] has died in [t.loc.name]!", "[mobname]'s Death Alarm")
a.autosay("states, \"[mobname] has died in [t.loc.name]!\"", "[mobname]'s Death Alarm")
del(a)
processing_objects.Remove(src)