Update assistant.dm

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)