cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes some things on ascian's request

Browse Source 
faster cranking holdout is out the vender until I can make a decent sprite for it
This commit is contained in:
TheDavestDave
2021-06-01 14:36:38 +01:00
parent 67f7bdde1f
commit c1da12592e
5 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/supply.dm
+26 -5
View File
@@ -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"
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"
code/game/objects/items/devices/flashlight.dm
-8
View File
@@ -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
code/game/objects/items/devices/flashlight_vr.dm
+8
View File
@@ -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
code/modules/mining/ore_redemption_machine/survey_vendor.dm
+1 -4
View File
@@ -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),
vorestation.dme
+1
View File
@@ -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"