diff --git a/maps/torch/job/misc_jobs.dm b/maps/torch/job/misc_jobs.dm index 4cef89f23441a..c53d4de0afb69 100644 --- a/maps/torch/job/misc_jobs.dm +++ b/maps/torch/job/misc_jobs.dm @@ -13,8 +13,8 @@ Synthetic /datum/job/ai minimal_player_age = 7 - total_positions = 0 - spawn_positions = 0 + total_positions = 1 + spawn_positions = 1 allowed_ranks = list( /datum/mil_rank/civ/synthetic ) diff --git a/mods/_fd/fd_assets/_fd_assets.dme b/mods/_fd/fd_assets/_fd_assets.dme index 2102359502026..cb2d8cf258bcc 100644 --- a/mods/_fd/fd_assets/_fd_assets.dme +++ b/mods/_fd/fd_assets/_fd_assets.dme @@ -47,12 +47,16 @@ #include "code/weapons/rsh21.dm" #include "code/weapons/sledgehammer.dm" -#include "code/chief_steward.dm" +#include "code/jobs/chief_steward.dm" +#include "code/jobs/research_guard.dm" +#include "code/jobs/pathfinder.dm" +#include "code/jobs/research_director.dm" +#include "code/jobs/passenger.dm" + #include "code/fd_sofa_override.dm" #include "code/floor_decals.dm" #include "code/fullscreen.dm" #include "code/loadout.dm" -#include "code/research_guard.dm" #include "code/skills.dm" #include "code/~TO_MAKE.dm" diff --git a/mods/_fd/fd_assets/code/chief_steward.dm b/mods/_fd/fd_assets/code/jobs/chief_steward.dm similarity index 73% rename from mods/_fd/fd_assets/code/chief_steward.dm rename to mods/_fd/fd_assets/code/jobs/chief_steward.dm index 77bb12190804f..f9bc3818f5d24 100644 --- a/mods/_fd/fd_assets/code/chief_steward.dm +++ b/mods/_fd/fd_assets/code/jobs/chief_steward.dm @@ -33,3 +33,19 @@ /obj/item/device/radio/headset/headset_chief_steward, /obj/item/device/radio/headset/headset_chief_steward/alt, ) + + +// Getting MrMeat + +/datum/job/chief_steward + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/service/cook, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/service/chief_steward/fleet + ) + allowed_ranks = list( + /datum/mil_rank/civ/contractor, + /datum/mil_rank/ec/e7, + /datum/mil_rank/fleet/e7, + /datum/mil_rank/fleet/e6 + ) diff --git a/mods/_fd/fd_assets/code/jobs/passenger.dm b/mods/_fd/fd_assets/code/jobs/passenger.dm new file mode 100644 index 0000000000000..b2b022d8f5ccf --- /dev/null +++ b/mods/_fd/fd_assets/code/jobs/passenger.dm @@ -0,0 +1,14 @@ +/datum/job/assistant + alt_titles = list( + "Journalist" = /singleton/hierarchy/outfit/job/torch/passenger/passenger/journalist, + "Historian", + "Botanist", + "Investor" = /singleton/hierarchy/outfit/job/torch/passenger/passenger/investor, + "Naturalist", + "Ecologist", + "Entertainer", + "Independent Observer", + "Sociologist", + "Trainer", + "Off-Duty" + ) diff --git a/mods/_fd/fd_assets/code/jobs/pathfinder.dm b/mods/_fd/fd_assets/code/jobs/pathfinder.dm new file mode 100644 index 0000000000000..ce6c7db151b2c --- /dev/null +++ b/mods/_fd/fd_assets/code/jobs/pathfinder.dm @@ -0,0 +1,5 @@ +/datum/job/pathfinder + allowed_ranks = list( + /datum/mil_rank/ec/o1, + /datum/mil_rank/ec/o3 + ) diff --git a/mods/_fd/fd_assets/code/jobs/research_director.dm b/mods/_fd/fd_assets/code/jobs/research_director.dm new file mode 100644 index 0000000000000..ff51ff1cddd20 --- /dev/null +++ b/mods/_fd/fd_assets/code/jobs/research_director.dm @@ -0,0 +1,5 @@ +/datum/job/rd + allowed_ranks = list( + /datum/mil_rank/ec/o3, + /datum/mil_rank/ec/o5 + ) diff --git a/mods/_fd/fd_assets/code/research_guard.dm b/mods/_fd/fd_assets/code/jobs/research_guard.dm similarity index 100% rename from mods/_fd/fd_assets/code/research_guard.dm rename to mods/_fd/fd_assets/code/jobs/research_guard.dm