diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 409e91b87e3b..c09cdb19e4f6 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -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." diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 7f69d7537142..496458dd1606 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -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())) diff --git a/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm b/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm index dbc52a1dd22b..8aef5545e9ab 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm @@ -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 diff --git a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm index b53100c4acf7..9b504c472a72 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm @@ -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 @@ -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 diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 33fc59f198c4..9a0796badbc5 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -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