cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8485

Browse Source
This commit is contained in:
Zuhayr
2015-03-24 13:20:24 +10:30
parent ef50918b9c
commit 45f28d5372
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/machinery.dm
View File

@@ -270,8 +270,8 @@ 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()
if(user.stunned)
return 1 return 1
else
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)

1
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -30,6 +30,7 @@
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()
if(usr.stunned)
return 2 return 2
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)

1
code/game/objects/structures/grille.dm
View File

@@ -197,6 +197,7 @@
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()
if(user.stunned)
return 1 return 1
else else
return 0 return 0

1
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -706,6 +706,7 @@
/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()
if(user.stunned)
return 1 return 1
return 0 return 0

2
code/modules/power/apc.dm
View File

@@ -535,6 +535,7 @@
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()
if(user.stunned)
return return
C.use(10) C.use(10)
user.visible_message(\ user.visible_message(\
@@ -555,6 +556,7 @@
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()
if(usr.stunned)
return 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>"

2
code/modules/power/cable.dm
View File

@@ -193,8 +193,8 @@ 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()
if(usr.stunned)
return 1 return 1
else
return 0 return 0
//explosion handling //explosion handling

1
code/modules/power/smes.dm
View File

@@ -275,6 +275,7 @@
s.set_up(5, 1, src) s.set_up(5, 1, src)
s.start() s.start()
building_terminal = 0 building_terminal = 0
if(usr.stunned)
return 0 return 0
new /obj/item/stack/cable_coil(loc,10) new /obj/item/stack/cable_coil(loc,10)
user.visible_message(\ user.visible_message(\