Merge pull request #6526 from paprka/secondchef

Adds second chef position / Renames chef to cook

code/game/jobs/access.dm

@@ -402,7 +402,7 @@
 			return "Code Gold"
 
 /proc/get_all_jobs()
-	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
+	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
 				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")

code/game/jobs/job/civilian.dm

@@ -50,26 +50,26 @@ Bartender
 		H.equip_to_slot_or_del(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
 
 /*
-Chef
+Cook
 */
-/datum/job/chef
-	title = "Chef"
-	flag = CHEF
+/datum/job/cook
+	title = "Cook"
+	flag = COOK
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
 
-	default_pda = /obj/item/device/pda/chef
+	default_pda = /obj/item/device/pda/cook
 	default_headset = /obj/item/device/radio/headset/headset_srv
 
 	access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
 	minimal_access = list(access_kitchen, access_morgue)
 
-/datum/job/chef/equip_items(var/mob/living/carbon/human/H)
+/datum/job/cook/equip_items(var/mob/living/carbon/human/H)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes)

code/game/jobs/jobs.dm

@@ -30,7 +30,7 @@ var/const/CIVILIAN			=(1<<2)
 var/const/HOP				=(1<<0)
 var/const/BARTENDER			=(1<<1)
 var/const/BOTANIST			=(1<<2)
-var/const/CHEF				=(1<<3)
+var/const/COOK				=(1<<3)
 var/const/JANITOR			=(1<<4)
 var/const/LIBRARIAN			=(1<<5)
 var/const/QUARTERMASTER		=(1<<6)
@@ -90,7 +90,7 @@ var/list/civilian_positions = list(
 	"Head of Personnel",
 	"Bartender",
 	"Botanist",
-	"Chef",
+	"Cook",
 	"Janitor",
 	"Librarian",
 	"Quartermaster",

code/game/machinery/computer/crew.dm

@@ -56,7 +56,7 @@ proc/crewmonitor(mob/user,var/atom/source)
 	jobs["Shaft Miner"] = 52
 	jobs["Cargo Technician"] = 53
 	jobs["Bartender"] = 61
-	jobs["Chef"] = 62
+	jobs["Cook"] = 62
 	jobs["Botanist"] = 63
 	jobs["Librarian"] = 64
 	jobs["Chaplain"] = 65
@@ -64,7 +64,7 @@ proc/crewmonitor(mob/user,var/atom/source)
 	jobs["Mime"] = 67
 	jobs["Janitor"] = 68
 	jobs["Assistant"] = 99	//Unknowns/custom jobs should appear after civilians, and before assistants
-	
+
 	var/t = "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='30%'><h3>Vitals</h3></td><td width='30%'><h3>Position</h3></td></tr>"
 	var/list/logs = list()
 	var/list/tracked = crewscan()
@@ -86,15 +86,15 @@ proc/crewmonitor(mob/user,var/atom/source)
 					var/ijob = jobs[I.assignment]
 					if(ijob % 10 == 0)
 						style += "font-weight: bold; "	//head roles always end in 0
-					if(ijob >= 10 && ijob < 20)		
+					if(ijob >= 10 && ijob < 20)
 						style += "color: #E74C3C; "	//security
-					if(ijob >= 20 && ijob < 30)		
+					if(ijob >= 20 && ijob < 30)
 						style += "color: #3498DB; "	//medical
-					if(ijob >= 30 && ijob < 40)		
-						style += "color: #9B59B6; "	//science	
-					if(ijob >= 40 && ijob < 50)		
+					if(ijob >= 30 && ijob < 40)
+						style += "color: #9B59B6; "	//science
+					if(ijob >= 40 && ijob < 50)
 						style += "color: #F1C40F; "	//engineering
-					if(ijob >= 50 && ijob < 60)		
+					if(ijob >= 50 && ijob < 60)
 						style += "color: #F39C12; "	//cargo
 					log += "<span style=\"display: none\">[ijob]]</span><tr><td width='40%'><span style=\"[style]\">[I.registered_name]</span> ([I.assignment])</td>"		//ijob does not get displayed, nor does it take up space, it's just used for the positioning of an entry
 				else

code/game/objects/items/devices/PDA/PDA.dm

@@ -170,8 +170,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case."
 	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
 
-/obj/item/device/pda/chef
-	icon_state = "pda-chef"
+/obj/item/device/pda/cook
+	icon_state = "pda-cook"
 
 /obj/item/device/pda/bar
 	icon_state = "pda-bartender"

code/modules/awaymissions/corpse.dm

@@ -157,8 +157,8 @@
 
 ///////////Civilians//////////////////////
 
-/obj/effect/landmark/corpse/chef
-	name = "Chef"
+/obj/effect/landmark/corpse/cook
+	name = "Cook"
 	corpseuniform = /obj/item/clothing/under/rank/chef
 	corpsesuit = /obj/item/clothing/suit/chef/classic
 	corpseshoes = /obj/item/clothing/shoes/sneakers/black
@@ -166,8 +166,8 @@
 	corpseback = /obj/item/weapon/storage/backpack
 	corpseradio = /obj/item/device/radio/headset
 	corpseid = 1
-	corpseidjob = "Chef"
-	corpseidaccess = "Chef"
+	corpseidjob = "Cook"
+	corpseidaccess = "Cook"
 
 
 /obj/effect/landmark/corpse/doctor

code/modules/events/wizard/departmentrevolt.dm

@@ -30,7 +30,7 @@
 			jobs_to_revolt = list("Quartermaster", "Cargo Technician", "Shaft Miner")
 			nation = pick("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf")
 		if("whatevercolorrepresentstheservicepeople") //the few, the proud, the technically aligned
-			jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain")
+			jobs_to_revolt = list("Bartender", "Cook", "Botanist", "Clown", "Mime", "Janitor", "Chaplain")
 			nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi")
 
 	nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka")

code/modules/food&drinks/food/snacks_other.dm

@@ -122,7 +122,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/badrecipe
 	name = "burned mess"
-	desc = "Someone should be demoted from chef for this."
+	desc = "Someone should be demoted from cook for this."
 	icon_state = "badrecipe"
 
 /obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()

code/modules/mob/new_player/preferences_setup.dm

@@ -95,7 +95,7 @@
 					clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
 				else if(backbag == 3)
 					clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-			if(CHEF)
+			if(COOK)
 				clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)