Skip to content

Explorer Transfers #13384

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.

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

Merged
merged 8 commits into from
Jun 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#define JOB_CLOWN (1<<11)
#define JOB_MIME (1<<12)
#define JOB_CIVILIAN (1<<13)

#define JOB_EXPLORER (1<<14)

#define JOBCAT_KARMA (1<<3)

Expand Down
1 change: 1 addition & 0 deletions code/game/jobs/job/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

var/disabilities_allowed = 1
var/transfer_allowed = TRUE // If false, ID computer will always discourage transfers to this job, even if player is eligible
var/hidden_from_job_prefs = FALSE // if true, job preferences screen never shows this job.

var/admin_only = 0
var/spawn_ert = 0
Expand Down
21 changes: 21 additions & 0 deletions code/game/jobs/job/support.dm
Original file line number Diff line number Diff line change
Expand Up @@ -450,3 +450,24 @@
/obj/item/storage/box/lip_stick = 1,
/obj/item/storage/box/barber = 1
)

/datum/job/explorer
title = "Explorer"
flag = JOB_EXPLORER
department_flag = JOBCAT_SUPPORT
total_positions = 0
spawn_positions = 0
supervisors = "the head of personnel"
selection_color = "#dddddd"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
outfit = /datum/outfit/job/explorer
hidden_from_job_prefs = TRUE

/datum/outfit/job/explorer
// This outfit is never used, because there are no slots for this job.
// To get it, you have to go to the HOP and ask for a transfer to it.
name = "Explorer"
jobtype = /datum/job/explorer
uniform = /obj/item/clothing/under/color/random
shoes = /obj/item/clothing/shoes/black
3 changes: 2 additions & 1 deletion code/game/jobs/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ GLOBAL_LIST_INIT(support_positions, list(
"Barber",
"Magistrate",
"Nanotrasen Representative",
"Blueshield"
"Blueshield",
"Explorer"
))

GLOBAL_LIST_INIT(supply_positions, list(
Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/computer/card.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/job/ntnavyofficer,
/datum/job/ntspecops,
/datum/job/civilian,
/datum/job/syndicateofficer
/datum/job/syndicateofficer,
/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
)
// Jobs that appear in the list, and you can prioritize, but not open/close slots for
var/list/blacklisted_partial = list(
Expand Down
3 changes: 3 additions & 0 deletions code/modules/client/preference/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,9 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if(job.admin_only)
continue

if(job.hidden_from_job_prefs)
continue

index += 1
if((index >= limit) || (job.title in splitJobs))
if((index < limit) && (lastJob != null))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
/datum/job/ntnavyofficer,
/datum/job/ntspecops,
/datum/job/civilian,
/datum/job/syndicateofficer
/datum/job/syndicateofficer,
/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
)

//The scaling factor of max total positions in relation to the total amount of people on board the station in %
Expand Down
Binary file modified icons/mob/hud.dmi
Binary file not shown.