shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some modules things

Browse Source
This commit is contained in:
Poojawa
2017-02-08 00:06:03 -06:00
parent 01ed369034
commit f49c0c0268
25 changed files with 324 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/coil.dm
+4 -4
View File
@@ -90,10 +90,10 @@
if((last_zap + zap_cooldown) > world.time)
return FALSE
last_zap = world.time
var/coeff = (12 - (input_power_multiplier * 3))
coeff = max(coeff, 1)
var/shock_coeff = (5 - input_power_multiplier)
shock_coeff = max(shock_coeff, 1)
var/coeff = (20 - ((input_power_multiplier - 1) * 3))
coeff = max(coeff, 10)
var/shock_coeff = (4 - (input_power_multiplier - 2))
shock_coeff = max(shock_coeff, 2)
var/power = (powernet.avail/coeff)
add_load(power)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
code/modules/power/tesla/energy_ball.dm
+1 -1
View File
@@ -203,7 +203,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
else if(isliving(A))
var/dist = get_dist(source, A)
var/mob/living/L = A
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD)
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !L.tesla_ignore)
closest_mob = L
closest_atom = A
closest_dist = dist