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

Merge pull request #4298 from Verkister/patch-84

Browse Source 
Fixes explosions
This commit is contained in:
Nadyr
2022-05-28 17:08:13 -04:00
committed by GitHub
parent c06ec5c7d8 52656780e5
commit 12a079128b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/objects/explosion.dm
View File

@@ -78,16 +78,21 @@
for(var/turf/T in trange(max_range, epicenter)) for(var/turf/T in trange(max_range, epicenter))
var/dist = sqrt((T.x - x0)**2 + (T.y - y0)**2) var/dist = sqrt((T.x - x0)**2 + (T.y - y0)**2)
if(dist < devastation_range) dist = 1 if(dist < devastation_range)
else if(dist < heavy_impact_range) dist = 2 dist = 1
else if(dist < light_impact_range) dist = 3 else if(dist < heavy_impact_range)
else continue dist = 2
else if(dist < light_impact_range)
dist = 3
else
continue
if(!T) if(!T)
T = locate(x0,y0,z0) T = locate(x0,y0,z0)
for(var/atom_movable in T.contents) //bypass type checking since only atom/movable can be contained by turfs anyway for(var/atom_movable in T.contents) //bypass type checking since only atom/movable can be contained by turfs anyway
var/atom/movable/AM = atom_movable var/atom/movable/AM = atom_movable
if(AM && AM.simulated) AM.ex_act(dist) if(AM && AM.simulated)
AM.ex_act(dist)
T.ex_act(dist) T.ex_act(dist)