Merge pull request #3672 from CHOMPStation2/upstream-merge-12218

[MIRROR] No Quantum Pads on Shuttles
This commit is contained in:
Razgriz
2022-02-16 14:26:38 -07:00
committed by GitHub
2 changed files with 19 additions and 0 deletions
@@ -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, "<span class='warning'>This is too unstable a platform for a quantum pad to operate on!</span>")
return
//VOREStation Addition End
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
to_chat(user, "<span class='notice'>You add the circuit board to the frame.</span>")
circuit = P
+14
View File
@@ -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, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
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, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
//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, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
return
//VOREStation Addition End
playsound(src, 'sound/weapons/flash.ogg', 25, 1)
teleporting = 1