cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes explosions damaging the contents of atoms with the PREVENT_CONTENTS_EXPLOSION_1 flag (#50397)

Browse Source 
Fixes #49986
Fixes #49232

🆑
fix: Being at the epicenter of explosions no longer damage the contents of storage that is meant to prevent it (most commonly photos inside photo albums)
/🆑
This commit is contained in:
Mickyan
2020-04-18 11:02:39 +12:00
committed by GitHub
parent 8cddfcdef0
commit 7e7bfcc7a1
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/explosion.dm
+2 -2
View File
@@ -198,8 +198,8 @@ GLOBAL_LIST_EMPTY(explosions)
var/list/items = list()
for(var/I in T)
var/atom/A = I
if (!(A.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) //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()
if (!(A.flags_1 & PREVENT_CONTENTS_EXPLOSION_1))
items += A.GetAllContents(ignore_flag_1 = PREVENT_CONTENTS_EXPLOSION_1)
for(var/O in items)
var/atom/A = O
if(!QDELETED(A))