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
@@ -283,7 +283,7 @@
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_charge()
if(equip_ready) //disabled
return
var/area/A = get_area(chassis)
var/area/A = get_base_area(chassis)
var/pow_chan = get_power_channel(A)
if(pow_chan)
return 1000 //making magic
@@ -328,7 +328,7 @@
occupant_message("No powercell detected.")
return
if(cur_charge < chassis.cell.maxcharge)
var/area/A = get_area(chassis)
var/area/A = get_base_area(chassis)
if(A)
var/pow_chan
for(var/c in list(EQUIP,ENVIRON,LIGHT))