From c9e8478f249e28b45adaa5ef6dfd5ab7d21be3f9 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 22 Mar 2018 19:50:40 -0500 Subject: [PATCH] reee --- code/modules/jobs/job_types/captain.dm | 6 +++--- code/modules/jobs/job_types/engineering.dm | 2 +- code/modules/jobs/job_types/medical.dm | 2 +- code/modules/jobs/job_types/science.dm | 2 +- code/modules/jobs/job_types/security.dm | 2 +- modular_citadel/code/modules/jobs/job_types/captain.dm | 6 +++++- modular_citadel/code/modules/jobs/job_types/engineering.dm | 3 +++ modular_citadel/code/modules/jobs/job_types/medical.dm | 2 ++ modular_citadel/code/modules/jobs/job_types/science.dm | 2 ++ modular_citadel/code/modules/jobs/job_types/security.dm | 3 +++ tgstation.dme | 2 ++ 11 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 modular_citadel/code/modules/jobs/job_types/medical.dm create mode 100644 modular_citadel/code/modules/jobs/job_types/science.dm diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 16365f96cf..906bd570b4 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -12,9 +12,9 @@ Captain supervisors = "Nanotrasen officials and Space law" selection_color = "#ccccff" req_admin_notify = 1 - minimal_player_age = 60 // CITADEL CHANGE to 60 + minimal_player_age = 14 exp_requirements = 180 - exp_type = EXP_TYPE_COMMAND //CITADEL CHANGE command experience needed + exp_type = EXP_TYPE_CREW antag_rep = 20 outfit = /datum/outfit/job/captain @@ -66,7 +66,7 @@ Head of Personnel supervisors = "the captain" selection_color = "#ddddff" req_admin_notify = 1 - minimal_player_age = 60 // CITADEL CHANGE to 60 + minimal_player_age = 10 exp_requirements = 180 exp_type = EXP_TYPE_CREW // exp_type_department = EXP_TYPE_SUPPLY - CITADEL CHANGE diff --git a/code/modules/jobs/job_types/engineering.dm b/code/modules/jobs/job_types/engineering.dm index 372df22113..064422bfba 100644 --- a/code/modules/jobs/job_types/engineering.dm +++ b/code/modules/jobs/job_types/engineering.dm @@ -13,7 +13,7 @@ Chief Engineer supervisors = "the captain" selection_color = "#ffeeaa" req_admin_notify = 1 - minimal_player_age = 30 // CITADEL CHANGE to 30 + minimal_player_age = 7 exp_requirements = 180 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_ENGINEERING diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 77da62951a..4da6568683 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -13,7 +13,7 @@ Chief Medical Officer supervisors = "the captain" selection_color = "#ffddf0" req_admin_notify = 1 - minimal_player_age = 30 // CITADEL CHANGE to 30 + minimal_player_age = 7 exp_requirements = 180 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_MEDICAL diff --git a/code/modules/jobs/job_types/science.dm b/code/modules/jobs/job_types/science.dm index d705ac3327..4fb1347208 100644 --- a/code/modules/jobs/job_types/science.dm +++ b/code/modules/jobs/job_types/science.dm @@ -13,7 +13,7 @@ Research Director supervisors = "the captain" selection_color = "#ffddff" req_admin_notify = 1 - minimal_player_age = 30 // CITADEL CHANGE to 30 + minimal_player_age = 7 exp_type_department = EXP_TYPE_SCIENCE exp_requirements = 180 exp_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index f6b253cb32..322922a779 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -19,7 +19,7 @@ Head of Security supervisors = "the captain" selection_color = "#ffdddd" req_admin_notify = 1 - minimal_player_age = 30 //CITADEL CHANGE to 30 + minimal_player_age = 14 exp_requirements = 300 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SECURITY diff --git a/modular_citadel/code/modules/jobs/job_types/captain.dm b/modular_citadel/code/modules/jobs/job_types/captain.dm index 9aa6ae824e..28abf2913f 100644 --- a/modular_citadel/code/modules/jobs/job_types/captain.dm +++ b/modular_citadel/code/modules/jobs/job_types/captain.dm @@ -1,5 +1,9 @@ -/datum/job/hop +/datum/job/captain + minimal_player_age = 60 + exp_type = EXP_TYPE_COMMAND +/datum/job/hop + minimal_player_age = 60 head_announce = list("Service") exp_type_department = EXP_TYPE_SERVICE diff --git a/modular_citadel/code/modules/jobs/job_types/engineering.dm b/modular_citadel/code/modules/jobs/job_types/engineering.dm index 2ba7a72a85..f199bbefea 100644 --- a/modular_citadel/code/modules/jobs/job_types/engineering.dm +++ b/modular_citadel/code/modules/jobs/job_types/engineering.dm @@ -1,3 +1,6 @@ +/datum/job/chief_engineer + minimal_player_age = 30 + /datum/job/engineer access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) diff --git a/modular_citadel/code/modules/jobs/job_types/medical.dm b/modular_citadel/code/modules/jobs/job_types/medical.dm new file mode 100644 index 0000000000..4574e7bb75 --- /dev/null +++ b/modular_citadel/code/modules/jobs/job_types/medical.dm @@ -0,0 +1,2 @@ +/datum/job/cmo + minimal_player_age = 30 \ No newline at end of file diff --git a/modular_citadel/code/modules/jobs/job_types/science.dm b/modular_citadel/code/modules/jobs/job_types/science.dm new file mode 100644 index 0000000000..a034ac9cd5 --- /dev/null +++ b/modular_citadel/code/modules/jobs/job_types/science.dm @@ -0,0 +1,2 @@ +/datum/outfit/job/warden + suit_store = /obj/item/gun/energy/pumpaction/defender \ No newline at end of file diff --git a/modular_citadel/code/modules/jobs/job_types/security.dm b/modular_citadel/code/modules/jobs/job_types/security.dm index a034ac9cd5..9e59d98d00 100644 --- a/modular_citadel/code/modules/jobs/job_types/security.dm +++ b/modular_citadel/code/modules/jobs/job_types/security.dm @@ -1,2 +1,5 @@ +/datum/job/hos + minimal_player_age = 30 + /datum/outfit/job/warden suit_store = /obj/item/gun/energy/pumpaction/defender \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 443d286b4d..15ba63df0e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2715,6 +2715,8 @@ #include "modular_citadel\code\modules\jobs\job_types\captain.dm" #include "modular_citadel\code\modules\jobs\job_types\cargo_service.dm" #include "modular_citadel\code\modules\jobs\job_types\engineering.dm" +#include "modular_citadel\code\modules\jobs\job_types\medical.dm" +#include "modular_citadel\code\modules\jobs\job_types\science.dm" #include "modular_citadel\code\modules\jobs\job_types\security.dm" #include "modular_citadel\code\modules\keybindings\bindings_carbon.dm" #include "modular_citadel\code\modules\keybindings\bindings_human.dm"