This commit is contained in:
AndrewJacksonThe2nd
2015-12-19 17:51:11 -08:00
parent 56be042744
commit 0d65351d3f
4 changed files with 14 additions and 9 deletions
+5 -3
View File
@@ -98,11 +98,13 @@
jitteriness += 1000 //High numbers for violent convulsions
do_jitter_animation(jitteriness)
stuttering += 2
Stun(2)
if(!tesla_act || (tesla_act && siemens_coeff > 0.5)
Stun(2)
spawn(20)
jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less
Stun(3)
Weaken(3)
if(!tesla_act || (tesla_act && siemens_coeff > 0.5)
Stun(3)
Weaken(3)
if(override)
return override
else
@@ -289,7 +289,7 @@
if(wear_suit)
var/obj/item/clothing/suit/S = wear_suit
if(S.siemens_coefficient <= 0)
total_coeff = 0
total_coeff -= 0.95
siemens_coeff = total_coeff
else if(!safety)
var/gloves_siemens_coeff = 1
@@ -305,7 +305,7 @@
heart_attack = 0
if(stat == CONSCIOUS)
src << "<span class='notice'>You feel your heart beating again!</span>"
. = ..(shock_damage,source,siemens_coeff,safety,override)
. = ..(shock_damage,source,siemens_coeff,safety,override,tesla_shock)
if(.)
electrocution_animation(40)
+4 -4
View File
@@ -60,10 +60,10 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
for(var/i = 0, i < move_amount, i++)
var/move_dir = pick(alldirs)
var/turf/T = get_step(src,move_dir)
if(can_move(T))
loc = get_step(src,move_dir)
var/move_dir = pick(alldirs)
var/turf/T = get_step(src,move_dir)
if(can_move(T))
loc = get_step(src,move_dir)
/obj/singularity/energy_ball/proc/handle_energy()
if(energy >= 300)