diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 9ca6f33e35e..2c874e2ca41 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -146,15 +146,36 @@ /datum/supply_pack/explorergear name="explorer gear" - contains = list( + contains = list ( /obj/item/device/cataloguer, - /obj/item/weapon/material/knife/machete, /obj/item/device/geiger, - /obj/item/device/gps/mining, /obj/item/clothing/suit/storage/hooded/explorer, /obj/item/device/flashlight/glowstick, /obj/item/stack/marker_beacon/thirty, + /obj/item/weapon/storage/belt/explorer, + /obj/item/clothing/mask/gas/explorer, + /obj/item/weapon/cartridge/explorer, + /obj/item/device/gps/explorer, + /obj/item/weapon/cartridge/explorer, + /obj/item/clothing/under/explorer, + /obj/item/device/radio/headset/explorer, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/accessory/holster/machete, ) - cost=10 + cost=25 containertype = /obj/structure/closet/crate/secure/xion - containername = "explorer equipment" \ No newline at end of file + containername = "explorer equipment" + +/datum/supply_pack/pilotgear + name= "pilot gear" + contains = list ( + /obj/item/device/radio/headset/pilot, + /obj/item/device/flashlight/glowstick, + /obj/item/stack/marker_beacon/thirty, + /obj/item/device/gps/explorer, + /obj/item/device/cataloguer/compact, + ) + cost=20 + containertype = /obj/structure/closet/crate/secure/xion + containername = "pilot equipment" + diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a7a5a67ad11..3dafea4ac78 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -452,14 +452,6 @@ 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.1 - brightness_on = 8 /obj/item/device/flashlight/slime gender = PLURAL diff --git a/code/game/objects/items/devices/flashlight_vr.dm b/code/game/objects/items/devices/flashlight_vr.dm new file mode 100644 index 00000000000..63ed6524b22 --- /dev/null +++ b/code/game/objects/items/devices/flashlight_vr.dm @@ -0,0 +1,8 @@ +/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.1 + brightness_on = 8 \ No newline at end of file diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 2e173c32a3e..987d444a506 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -43,7 +43,6 @@ 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 - Compact Catalouger", /obj/item/device/cataloguer/compact, 50), ) /obj/machinery/mineral/equipment_vendor/survey/Initialize(mapload) @@ -56,7 +55,6 @@ 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 Holdout Plus", /obj/item/weapon/gun/energy/locked/frontier/holdout/holdoutplus, 500), 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), @@ -69,8 +67,7 @@ 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/bluespace, 40), - EQUIPMENT ("Survival Equipment - Explorer Headset", /obj/item/device/radio/headset/explorer, 40), - EQUIPMENT ("Survival Equipment - Deluxe Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe, 100), + EQUIPMENT ("Survival Equipment - Modular Explorer Suit",/obj/item/clothing/suit/armor/pcarrier/explorer, 150), ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), diff --git a/vorestation.dme b/vorestation.dme index f5938321638..8c5fed0b1a8 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1159,6 +1159,7 @@ #include "code\game\objects\items\devices\flash.dm" #include "code\game\objects\items\devices\flash_vr.dm" #include "code\game\objects\items\devices\flashlight.dm" +#include "code\game\objects\items\devices\flashlight_vr.dm" #include "code\game\objects\items\devices\floor_painter.dm" #include "code\game\objects\items\devices\geiger.dm" #include "code\game\objects\items\devices\gps.dm"