diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4d006f162f1..ab3a608b5d9 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -27,7 +27,7 @@ power_usage = brightness_levels[brightness_level] else verbs -= /obj/item/device/flashlight/verb/toggle - + update_icon() /obj/item/device/flashlight/Destroy() @@ -452,6 +452,15 @@ icon_state = "glowstick_yellow" item_state = "glowstick_yellow" +/obj/item/device/flashlight/glowstick/bluespace + name = "bluespace glowstick" + desc = "A bluespace powered glowstick. Escaping particles light up the area far brighter on similar levels to flares and for far longer" + flashlight_colour = "#599DFF" + icon_state = "glowstick_blue" + item_state = "glowstick_blue" + flashlight_power = 0 + brightness_on = 8 + /obj/item/device/flashlight/slime gender = PLURAL name = "glowing slime extract" diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index db40ea46499..0effc83415a 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -43,6 +43,7 @@ new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 100), new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/weapon/material/knife/machete, 50), new /datum/data/mining_equipment("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75) + new /datum/data/mining_equipment("Survey Tools-catalouger", /obj/item/device/cataloguer 50) ) /obj/machinery/mineral/equipment_vendor/survey/Initialize(mapload) @@ -55,6 +56,8 @@ EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), + EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 500), + EQUIPMENT("Defense Equipment - Frontier Holdout", /obj/item/weapon/gun/energy/locked/frontier/holdout, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100), EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750), @@ -64,6 +67,11 @@ EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 250), EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), + EQUIPMENT "Survival Equipment- Glowstick", /obj/item/device/flashlight/glowstick, 10), + EQUIPMENT "Survival Equipment- flare", /obj/item/device/flashlight/flare, 20), + EQUIPMENT "Survival Equipment- bluespace glowstick", /obj/item/device/flashlight/glowstick, 40), + EQUIPMENT "Survival Equipment- explorer headsret", /obj/item/device/radio/headset/explorer, 40), + EQUIPMENT "Survival Equipment- explorer suit", /obj/item/clothing/suit/storage/hooded/explorer 40), ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),