From b64a59c02a8521922adb62241d247e30d113cb07 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 22 Dec 2014 16:52:53 -0800 Subject: [PATCH 1/3] adds second chef position --- code/game/jobs/job/civilian.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index dc1e5110c05..ca147da4bdd 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -58,7 +58,7 @@ Chef 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" From 2371e2ebd86838e3fc3cb2368db7161b317d7b74 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 22 Dec 2014 17:02:06 -0800 Subject: [PATCH 2/3] renames chef to cook --- code/game/jobs/access.dm | 2 +- code/game/jobs/job/civilian.dm | 12 ++++++------ code/game/jobs/jobs.dm | 4 ++-- code/game/machinery/computer/crew.dm | 16 ++++++++-------- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- code/modules/awaymissions/corpse.dm | 8 ++++---- code/modules/events/wizard/departmentrevolt.dm | 2 +- code/modules/food&drinks/food/snacks_other.dm | 2 +- code/modules/mob/new_player/preferences_setup.dm | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index cd7cb743573..fdd010fd10f 100644 --- a/code/game/jobs/access.dm +++ b/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") diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index ca147da4bdd..17d1b50d98f 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -50,11 +50,11 @@ 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" @@ -63,13 +63,13 @@ Chef 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) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 14bf5181d8f..4b185dfd7fc 100644 --- a/code/game/jobs/jobs.dm +++ b/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", diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index f68c7bf7c36..8486b010252 100644 --- a/code/game/machinery/computer/crew.dm +++ b/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 = "" 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 += "[ijob]]" //ijob does not get displayed, nor does it take up space, it's just used for the positioning of an entry else diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index ab970a7db47..83face5668a 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/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" diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 841c66b5e3a..be721b81b07 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/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 diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 68c9d68e430..59707297095 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/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") diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm index e2a19d059ce..d4b8682b0f9 100644 --- a/code/modules/food&drinks/food/snacks_other.dm +++ b/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() diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 6742c29bf6d..e8bb527e779 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/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) From 2e5307287da7e92c2b9cd9c9ea76598982be7134 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 22 Dec 2014 17:04:03 -0800 Subject: [PATCH 3/3] fixed PDA icon state --- icons/obj/pda.dmi | Bin 13491 -> 13490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index cf23e98763270a5b2fe23a047f58dea0a20e2086..848647eae2d8bb3eef2aea583367cdeb597086d8 100644 GIT binary patch delta 463 zcmV;=0WkivX|idMB!9PhR9JLGWpiV4X>fFDZ*Bkpc$}4$%Wm613`N({R}7M^RMb`$ z*=Q3uD7;Aif#T2}Cen;DV(sehyHFp9Q9-vm2{?R!yu5Soo}RxQU)|y5SY9Mgnxbpn z!tx`_ zBiKT(U8cNpA%72l54)+Fs;QdK!DItCl(R%JWenyZgHE>A)eU{6>;=1;jp F&N9E%@mT-> delta 464 zcmV;>0WbctX|rjNB!9SiR9JLGWpiV4X>fFDZ*Bkpc$|%uyKdt^3`J|{D+Wm`En+K0 z8Z`?C3m3^h&>ULBtTdyH7<={iTWBAM5ka?;fWrrP$vgM%`}2?Et2?|L%ZubmQ*^C+ z{Ps{5SM?TL>zaL81kom4(+lxz_E<;+$!a<$wDhFnX%<*VMi&y!14? z);(2EpF*ItgLq}?A@-s<^{Ja7coP1|Y8cEk8fnB5&(SNEHPG0jX}M2VjFi}E6j>4E z27aTcmN0f=mB<3I?*k^U4p_dBMr=%2Ivx_X)gJ6_g1DZpGbl`$eFl3>r)0`H894F? zw$SS-Q(n1{$AABa-BeB0RL$pLvH=`QCs9lpgE`2cldW}iLtiO-!LH^+*(7>!G)%d} z)ZrlKHLwWDrZJgo-ELRy_tj0T7ZWzUfIHm_ZFkR

Name

Vitals

Position

[I.registered_name] ([I.assignment])