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

Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework

Browse Source
This commit is contained in:
Timothy Teakettle
2020-09-10 19:17:19 +01:00
parent b65fecca10 d2f4d675a4
commit 348341ed80
35 changed files with 57 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/empulse.dm
View File

@@ -5,7 +5,7 @@
if(!isturf(epicenter))
epicenter = get_turf(epicenter.loc)
var/max_distance = round((power/7)^0.7)
var/max_distance = max(round((power/7)^0.7), 1)
if(log)
message_admins("EMP with power [power], max distance [max_distance] in area [epicenter.loc.name] ")
@@ -14,9 +14,14 @@
if(power > 100)
new /obj/effect/temp_visual/emp/pulse(epicenter)
for(var/A in spiral_range(light_range, epicenter))
for(var/A in spiral_range(max_distance, epicenter))
var/atom/T = A
var/distance = get_dist(epicenter, T)
var/severity = min(max((max_distance / distance^0.3) * (100/max_distance), 1),100) //if it goes below 1 or above 100 stuff gets bad
var/severity = 100
if(distance != 0) //please dont divide by 0
severity = min(max((max_distance / distance^0.3) * (100/max_distance), 1),100) //if it goes below 1 or above 100 stuff gets bad
T.emp_act(severity)
return 1
/proc/empulse_power_from_range(range) //work out the power required for an emp of a given wanted range
return (7*(range^(1/0.7)))