From fc604df1c17681db3fe19065a19830513c992090 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 13 Feb 2022 16:49:26 -0500 Subject: [PATCH 1/2] Merge pull request #12218 from Very-Soft/noqpadsonshuttls No Quantum Pads on Shuttles --- code/game/machinery/constructable_frame.dm | 5 +++++ code/modules/telesci/quantum_pad.dm | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index a2f310aaf1..6a61f01502 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -50,6 +50,11 @@ if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") + //VOREStation Addition End + if(istype(B, /obj/item/weapon/circuitboard/quantumpad) && istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for a quantum pad to operate on!") + return + //VOREStation Addition End playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You add the circuit board to the frame.") circuit = P diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index efc8a1a195..e5b49fdf05 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -65,6 +65,11 @@ return if(istype(I, /obj/item/device/multitool)) + //VOREStation Addition Start + if(istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + return + //VOREStation Addition End if(panel_open) var/obj/item/device/multitool/M = I M.connectable = src @@ -128,6 +133,10 @@ if(istype(get_area(src), /area/shuttle)) to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + //VOREStation Addition Start + if(linked_pad) + linked_pad.linked_pad = null + //VOREStation Addition End return if(!powernet) @@ -177,6 +186,11 @@ update_icon() if(!linked_pad) return + //VOREStation Addition Start + if(istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + return + //VOREStation Addition End playsound(src, 'sound/weapons/flash.ogg', 25, 1) teleporting = 1