cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10409 from TheDavestDave/master

Browse Source 
explo vender stuff
This commit is contained in:
Novacat
2021-06-01 10:58:13 -04:00
committed by Chompstation Bot
parent 151d317f5c
commit 08180ba0f1
7 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
code/datums/supplypacks/supply.dm
View File

@@ -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

3
code/game/objects/items/devices/flashlight.dm
View File

@@ -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,7 @@
icon_state = "glowstick_yellow"
item_state = "glowstick_yellow"
/obj/item/device/flashlight/slime
gender = PLURAL
name = "glowing slime extract"

8
code/game/objects/items/devices/flashlight_vr.dm Normal file
View File

@@ -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

7
code/modules/clothing/suits/armor_vr.dm
View File

@@ -118,4 +118,9 @@
name = "bedevere's costume armor"
desc = "ye olde knight, risen again."
icon_state = "bedevere"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
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."

12
code/modules/clothing/suits/hooded_vr.dm
View File

@@ -23,19 +23,19 @@
armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 2
action_button_name = "Toggle Knight Headgear"
/obj/item/clothing/suit/storage/hooded/knight/galahad
name = "crusader's armor"
desc = "ye olde knight, risen again."
icon_state = "galahad"
hoodtype = /obj/item/clothing/head/hood/galahad
/obj/item/clothing/suit/storage/hooded/knight/lancelot
name = "crusader's armor"
desc = "ye olde knight, risen again."
icon_state = "lancelot"
hoodtype = /obj/item/clothing/head/hood/lancelot
/obj/item/clothing/suit/storage/hooded/knight/robin
name = "crusader's armor"
desc = "ye olde knight, risen again. This one seems slightly faster than the rest, but weaker."
@@ -54,15 +54,15 @@
icon_override = 'icons/obj/clothing/knights_vr.dmi'
hoodtype = /obj/item/clothing/head/hood/galahad_costume
action_button_name = "Toggle Knight Headgear"
/obj/item/clothing/suit/storage/hooded/knight_costume/galahad
icon_state = "galahad"
hoodtype = /obj/item/clothing/head/hood/galahad_costume
/obj/item/clothing/suit/storage/hooded/knight_costume/lancelot
icon_state = "lancelot"
hoodtype = /obj/item/clothing/head/hood/lancelot_costume
/obj/item/clothing/suit/storage/hooded/knight_costume/robin
name = "crusader's armor"
desc = "ye olde knight, risen again. This one seems slightly faster than the rest, but weaker."

5
code/modules/mining/ore_redemption_machine/survey_vendor.dm
View File

@@ -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),

1
vorestation.dme
View File

@@ -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"