diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm index 2620cb58dc8..c13ad4e54e9 100644 --- a/code/game/objects/items/storage/boxes/job_boxes.dm +++ b/code/game/objects/items/storage/boxes/job_boxes.dm @@ -14,6 +14,10 @@ var/medipen_type = /obj/item/reagent_containers/hypospray/medipen /// Are we crafted? var/crafted = FALSE + /// Should we contain an escape hook on maps with z-levels? + var/give_hook = TRUE + /// Do we get to benefit from Nanotrasen's largesse? + var/give_premium_goods = TRUE /obj/item/storage/box/survival/Initialize(mapload) . = ..() @@ -36,14 +40,14 @@ if(!isnull(medipen_type)) new medipen_type(src) - if(HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS)) + if(give_premium_goods && HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS)) new /obj/item/flashlight/flare(src) new /obj/item/radio/off(src) if(HAS_TRAIT(SSstation, STATION_TRAIT_RADIOACTIVE_NEBULA)) new /obj/item/storage/pill_bottle/potassiodide(src) - if(length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1) + if(give_hook && length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1) new /obj/item/climbing_hook/emergency(src) new /obj/item/oxygen_candle(src) //SKYRAT EDIT ADDITION @@ -66,6 +70,11 @@ qdel(mask) // Get rid of the items that shouldn't be qdel(internals) +// Prisoners don't get an escape hook +/obj/item/storage/box/survival/prisoner + give_hook = FALSE + give_premium_goods = FALSE + // Mining survival box /obj/item/storage/box/survival/mining mask_type = /obj/item/clothing/mask/gas/explorer/folded diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 72eed75d94e..574bbc3d67c 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -60,6 +60,7 @@ belt = null ears = null shoes = /obj/item/clothing/shoes/sneakers/orange + box = /obj/item/storage/box/survival/prisoner /datum/outfit/job/prisoner/pre_equip(mob/living/carbon/human/H) ..()