Skip to content

Blocks Explorer from Planetary Maps + Mining Order Console Additions #6648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Blocks Explorer from Planetary Maps + Mining Order Console Additions #6648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3461d46
blocks explorer from being an eligible job on planetary maps + mining…
May 11, 2025
4c9736f
Merge branch 'master' into NK-explorer-fix-up
Absolucy May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define JOB_UNAVAILABLE_ANTAG_INCOMPAT 6
/// Job unavailable due to insufficient donor rank.
#define JOB_UNAVAILABLE_DONOR_RANK 7 //MONKESTATION EDIT
#define JOB_UNAVAILABLE_PLANETARY_MAP 8

/// Used when the `get_job_unavailable_error_message` proc can't make sense of a given code.
#define GENERIC_JOB_UNAVAILABLE_ERROR "Error: Unknown job availability."
Expand Down
4 changes: 4 additions & 0 deletions code/controllers/subsystem/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,10 @@ SUBSYSTEM_DEF(job)
JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_PLAYTIME, possible_job.title)], Player: [player], MissingTime: [required_playtime_remaining][add_job_to_log ? ", Job: [possible_job]" : ""]")
return JOB_UNAVAILABLE_PLAYTIME

if(SSmapping.is_planetary() && possible_job.title == JOB_LATEJOIN_EXPLORER)
JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_PLANETARY_MAP, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
return JOB_UNAVAILABLE_PLANETARY_MAP

//MONKESTATION EDIT START
// Job is for donators of a specific level and fail if they did not meet the requirements.
if(((possible_job in holiday_restricted) || !isnull(possible_job.job_req_donor)) && (!is_admin(player.client) || !player.client?.is_mentor()))
Expand Down
8 changes: 6 additions & 2 deletions code/game/machinery/computer/orders/order_items/mining/order_consumables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
item_path = /obj/item/reagent_containers/hypospray/medipen/survival/luxury
cost_per_order = 1000

/datum/orderable_item/consumables/medkit
/datum/orderable_item/consumables/medkit_brute
item_path = /obj/item/storage/medkit/brute
cost_per_order = 600

/datum/orderable_item/consumables/medkit_fire
item_path = /obj/item/storage/medkit/fire
desc = "For emergency magmatic burn relief."
cost_per_order = 700
cost_per_order = 600

/datum/orderable_item/consumables/medkit_basic
item_path = /obj/item/storage/medkit/regular
cost_per_order = 400

/datum/orderable_item/consumables/whiskey
item_path = /obj/item/reagent_containers/cup/glass/bottle/whiskey
Expand Down
8 changes: 8 additions & 0 deletions code/game/machinery/computer/orders/order_items/mining/order_mining.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
item_path = /obj/item/t_scanner/adv_mining_scanner
cost_per_order = 800

/datum/orderable_item/mining/advanced_gps
item_path = /obj/item/gps/advanced
cost_per_order = 500

/datum/orderable_item/mining/fulton
item_path = /obj/item/extraction_pack
cost_per_order = 1000
Expand Down Expand Up @@ -121,3 +125,7 @@
/datum/orderable_item/mining/style_meter
item_path = /obj/item/style_meter
cost_per_order = 1500

/datum/orderable_item/mining/eva_kit
item_path = /obj/item/storage/box/emergency_eva/explorer
cost_per_order = 1000
2 changes: 2 additions & 0 deletions code/modules/mob/dead/new_player/new_player.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
return "[jobtitle] is not compatible with some antagonist role assigned to you."
if(JOB_UNAVAILABLE_DONOR_RANK) //MONKESTATION EDIT
return "The [jobtitle] job requires a higher donator rank than you have or it is out of season. Go to to https://www.patreon.com/dukeook \"Duke of Ook's Monke Content Creation Fund\" to learn more."
if(JOB_UNAVAILABLE_PLANETARY_MAP)
return "[jobtitle] is not compatible with the current map."

return GENERIC_JOB_UNAVAILABLE_ERROR

Expand Down
Loading