Merge pull request #201 from alex-gh/event_fixes

Event fixes
This commit is contained in:
alex-gh
2014-05-13 18:17:03 +02:00
3 changed files with 4 additions and 3 deletions
@@ -48,6 +48,7 @@
if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
if(A.anchored && istype(A, /obj/machinery)) continue
if(istype(A, /obj/structure/disposalpipe )) continue
if(istype(A, /obj/structure/disposaloutlet)) continue
if(istype(A, /obj/structure/cable )) continue
var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
+2 -2
View File
@@ -1,9 +1,9 @@
/datum/event/anomaly/anomaly_pyro
startWhen = 10
startWhen = 30
announceWhen = 3
endWhen = 70
endWhen = 110
/datum/event/anomaly/anomaly_pyro/announce()