[MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)

* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-06 22:07:01 +01:00
committed by GitHub
co-authored by Ghilker GoldenAlpharex
parent 5a3b5a4dff
commit cc93b11d23
142 changed files with 1717 additions and 1677 deletions
+1 -1
View File
@@ -123,7 +123,7 @@ SUBSYSTEM_DEF(atoms)
else
SEND_SIGNAL(A,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE)
if(created_atoms && from_template && ispath(the_type, /atom/movable))//we only want to populate the list with movables
created_atoms += A.GetAllContents()
created_atoms += A.get_all_contents()
return qdeleted || QDELING(A)
+1 -1
View File
@@ -416,7 +416,7 @@ SUBSYSTEM_DEF(explosions)
for(var/I in T)
var/atom/A = I
if (length(A.contents) && !(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(ignore_flag_1 = PREVENT_CONTENTS_EXPLOSION_1)
items += A.get_all_contents(ignore_flag_1 = PREVENT_CONTENTS_EXPLOSION_1)
for(var/thing in items)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))