From 8e1cbb68cae92205452994e117a14bdf7eb7efb2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 29 Sep 2017 23:44:23 -0500 Subject: [PATCH] Update assistant.dm --- code/modules/jobs/job_types/assistant.dm | 45 ------------------------ 1 file changed, 45 deletions(-) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 6c8b050394..26d57d1e76 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -1,47 +1,3 @@ -<<<<<<< HEAD -/* -Assistant -*/ -/datum/job/assistant - title = "Assistant" - flag = ASSISTANT - department_flag = CIVILIAN - faction = "Station" - total_positions = -1 - spawn_positions = -1 - supervisors = "absolutely everyone" - selection_color = "#dddddd" - access = list() //See /datum/job/assistant/get_access() - minimal_access = list() //See /datum/job/assistant/get_access() - outfit = /datum/outfit/job/assistant - - -/datum/job/assistant/get_access() - if((config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) || !config.jobs_have_minimal_access) //Config has assistant maint access set - . = ..() - . |= list(ACCESS_MAINT_TUNNELS) - else - return ..() - -/datum/job/assistant/config_check() - if(config && !(config.assistant_cap == 0)) - total_positions = config.assistant_cap - spawn_positions = config.assistant_cap - return 1 - return 0 - - -/datum/outfit/job/assistant - name = "Assistant" - jobtype = /datum/job/assistant - -/datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/H) - ..() - if (config.grey_assistants) - uniform = /obj/item/clothing/under/color/grey - else - uniform = /obj/item/clothing/under/color/random -======= /* Assistant */ @@ -85,4 +41,3 @@ Assistant uniform = /obj/item/clothing/under/color/grey else uniform = /obj/item/clothing/under/color/random ->>>>>>> 4178c20... Configuration datum refactor (#30763)