cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redemption Machine Changes

Browse Source 
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
This commit is contained in:
Unknown
2019-08-21 20:17:39 -04:00
parent 775d175b11
commit a7bc6b858d
9 changed files with 48 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/catalogue/cataloguer.dm
View File

@@ -319,6 +319,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers)
if(points_stored)
ID.survey_points += points_stored
points_stored = 0
to_chat(user, "<span class='notice'>You swipe the id over \the [src].</span>")
else
to_chat(user, "<span class='notice'>\The [src] has no points available.</span>")
busy = FALSE

12
code/modules/catalogue/rewards/construction.dm
View File

@@ -1,12 +0,0 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/weapon/circuitboard/exploration_equipment_vendor
name = T_BOARD("Exploration Equipment Vendor")
board_type = new /datum/frame/frame_types/machine
build_path = /obj/machinery/equipment_vendor/exploration
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 2)
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 3)

177
code/modules/catalogue/rewards/equipment_vendor.dm
View File

@@ -1,177 +0,0 @@
/**********************Exploration Equipment Vendor**************************/
/obj/machinery/equipment_vendor/exploration
name = "exploration equipment vendor"
desc = "An equipment vendor for explorers, points collected with cataloguers can be spent here."
icon = 'icons/obj/machines/mining_machines_vr.dmi'
icon_state = "exploration"
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/exploration_equipment_vendor
var/icon_deny = "exploration-deny"
var/icon_vend = "exploration-vend"
var/obj/item/device/cataloguer/inserted_cataloguer
var/list/prize_list = list(
new /datum/data/exploration_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
new /datum/data/exploration_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
new /datum/data/exploration_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
new /datum/data/exploration_equipment("GPS Device", /obj/item/device/gps/explorer, 10),
new /datum/data/exploration_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 10),
new /datum/data/exploration_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 10),
new /datum/data/exploration_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/exploration_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 20),
new /datum/data/exploration_equipment("Laser Pointer", /obj/item/device/laser_pointer, 90),
new /datum/data/exploration_equipment("Plush Toy", /obj/random/plushie, 30),
new /datum/data/exploration_equipment("Shelter Capsule", /obj/item/device/survivalcapsule, 50),
new /datum/data/exploration_equipment("Point Transfer Card", /obj/item/weapon/card/exploration_point_card, 50),
new /datum/data/exploration_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 50),
new /datum/data/exploration_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50),
new /datum/data/exploration_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 50),
new /datum/data/exploration_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50),
new /datum/data/exploration_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
new /datum/data/exploration_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),
new /datum/data/exploration_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 100),
new /datum/data/exploration_equipment("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120),
new /datum/data/exploration_equipment("Space Cash", /obj/item/weapon/spacecash/c100, 100),
new /datum/data/exploration_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 250),
new /datum/data/exploration_equipment("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 310),
new /datum/data/exploration_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb, 10),
new /datum/data/exploration_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100),
new /datum/data/exploration_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 150),
new /datum/data/exploration_equipment("Fishing Net", /obj/item/weapon/material/fishing_net, 50),
new /datum/data/exploration_equipment("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100),
new /datum/data/exploration_equipment("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750)
)
/datum/data/exploration_equipment
var/equipment_name = "generic"
var/equipment_path = null
var/cost = 0
/datum/data/exploration_equipment/New(name, path, cost)
src.equipment_name = name
src.equipment_path = path
src.cost = cost
/obj/machinery/equipment_vendor/exploration/power_change()
var/old_stat = stat
..()
if(old_stat != stat)
update_icon()
if(inserted_cataloguer && !powered())
visible_message("<span class='notice'>The cataloguer slot indicator light flickers on \the [src] as it spits out the device before powering down.</span>")
inserted_cataloguer.forceMove(get_turf(src))
/obj/machinery/equipment_vendor/exploration/update_icon()
if(panel_open)
icon_state = "[initial(icon_state)]-open"
else if(powered())
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)]-off"
/obj/machinery/equipment_vendor/exploration/attack_hand(mob/user)
if(..())
return
interact(user)
/obj/machinery/equipment_vendor/exploration/attack_ghost(mob/user)
interact(user)
/obj/machinery/equipment_vendor/exploration/interact(mob/user)
user.set_machine(src)
var/dat
dat +="<div class='statusDisplay'>"
if(istype(inserted_cataloguer))
dat += "You have [inserted_cataloguer.points_stored] exploration points collected. <A href='?src=\ref[src];choice=eject'>Eject Cataloguer.</A><br>"
else
dat += "No Cataloguer inserted. <A href='?src=\ref[src];choice=insert'>Insert Cataloguer.</A><br>"
dat += "</div>"
dat += "<br><b>Equipment point cost list:</b><BR><table border='0' width='100%'>"
for(var/datum/data/exploration_equipment/prize in prize_list)
dat += "<tr><td>[prize.equipment_name]</td><td>[prize.cost]</td><td><A href='?src=\ref[src];purchase=\ref[prize]'>Purchase</A></td></tr>"
dat += "</table>"
var/datum/browser/popup = new(user, "miningvendor", "Exploration Equipment Vendor", 400, 600)
popup.set_content(dat)
popup.open()
/obj/machinery/equipment_vendor/exploration/Topic(href, href_list)
if(..())
return 1
if(href_list["choice"])
if(istype(inserted_cataloguer))
if(href_list["choice"] == "eject")
to_chat(usr, "<span class='notice'>You eject the ID from [src]'s card slot.</span>")
usr.put_in_hands(inserted_cataloguer)
inserted_cataloguer = null
else if(href_list["choice"] == "insert")
var/obj/item/device/cataloguer/C = usr.get_active_hand()
if(istype(C) && !inserted_cataloguer && usr.unEquip(C))
C.forceMove(src)
inserted_cataloguer = C
interact(usr)
to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
else
to_chat(usr, "<span class='warning'>No valid ID.</span>")
flick(icon_deny, src)
if(href_list["purchase"])
if(istype(inserted_cataloguer))
var/datum/data/exploration_equipment/prize = locate(href_list["purchase"])
if (!prize || !(prize in prize_list))
to_chat(usr, "<span class='warning'>Error: Invalid choice!</span>")
flick(icon_deny, src)
return
if(prize.cost > inserted_cataloguer.points_stored)
to_chat(usr, "<span class='warning'>Error: Insufficent points for [prize.equipment_name]!</span>")
flick(icon_deny, src)
else
inserted_cataloguer.points_stored -= prize.cost
to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
flick(icon_vend, src)
new prize.equipment_path(drop_location())
else
to_chat(usr, "<span class='warning'>Error: Please insert a valid ID!</span>")
flick(icon_deny, src)
updateUsrDialog()
/obj/machinery/equipment_vendor/exploration/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, I))
updateUsrDialog()
return
if(default_part_replacement(user, I))
return
if(default_deconstruction_crowbar(user, I))
return
if(istype(I,/obj/item/device/cataloguer))
if(!powered())
return
else if(!inserted_cataloguer && user.unEquip(I))
I.forceMove(src)
inserted_cataloguer = I
interact(user)
return
..()
/obj/machinery/equipment_vendor/exploration/dismantle()
if(inserted_cataloguer)
inserted_cataloguer.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
. = ..()
/obj/machinery/equipment_vendor/exploration/proc/new_prize(var/name, var/path, var/cost) // Generic proc for adding new entries. Good for abusing for FUN and PROFIT.
if(!cost)
cost = 100
if(!path)
path = /obj/item/stack/marker_beacon
if(!name)
name = "Generic Entry"
prize_list += new /datum/data/exploration_equipment(name, path, cost)
/obj/machinery/equipment_vendor/exploration/ex_act(severity, target)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
if(prob(50 / severity) && severity < 3)
qdel(src)

