diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 99e6411d5f4..b805305d747 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -367,8 +367,24 @@ var/list/mechtoys = list( temp += "Request from: [get_supply_group_name(cat)]

" for(var/supply_type in supply_controller.supply_packs ) var/datum/supply_packs/N = supply_controller.supply_packs[supply_type] - if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to - temp += "[N.name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + if(N.hidden || N.contraband || N.group != cat) continue + temp += "[N.name]" //Have to send the type instead of a reference to the obj because it would get caught by the garbage + temp += " (contents)" + temp += " Cost: [N.cost]
" + + else if (href_list["see_contents"]) + //Find the correct supply_pack datum + var/datum/supply_packs/P = supply_controller.supply_packs[href_list["see_contents"]] + if(!istype(P)) return + + var/cat = P.group + var/tempaccess = get_access_desc(P.access) + + temp = "Supply points: [supply_controller.points]
" + temp += "Back to [get_supply_group_name(cat)]


" + temp += "Access restriction: [tempaccess ? tempaccess : "None"]

" + temp += "Contents of [P.name]:
" + temp += P.manifest else if (href_list["doorder"]) if(world.time < reqtime) @@ -563,8 +579,10 @@ var/list/mechtoys = list( temp += "Request from: [get_supply_group_name(cat)]

" for(var/supply_type in supply_controller.supply_packs ) var/datum/supply_packs/N = supply_controller.supply_packs[supply_type] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue //Have to send the type instead of a reference to - temp += "[N.name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue + temp += "[N.name]" //Have to send the type instead of a reference to the obj because it would get caught by the garbage + temp += " (contents)" + temp += " Cost: [N.cost]
" /*temp = "Supply points: [supply_controller.points]


Request what?

" @@ -575,6 +593,20 @@ var/list/mechtoys = list( temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage temp += "
OK"*/ + else if (href_list["see_contents"]) + //Find the correct supply_pack datum + var/datum/supply_packs/P = supply_controller.supply_packs[href_list["see_contents"]] + if(!istype(P)) return + + var/cat = P.group + var/tempaccess = get_access_desc(P.access) + + temp = "Supply points: [supply_controller.points]
" + temp += "Back to [get_supply_group_name(cat)]


" + temp += "Access restriction: [tempaccess ? tempaccess : "None"]

" + temp += "Contents of [P.name]:
" + temp += P.manifest + else if (href_list["doorder"]) if(world.time < reqtime) for(var/mob/V in hearers(src))