[MIRROR] fix return_inv() returning a null sometimes, causing get_all…

…_gear() to runtime (#849) * fix return_inv() returning a null sometimes, causing get_all_gear() to runtime * Fix --------- Co-authored-by: ViktorKoL <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]> Co-authored-by: Mal <[email protected]>
Fluffy-Frontier · Feb 8, 2024 · 300d114 · 300d114
1 parent 107a5d8
commit 300d114
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm
@@ -642,13 +642,21 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		return
 
 	var/list/ret = list()
+<<<<<<< HEAD
 	ret |= resolve_location.contents
 	if(recursive)
 		for(var/i in ret.Copy())
 			var/atom/atom = i
 			atom.atom_storage?.return_inv(ret, TRUE)
 
 	interface |= ret
+=======
+
+	for(var/atom/found_thing as anything in real_location)
+		ret |= found_thing
+		if(recursive && found_thing.atom_storage)
+			ret |= found_thing.atom_storage.return_inv(recursive = TRUE)
+>>>>>>> 5494b8563 ([MIRROR] fix return_inv() returning a null sometimes, causing get_all_gear() to runtime (#849))
 
 	return TRUE