Merge branch 'master' into upstream-merge-32280

This commit is contained in:
LetterJay
2017-11-15 10:21:04 -06:00
committed by GitHub
247 changed files with 13614 additions and 3304 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
name = "AI Monitored Area"
clockwork_warp_allowed = FALSE
var/list/obj/machinery/camera/motioncameras = list()
var/list/motionTargets = list()
var/list/datum/weakref/motionTargets = list()
/area/ai_monitored/Initialize(mapload)
. = ..()
@@ -27,5 +27,5 @@
if (ismob(O) && motioncameras.len)
for(var/X in motioncameras)
var/obj/machinery/camera/cam = X
cam.lostTarget(O)
cam.lostTargetRef(WEAKREF(O))
return
+1
View File
@@ -154,6 +154,7 @@
has_gravity = TRUE
noteleport = TRUE
hidden = TRUE
ambientsounds = REEBE
/area/reebe/city_of_cogs
name = "City of Cogs"
+9
View File
@@ -111,3 +111,12 @@
/area/shuttle/syndicate_scout
name = "Syndicate Scout"
blob_allowed = FALSE
/area/shuttle/pirate
name = "Pirate Shuttle"
blob_allowed = FALSE
requires_power = TRUE
/area/shuttle/pirate/vault
name = "Pirate Shuttle Vault"
requires_power = FALSE