- 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
This commit is contained in:
baloh.matevz
2012-08-16 04:54:19 +00:00
parent d908d6bf04
commit df9e07d9fd
2 changed files with 28 additions and 14 deletions
+17 -14
View File
@@ -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)
+11
View File
@@ -47,6 +47,17 @@ should be listed in the changelog upon commit tho. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">August 16, 2012</h2>
<h3 class="author">Errorage updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Changes were made to how heating and cooling of humans works.</li>
<li class="tweak">You must wear both a space suit and space helmet to be protected from space! Likewise you must wear a firesuit and a fire helmet to be protected from fire! Fire helmets are red and white hardhats, found in all fire closets.</li>
<li class="tweak">Fire suits now only protect from heat and space suits only protect from cold, so make your choice count.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">August 14, 2012</h2>
<h3 class="author">Sieve updated:</h3>