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

Makes containment fields and tesla bolts bypass gloves

Browse Source
This commit is contained in:
Cyantime
2018-02-04 02:22:35 -05:00
parent 0c643e589e
commit 2cf7149607
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/power/singularity/containment_field.dm
View File

@@ -53,7 +53,7 @@
if(isliving(user)) if(isliving(user))
hasShocked = 1 hasShocked = 1
var/shock_damage = min(rand(30,40),rand(30,40)) var/shock_damage = min(rand(30,40),rand(30,40))
user.electrocute_act(shock_damage, src) user.electrocute_act(shock_damage, src, 1, BP_TORSO)
var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src))) var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src)))
user.throw_at(target, 200, 4) user.throw_at(target, 200, 4)
@@ -61,7 +61,6 @@
sleep(20) sleep(20)
hasShocked = 0 hasShocked = 0
return
/obj/machinery/containment_field/proc/set_master(var/master1,var/master2) /obj/machinery/containment_field/proc/set_master(var/master1,var/master2)
if(!master1 || !master2) if(!master1 || !master2)

2
code/modules/power/tesla/energy_ball.dm
View File

@@ -285,7 +285,7 @@
else if(closest_mob) else if(closest_mob)
var/shock_damage = Clamp(round(power/400), 10, 90) + rand(-5, 5) var/shock_damage = Clamp(round(power/400), 10, 90) + rand(-5, 5)
closest_mob.electrocute_act(shock_damage, source, 1/*, tesla_shock = 1, stun = stun_mobs*/) closest_mob.electrocute_act(shock_damage, source, 1, ran_zone())
if(issilicon(closest_mob)) if(issilicon(closest_mob))
var/mob/living/silicon/S = closest_mob var/mob/living/silicon/S = closest_mob
if(stun_mobs) if(stun_mobs)