cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Runtime in atmosphere_alarm.dm,24: list index out of bounds

Browse Source 
proc name: on alarm change (/datum/alarm_handler/atmosphere/on_alarm_change)
This commit is contained in:
Leshana
2017-05-22 14:20:03 -04:00
parent 4197a6e60d
commit c3df48f949
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/alarm/atmosphere_alarm.dm
View File

@@ -21,6 +21,6 @@
//VOREStation Add - Alarm for AR glasses
/datum/alarm_handler/atmosphere/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
..()
var/atom/source = alarm.sources_assoc[1]
broadcast_engineering_hud_message("Alarm in [alarm.origin]!", source)
var/atom/source = length(alarm.sources_assoc) ? alarm.sources_assoc[1] : alarm.alarm_area()
broadcast_engineering_hud_message("Alarm in [alarm.origin] [was_raised ? "raised!" : "cleared."]", source)
//VOREStation Add End

9
code/modules/alarm/fire_alarm.dm
View File

@@ -6,11 +6,10 @@
if(istype(A))
if(was_raised)
A.fire_alert()
//VOREStation Add - Alarm for AR glasses uses
var/atom/source = alarm.sources_assoc[1]
broadcast_engineering_hud_message("Alarm in [alarm.origin]!", source)
//VOREStation Add End
else
A.fire_reset()
//VOREStation Add - Alarm for AR glasses uses
var/atom/source = length(alarm.sources_assoc) ? alarm.sources_assoc[1] : alarm.alarm_area()
broadcast_engineering_hud_message("Alarm in [alarm.origin] [was_raised ? "raised!" : "cleared."]", source)
//VOREStation Add End
..()

2
code/modules/mob/mob_helpers.dm
View File

@@ -356,7 +356,7 @@ proc/is_blind(A)
broadcast_hud_message(message, broadcast_source, med_hud_users, /obj/item/clothing/glasses/hud/health)
/proc/broadcast_hud_message(var/message, var/broadcast_source, var/list/targets, var/icon)
var/turf/sourceturf = get_turf(broadcast_source)
var/atom/sourceturf = isarea(broadcast_source) ? broadcast_source : get_turf(broadcast_source) // VOREStation Edit - Allow broadcasts from an area
for(var/mob/M in targets)
var/turf/targetturf = get_turf(M)
if((targetturf.z == sourceturf.z))