Merge pull request #8825 from Ghommie/Ghommie-cit110

Ports "Fixes default supplypods exploding their contents" & co.
This commit is contained in:
kevinz000
2019-07-07 02:34:47 -07:00
committed by GitHub
7 changed files with 31 additions and 11 deletions
+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.prevent_content_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))