diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index f89c94e9dc0..bc6faeabff0 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -142,8 +142,6 @@ SUBSYSTEM_DEF(shuttle) while(length(pack_processing)) var/datum/supply_pack/pack = pack_processing[length(pack_processing)] pack_processing.len-- - if(!initial(pack.contains)) - continue if(ispath(pack, /datum/supply_pack)) pack = new pack @@ -152,6 +150,10 @@ SUBSYSTEM_DEF(shuttle) pack_processing += generated_packs continue + //we have to create the pack before checking if it has 'contains' because generate_supply_packs manually sets it, therefore we cant check initial. + if(!pack.contains) + continue + supply_packs[pack.id] = pack setup_shuttles(stationary_docking_ports)