23
code/modules/catalogue/rewards/exp_point_items.dm
View File

@@ -1,23 +0,0 @@
/obj/item/weapon/card/exploration_point_card
name = "exploration point card"
desc = "A small card preloaded with exploration points. Swipe your Cataloguer over it to transfer the points, then discard."
icon_state = "data"
var/points = 50
/obj/item/weapon/card/exploration_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/cataloguer))
if(points)
var/obj/item/device/cataloguer/C = I
C.points_stored += points
to_chat(user, "<span class='info'>You transfer [points] points to [C].</span>")
points = 0
else
to_chat(user, "<span class='info'>There's no points left on [src].</span>")
..()
/obj/item/weapon/card/exploration_point_card/examine(mob/user)
..(user)
to_chat(user, "There's [points] points on the card.")
/obj/item/weapon/card/exploration_point_card/can_catalogue(mob/user)
return FALSE

9
code/modules/mining/ore_redemption_machine/construction.dm
View File

@@ -10,3 +10,12 @@
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 3)
/obj/item/weapon/circuitboard/exploration_equipment_vendor
name = T_BOARD("Exploration Equipment Vendor")
board_type = new /datum/frame/frame_types/machine
build_path = /obj/machinery/mineral/equipment_vendor/survey
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 2)
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/matter_bin = 3)

4
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -10,7 +10,7 @@
circuit = /obj/item/weapon/circuitboard/mining_equipment_vendor
var/icon_deny = "mining-deny"
var/obj/item/weapon/card/id/inserted_id
//VOREStation Edit - Heavily modified list
//VOREStation Edit Start - Heavily modified list
var/list/prize_list = list(
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
@@ -35,7 +35,7 @@
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900),
new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 900),
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1200),
// new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200),
// new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c100, 1000),
new /datum/data/mining_equipment("Hardsuit - Control Module", /obj/item/weapon/rig/industrial, 2000),

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

