From f1c9b60bf8e203d936816c3eba5f036b11d4171c Mon Sep 17 00:00:00 2001 From: cadyn Date: Tue, 24 Nov 2020 23:24:36 -0800 Subject: [PATCH] Fuck okay maybe intercoms move sometimes --- code/game/objects/items/devices/radio/radio_ch.dm | 4 ++++ code/modules/shuttles/shuttle.dm | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio_ch.dm b/code/game/objects/items/devices/radio/radio_ch.dm index a3f4676740..359b6101ae 100644 --- a/code/game/objects/items/devices/radio/radio_ch.dm +++ b/code/game/objects/items/devices/radio/radio_ch.dm @@ -37,6 +37,10 @@ continue broadcast_tiles = output +/obj/item/device/radio/intercom/forceMove(atom/destination) + . = ..() + update_broadcast_tiles() + /obj/item/device/radio/intercom/Initialize() update_broadcast_tiles() diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index a062d2a3d3..d4058e1a30 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -317,7 +317,7 @@ bug.gib() else qdel(AM) //it just gets atomized I guess? TODO throw it into space somewhere, prevents people from using shuttles as an atom-smasher - + var/list/radios = list() //CHOMPEdit var/list/powernets = list() for(var/area/A in shuttle_area) // If there was a zlevel above our origin and we own the ceiling, erase our ceiling now we're leaving @@ -347,6 +347,10 @@ // We only need to rebuild powernets for our cables. No need to check machines because they are on top of cables. for(var/obj/structure/cable/C in A) powernets |= C.powernet + //CHOMPEdit Begin + for(var/obj/item/device/radio/intercom/I in A) + radios |= I + //CHOMPEdit End // Actually do the movement of everything - This replaces origin.move_contents_to(destination) translate_turfs(turf_translation, current_location.base_area, current_location.base_turf) @@ -370,7 +374,11 @@ cables |= P.cables qdel(P) SSmachines.setup_powernets_for_cables(cables) - + //CHOMPEdit Begin + for(var/obj/item/device/radio/intercom/I in radios) + if(istype(I)) + I.update_broadcast_tiles() + //CHOMPEdit End // Adjust areas of mothershuttle so it doesn't try and bring us with it if it jumps while we aren't on it. if(mothershuttle) var/datum/shuttle/MS = SSshuttles.shuttles[mothershuttle]