diff --git a/code/controllers/subsystem/supply.dm b/code/controllers/subsystem/supply.dm index 26d1149feb4..44d0aca27c5 100644 --- a/code/controllers/subsystem/supply.dm +++ b/code/controllers/subsystem/supply.dm @@ -203,8 +203,8 @@ SUBSYSTEM_DEF(supply) SO.status = SUP_ORDER_SHIPPED var/datum/supply_pack/SP = SO.object var/atom/movable/container = SP.instantiate_pack_at(T) + // todo: containerless support if(!container) - stack_trace("how") continue if(SO.comment) container.name += " [SO.comment]" diff --git a/code/modules/supply/supply_pack.dm b/code/modules/supply/supply_pack.dm index 18cb7ceee90..4bab85362f7 100644 --- a/code/modules/supply/supply_pack.dm +++ b/code/modules/supply/supply_pack.dm @@ -158,17 +158,18 @@ . += worth /** + * todo: return list of entities? + * * @return container spawned, or null (which can also mean we don't use a container for some reason) */ /datum/supply_pack/proc/instantiate_pack_at(atom/where) . = instantiate_container(where) - ASSERT(.) instantiate_contents(.) /datum/supply_pack/proc/instantiate_container(atom/where) RETURN_TYPE(/atom/movable) - if(container_type) + if(!container_type) return var/atom/movable/container = new container_type(where) @@ -186,6 +187,9 @@ // todo: getter / setter for req-accesses, enforced cached & deduped lists obj_container.req_one_access = container_one_access.Copy() +/** + * todo: return list of entities? + */ /datum/supply_pack/proc/instantiate_contents(atom/where) var/list/descriptors_to_spawn = resolve_contents_descriptors() for(var/descriptor in descriptors_to_spawn)