mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Fixes #8485
This commit is contained in:
@@ -270,9 +270,9 @@ Class Procs:
|
|||||||
|
|
||||||
if(temp_apc && temp_apc.terminal && temp_apc.terminal.powernet)
|
if(temp_apc && temp_apc.terminal && temp_apc.terminal.powernet)
|
||||||
temp_apc.terminal.powernet.trigger_warning()
|
temp_apc.terminal.powernet.trigger_warning()
|
||||||
return 1
|
if(user.stunned)
|
||||||
else
|
return 1
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
/obj/machinery/proc/default_deconstruction_crowbar(var/mob/user, var/obj/item/weapon/crowbar/C)
|
/obj/machinery/proc/default_deconstruction_crowbar(var/mob/user, var/obj/item/weapon/crowbar/C)
|
||||||
if(!istype(C))
|
if(!istype(C))
|
||||||
|
|||||||
@@ -30,7 +30,8 @@
|
|||||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||||
s.set_up(5, 1, src)
|
s.set_up(5, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
return 2
|
if(usr.stunned)
|
||||||
|
return 2
|
||||||
|
|
||||||
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
|
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
|
||||||
for(var/obj/O in src)
|
for(var/obj/O in src)
|
||||||
|
|||||||
@@ -197,7 +197,8 @@
|
|||||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||||
s.set_up(3, 1, src)
|
s.set_up(3, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
return 1
|
if(user.stunned)
|
||||||
|
return 1
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -706,7 +706,8 @@
|
|||||||
/obj/item/weapon/rig/proc/shock(mob/user)
|
/obj/item/weapon/rig/proc/shock(mob/user)
|
||||||
if (electrocute_mob(user, cell, src))
|
if (electrocute_mob(user, cell, src))
|
||||||
spark_system.start()
|
spark_system.start()
|
||||||
return 1
|
if(user.stunned)
|
||||||
|
return 1
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
/obj/item/weapon/rig/proc/take_hit(damage, source, is_emp=0)
|
/obj/item/weapon/rig/proc/take_hit(damage, source, is_emp=0)
|
||||||
|
|||||||
@@ -535,7 +535,8 @@
|
|||||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||||
s.set_up(5, 1, src)
|
s.set_up(5, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
return
|
if(user.stunned)
|
||||||
|
return
|
||||||
C.use(10)
|
C.use(10)
|
||||||
user.visible_message(\
|
user.visible_message(\
|
||||||
"<span class='warning'>[user.name] has added cables to the APC frame!</span>",\
|
"<span class='warning'>[user.name] has added cables to the APC frame!</span>",\
|
||||||
@@ -555,7 +556,8 @@
|
|||||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||||
s.set_up(5, 1, src)
|
s.set_up(5, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
return
|
if(usr.stunned)
|
||||||
|
return
|
||||||
new /obj/item/stack/cable_coil(loc,10)
|
new /obj/item/stack/cable_coil(loc,10)
|
||||||
user << "<span class='notice'>You cut the cables and dismantle the power terminal.</span>"
|
user << "<span class='notice'>You cut the cables and dismantle the power terminal.</span>"
|
||||||
del(terminal) // qdel
|
del(terminal) // qdel
|
||||||
|
|||||||
@@ -193,9 +193,9 @@ By design, d1 is the smallest direction and d2 is the highest
|
|||||||
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
|
||||||
s.set_up(5, 1, src)
|
s.set_up(5, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
return 1
|
if(usr.stunned)
|
||||||
else
|
return 1
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
//explosion handling
|
//explosion handling
|
||||||
/obj/structure/cable/ex_act(severity)
|
/obj/structure/cable/ex_act(severity)
|
||||||
|
|||||||
@@ -275,7 +275,8 @@
|
|||||||
s.set_up(5, 1, src)
|
s.set_up(5, 1, src)
|
||||||
s.start()
|
s.start()
|
||||||
building_terminal = 0
|
building_terminal = 0
|
||||||
return 0
|
if(usr.stunned)
|
||||||
|
return 0
|
||||||
new /obj/item/stack/cable_coil(loc,10)
|
new /obj/item/stack/cable_coil(loc,10)
|
||||||
user.visible_message(\
|
user.visible_message(\
|
||||||
"<span class='notice'>[user.name] cut the cables and dismantled the power terminal.</span>",\
|
"<span class='notice'>[user.name] cut the cables and dismantled the power terminal.</span>",\
|
||||||
|
|||||||
Reference in New Issue
Block a user