From df9e07d9fd89d7789d4cce71951ce2d8287d8a30 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Thu, 16 Aug 2012 04:54:19 +0000 Subject: [PATCH] - Fixes issue 689. Power alerts are now only relayed to computers, AIs and cyborgs located on the z-level, which contains the APC or whatever that triggered the alert. - Added the body temperature changes to the changelog. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4432 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/area/areas.dm | 31 +++++++++++++++++-------------- html/changelog.html | 11 +++++++++++ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 967b610a999..564676f90a8 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -77,22 +77,25 @@ lighting_power_usage = new_power return */ -/area/proc/poweralert(var/state, var/source) +/area/proc/poweralert(var/state, var/obj/source as obj) if (state != poweralm) poweralm = state - var/list/cameras = list() - for (var/obj/machinery/camera/C in src) - cameras += C - for (var/mob/living/silicon/aiPlayer in player_list) - if (state == 1) - aiPlayer.cancelAlarm("Power", src, source) - else - aiPlayer.triggerAlarm("Power", src, cameras, source) - for(var/obj/machinery/computer/station_alert/a in player_list) - if(state == 1) - a.cancelAlarm("Power", src, source) - else - a.triggerAlarm("Power", src, source) + if(istype(source)) //Only report power alarms on the z-level where the thing is located. + var/list/cameras = list() + for (var/obj/machinery/camera/C in src) + cameras += C + for (var/mob/living/silicon/aiPlayer in player_list) + if(aiPlayer.z == source.z) + if (state == 1) + aiPlayer.cancelAlarm("Power", src, source) + else + aiPlayer.triggerAlarm("Power", src, cameras, source) + for(var/obj/machinery/computer/station_alert/a in player_list) + if(a.z == source.z) + if(state == 1) + a.cancelAlarm("Power", src, source) + else + a.triggerAlarm("Power", src, source) return /area/proc/atmosalert(danger_level) diff --git a/html/changelog.html b/html/changelog.html index d077584d6a7..2ef787c846c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,17 @@ should be listed in the changelog upon commit tho. Thanks. --> +
+

August 16, 2012

+

Errorage updated:

+ +
+ +

August 14, 2012

Sieve updated: