Merge pull request #10151 from Ghommie/Ghommie-cit450

refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
This commit is contained in:
kevinz000
2020-01-25 19:33:26 -07:00
committed by GitHub
34 changed files with 374 additions and 250 deletions
+1 -1
View File
@@ -52,7 +52,7 @@
var/area/A = get_area(src)
if(!A.blob_allowed)
return FALSE
if(!A.power_equip)
if(!A.powered(EQUIP))
return FALSE
if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
return FALSE
+1 -1
View File
@@ -80,7 +80,7 @@
/obj/structure/displaycase/proc/trigger_alarm()
//Activate Anti-theft
if(alert)
var/area/alarmed = get_area(src)
var/area/alarmed = get_base_area(src)
alarmed.burglaralert(src)
playsound(src, 'sound/effects/alert.ogg', 50, 1)