Merge branch 'master' into upstream-merge-37299

code/datums/components/storage/storage.dm

@@ -60,7 +60,7 @@
 
 /datum/component/storage/Initialize(datum/component/storage/concrete/master)
 	if(!isatom(parent))
-		. = COMPONENT_INCOMPATIBLE
+		return COMPONENT_INCOMPATIBLE
 	if(master)
 		change_master(master)
 	boxes = new(null, src)
@@ -727,4 +727,4 @@
 		if(COLLECT_EVERYTHING)
 			to_chat(user, "[parent] now picks up all items in a tile at once.")
 		if(COLLECT_ONE)
-			to_chat(user, "[parent] now picks up one item at a time.")
+			to_chat(user, "[parent] now picks up one item at a time.")