and finally, the modules folder. Now I can publish and take a break

2018-07-02 01:19:37 -04:00
parent 91805b8789
commit b1688405d9
380 changed files with 2204 additions and 1588 deletions
@@ -40,7 +40,10 @@
 	return data

 /datum/computer_file/program/alarm_monitor/proc/triggerAlarm(class, area/A, O, obj/source)
-	if(!is_station_level(source.z) && !is_mining_level(source.z))
+	if(is_station_level(source.z))
+		if(!(A.type in GLOB.the_station_areas))
+			return
+	else if(!is_mining_level(source.z) || istype(A, /area/ruin))
 		return

 	var/list/L = alarms[class]
@@ -95,4 +98,4 @@

 /datum/computer_file/program/alarm_monitor/kill_program(forced = FALSE)
 	GLOB.alarmdisplay -= src
-	..()
+	..()