From 52db63784e9e2ef133fdb8898b0815bb65d7950b Mon Sep 17 00:00:00 2001 From: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:40:52 -0400 Subject: [PATCH] Adds 3 new light crates (#26449) * adds 3 illumination crates * adds more glowsticks to premium box * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> --------- Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- .../objects/items/weapons/storage/boxes.dm | 25 ++++++++++++++++ .../supply/supply_packs/pack_emergency.dm | 30 +++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index e0ce9114866..4287c96cc65 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -341,6 +341,31 @@ new /obj/item/stack/sheet/metal/fifty(src) new /obj/item/stack/cable_coil(src) +/obj/item/storage/box/large/glowstick/emergency + name = "emergency glowstick box" + desc = "A large box filled to the brim with cheap emergency glowsticks." + +/obj/item/storage/box/large/glowstick/emergency/populate_contents() + for(var/i in 1 to 15) + new /obj/item/flashlight/flare/glowstick/emergency(src) + +/obj/item/storage/box/glowstick/premium + name = "premium glowstick box" + desc = "A box filled with high-quality military surplus glowsticks." + +/obj/item/storage/box/glowstick/premium/populate_contents() + for(var/i in 1 to 5) + new /obj/item/flashlight/flare/glowstick(src) + +/obj/item/storage/box/flares + name = "emergency flare box" + desc = "A box full of magnesium signal flares." + +/obj/item/storage/box/flares/populate_contents() + for(var/i in 1 to 5) + new /obj/item/flashlight/flare(src) + + ////////////////// /* Monkey Boxes */ ////////////////// diff --git a/code/modules/supply/supply_packs/pack_emergency.dm b/code/modules/supply/supply_packs/pack_emergency.dm index c34c949986b..115e0c67ebb 100644 --- a/code/modules/supply/supply_packs/pack_emergency.dm +++ b/code/modules/supply/supply_packs/pack_emergency.dm @@ -27,6 +27,36 @@ containername = "emergency crate" group = SUPPLY_EMERGENCY +/datum/supply_packs/emergency/glowstick/emergency + name = "Emergency Glowstick Crate" + contains = list(/obj/item/storage/box/large/glowstick/emergency, + /obj/item/storage/box/large/glowstick/emergency, + /obj/item/storage/box/large/glowstick/emergency, + /obj/item/storage/box/large/glowstick/emergency, + /obj/item/storage/box/large/glowstick/emergency) + cost = 100 + containertype = /obj/structure/closet/crate + containername = "emergency glowstick crate" + +/datum/supply_packs/emergency/glowstick/premium + name = "Premium Glowstick Crate" + contains = list(/obj/item/storage/box/glowstick/premium, + /obj/item/storage/box/glowstick/premium, + /obj/item/storage/box/glowstick/premium, + /obj/item/storage/box/glowstick/premium) + cost = 200 + containertype = /obj/structure/closet/crate + containername = "premium glowstick crate" + +/datum/supply_packs/emergency/flares + name = "Emergency Flare Crate" + contains = list(/obj/item/storage/box/flares, + /obj/item/storage/box/flares, + /obj/item/storage/box/flares) + cost = 150 + containertype = /obj/structure/closet/crate + containername = "emergency flare crate" + /datum/supply_packs/emergency/internals name = "Internals Crate" contains = list(/obj/item/clothing/mask/gas,