@@ -1,47 +1,56 @@
/obj/machinery/mineral/equipment_vendor/survey
name = "exploration equipment vendor"
desc = "An equipment vendor for explorers, points collected with a survey scanner can be spent here."
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "explore"
icon = 'icons/obj/machines/mining_machines_vr.dmi' //VOREStation Edit
icon_state = "exploration" //VOREStation Edit
density = TRUE
anchored = TRUE
circuit = /obj/item/weapon/circuitboard/mining_equipment_vendor
icon_deny = "explore-deny"
circuit = /obj/item/weapon/circuitboard/exploration_equipment_vendor
icon_deny = "exploration-deny" //VOREStation Edit
var/icon_vend = "exploration-vend" //VOREStation Add
//VOREStation Edit Start - Heavily modified list
prize_list = list(
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 120),
new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment("GPS Device", /obj/item/device/gps/explorer, 10),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 10),
new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 10),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 20),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 90),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/device/geiger, 75),
new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 30),
new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
new /datum/data/mining_equipment("Extraction Equipment - Fulton Beacon", /obj/item/fulton_core, 300),
new /datum/data/mining_equipment("Extraction Equipment - Fulton Pack", /obj/item/extraction_pack, 125),
new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/device/survivalcapsule, 50),
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50),
new /datum/data/mining_equipment("Fishing Net", /obj/item/weapon/material/fishing_net, 50),
new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100),
new /datum/data/mining_equipment("Direct Payment - 1000", /obj/item/weapon/spacecash/c1000, 500),
new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 500),
new /datum/data/mining_equipment("Survey Tools - Shovel", /obj/item/weapon/shovel, 40),
new /datum/data/mining_equipment("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 50),
new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 100),
new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 300),
new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 50),
new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50),
new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 50),
new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 250),
new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50),
new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),
new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 100),
new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/weapon/gun/energy/phasegun/pistol, 30),
new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb, 100),
new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station, 200),
new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 300),
new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/weapon/material/knife/machete, 75)
new /datum/data/mining_equipment("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120),
new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c100, 100),
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 250),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 310),
new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 300),
new /datum/data/mining_equipment("Survey Tools - Shovel", /obj/item/weapon/shovel, 40),
new /datum/data/mining_equipment("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 50),
new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb, 10),
new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100),
new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 150),
new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/weapon/material/knife/machete, 75),
new /datum/data/mining_equipment("Fishing Net", /obj/item/weapon/material/fishing_net, 50),
new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100),
new /datum/data/mining_equipment("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750)
)
//VOREStation Edit End
/obj/machinery/mineral/equipment_vendor/explorer/interact(mob/user)
/obj/machinery/mineral/equipment_vendor/survey/interact(mob/user)
user.set_machine(src)
var/dat
@@ -59,7 +68,7 @@
popup.set_content(dat)
popup.open()
/obj/machinery/mineral/equipment_vendor/explorer/Topic(href, href_list)
/obj/machinery/mineral/equipment_vendor/survey/Topic(href, href_list)
if(..())
return 1
@@ -93,6 +102,7 @@
else
inserted_id.survey_points -= prize.cost
to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
flick(icon_vend, src) //VOREStation Add
new prize.equipment_path(drop_location())
else
to_chat(usr, "<span class='warning'>Error: Please insert a valid ID!</span>")

2
maps/tether/tether-06-station2.dmm
View File

@@ -19549,7 +19549,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
/obj/machinery/equipment_vendor/exploration,
/obj/machinery/mineral/equipment_vendor/survey,
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"Ei" = (

4
vorestation.dme
View File

@@ -1534,9 +1534,6 @@
#include "code\modules\catalogue\catalogue_data_vr.dm"
#include "code\modules\catalogue\cataloguer.dm"
#include "code\modules\catalogue\cataloguer_visuals.dm"
#include "code\modules\catalogue\rewards\construction.dm"
#include "code\modules\catalogue\rewards\equipment_vendor.dm"
#include "code\modules\catalogue\rewards\exp_point_items.dm"
#include "code\modules\client\client defines.dm"
#include "code\modules\client\client procs.dm"
#include "code\modules\client\movement.dm"
@@ -2062,6 +2059,7 @@
#include "code\modules\mining\drilling\drill.dm"
#include "code\modules\mining\drilling\scanner.dm"
#include "code\modules\mining\ore_redemption_machine\construction.dm"
#include "code\modules\mining\ore_redemption_machine\construction_vr.dm"
#include "code\modules\mining\ore_redemption_machine\equipment_vendor.dm"
#include "code\modules\mining\ore_redemption_machine\mine_point_items.dm"
#include "code\modules\mining\ore_redemption_machine\survey_vendor.dm"