Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup

2020-01-27 08:33:38 +08:00
parent 0d1e458e9c 27cd7745ed
commit e45cc4933c
296 changed files with 16424 additions and 11376 deletions
@@ -46,7 +46,7 @@
 					A.mode = 1 // AALARM_MODE_SCRUB
 				A.apply_mode()
 		if(WIRE_ALARM) // Clear alarms.
-			var/area/AA = get_area(A)
+			var/area/AA = get_base_area(A)
 			if(AA.atmosalert(0, holder))
 				A.post_alert(0)
 			A.update_icon()
@@ -68,7 +68,7 @@
 				A.mode = 3 // AALARM_MODE_PANIC
 				A.apply_mode()
 		if(WIRE_ALARM) // Post alarm.
-			var/area/AA = get_area(A)
+			var/area/AA = get_base_area(A)
 			if(AA.atmosalert(2, holder))
 				A.post_alert(2)
 			A.update_icon()