Merge pull request #10409 from TheDavestDave/master

explo vender stuff

code/datums/supplypacks/supply.dm

@@ -143,3 +143,53 @@
 	cost = 15
 	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Cargo Train Trolley Crate"
+
+/datum/supply_pack/explorergear
+	name="Explorer gear"
+	contains = list (
+					/obj/item/device/cataloguer,
+					/obj/item/device/geiger,
+					/obj/item/clothing/suit/storage/hooded/explorer,
+					/obj/item/device/flashlight/glowstick,
+					/obj/item/device/flashlight,
+					/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/clothing/under/explorer,
+			 		/obj/item/device/radio/headset/explorer,
+			 		/obj/item/clothing/shoes/boots/winter/explorer,
+					/obj/item/weapon/material/knife/tacknife/survival,
+					/obj/item/weapon/material/knife/machete,
+			 		/obj/item/clothing/accessory/holster/machete,
+					)
+	cost=25
+	containertype = /obj/structure/closet/crate/secure/xion
+	containername = "Explorer equipment"
+	access = access_explorer
+
+/datum/supply_pack/pilotgear
+	name= "Pilot gear"
+	contains = list (
+					/obj/item/weapon/storage/backpack/parachute,
+					/obj/item/device/radio/headset/pilot,
+					/obj/item/device/radio/headset/pilot/alt,
+					/obj/item/clothing/mask/gas/half,
+					/obj/item/device/flashlight/glowstick,
+					/obj/item/stack/marker_beacon/thirty,
+					/obj/item/device/gps/explorer,
+					/obj/item/clothing/gloves/fingerless,
+					/obj/item/device/cataloguer/compact,
+					/obj/item/clothing/suit/storage/toggle/bomber/pilot,
+			 		/obj/item/clothing/shoes/boots/winter/explorer,
+					/obj/item/device/flashlight,
+					/obj/item/weapon/material/knife/tacknife/survival,
+					/obj/item/clothing/head/pilot_vr,
+					/obj/item/clothing/under/rank/pilot1,
+					)
+	cost=20
+	containertype = /obj/structure/closet/crate/secure/xion
+	containername = "Pilot equipment"
+	access = access_pilot
+

code/game/objects/items/devices/flashlight.dm

@@ -452,6 +452,7 @@
 	icon_state = "glowstick_yellow"
 	item_state = "glowstick_yellow"
 
+
 /obj/item/device/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"

code/game/objects/items/devices/flashlight_vr.dm

@@ -0,0 +1,8 @@
+/obj/item/device/flashlight/glowstick/radioisotope
+	name = "radioisotope glowstick"
+	desc = "A radioisotope powered glowstick. Escaping particles light up the area far brighter on similar levels to flares and for longer"
+	flashlight_colour = "#599DFF"
+	icon_state = "glowstick_blue"
+	item_state = "glowstick_blue"
+	flashlight_power = 0.1
+	brightness_on = 8

code/modules/clothing/suits/armor_vr.dm

@@ -119,3 +119,8 @@
 	desc = "ye olde knight, risen again."
 	icon_state = "bedevere"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+//deluixe explorer suit
+	/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
+	name = "modular explorer suit"
+	desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates."

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -64,6 +64,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,								5),
+		EQUIPMENT("Survival Equipment - Flare", 				/obj/item/device/flashlight/flare,									5),
+		EQUIPMENT("Survival Equipment - Radioisotope Glowstick",		/obj/item/device/flashlight/glowstick/radioisotope,					40),
+		EQUIPMENT("Survival Equipment - Modular Explorer Suit",		/obj/item/clothing/suit/armor/pcarrier/explorer,					200),
+		EQUIPMENT("Survival Equipment - Armored Jumpsuit",		/obj/item/clothing/under/explorer/armored,					200),
 	)
 	prize_list["Consumables"] = list(
 		EQUIPMENT("1 Marker Beacon",		/obj/item/stack/marker_beacon,													1),

vorestation.dme

@@ -1214,6 +1214,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"