Merge pull request #5727 from Heroman3003/power-shuttle-fix

Fixes power not updating when shuttle moves
This commit is contained in:
Novacat
2019-08-28 16:21:32 -04:00
committed by GitHub
4 changed files with 20 additions and 0 deletions
+6
View File
@@ -0,0 +1,6 @@
/area/shuttle_arrived()
.=..()
for(var/obj/machinery/telecomms/relay/R in contents)
R.reset_z()
for(var/obj/machinery/power/apc/A in contents)
A.update_area()
@@ -3,3 +3,6 @@
hide = 1
produces_heat = 0
autolinkers = list("hb_relay")
/obj/machinery/telecomms/relay/proc/reset_z()
listening_level = z
+9
View File
@@ -0,0 +1,9 @@
/obj/machinery/power/apc/proc/update_area()
var/area/NA = get_area(src)
if(!(NA == area))
if(area.apc == src)
area.apc = null
NA.apc = src
area = NA
name = "[area.name] APC"
update()
+2
View File
@@ -483,6 +483,7 @@
#include "code\game\antagonist\station\traitor.dm"
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\areas_vr.dm"
#include "code\game\area\asteroid_areas.dm"
#include "code\game\area\Away Mission areas.dm"
#include "code\game\area\Space Station 13 areas.dm"
@@ -2679,6 +2680,7 @@
#include "code\modules\planet\time.dm"
#include "code\modules\planet\weather.dm"
#include "code\modules\power\apc.dm"
#include "code\modules\power\apc_vr.dm"
#include "code\modules\power\batteryrack.dm"
#include "code\modules\power\breaker_box.dm"
#include "code\modules\power\cable.dm"