Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
|
||||
/obj/machinery/power/apc/can_terminal_dismantle()
|
||||
. = 0
|
||||
if(opened)
|
||||
if(opened && has_electronics != 2)
|
||||
. = 1
|
||||
|
||||
/obj/machinery/power/smes/can_terminal_dismantle()
|
||||
@@ -47,8 +47,8 @@
|
||||
. = 1
|
||||
|
||||
|
||||
/obj/machinery/power/terminal/proc/dismantle(mob/living/user, obj/item/W)
|
||||
if(isturf(loc))
|
||||
/obj/machinery/power/terminal/proc/dismantle(mob/living/user)
|
||||
if(istype(loc, /turf))
|
||||
var/turf/T = loc
|
||||
if(T.intact)
|
||||
user << "<span class='warning'>You must first expose the power terminal!</span>"
|
||||
@@ -59,9 +59,9 @@
|
||||
"<span class='notice'>You begin to cut the cables...</span>")
|
||||
|
||||
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
|
||||
if(do_after(user, 50*W.toolspeed, target = src))
|
||||
if(do_after(user, 50, target = src))
|
||||
if(master && master.can_terminal_dismantle())
|
||||
if(prob(50) && electrocute_mob(user, powernet, src, 1, TRUE))
|
||||
if(prob(50) && electrocute_mob(user, powernet, src))
|
||||
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
|
||||
s.set_up(5, 1, master)
|
||||
s.start()
|
||||
@@ -73,6 +73,6 @@
|
||||
|
||||
/obj/machinery/power/terminal/attackby(obj/item/W, mob/living/user, params)
|
||||
if(istype(W, /obj/item/weapon/wirecutters))
|
||||
dismantle(user, W)
|
||||
dismantle(user)
|
||||
else
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user