cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

the codex astartes is sad that this maneuver is being nerfed (#40491)

Browse Source 
Fixes #40486

cl MrDoomBringer
fix: Supplypods no longer detonate their contents
/cl

I did this by adding a return value to the atom/contents_explosion() proc. If the proc is overridden, it should return null. This is then checked in explosion.dm to see if the contents have been properly exploded. If they havent (if contents_explosion() returns true), then explosion.dm handles it manually.

There might be a better way to go about this, if there is please let me know
This commit is contained in:
MrDoomBringer
2018-10-05 02:11:13 -04:00
committed by oranges
parent 4e11fd4bbd
commit f4c879db38
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/explosion.dm
+2 -1
View File
@@ -198,7 +198,8 @@ GLOBAL_LIST_EMPTY(explosions)
var/list/items = list()
for(var/I in T)
var/atom/A = I
items += A.GetAllContents()
if (A.contents_explosion()) //The atom/contents_explosion() proc returns null if the contents ex_acting has been handled by the atom, and TRUE if it hasn't.
items += A.GetAllContents()
for(var/O in items)
var/atom/A = O
if(!QDELETED(A))