From 644e309594036d98e7d8f85e29825e6952b72ae5 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Feb 2013 15:31:37 +0100 Subject: [PATCH 1/3] Virologist is an alt title again. --- code/game/jobs/job/medical.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index c1aafb0721..e15570d8c8 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -49,7 +49,7 @@ selection_color = "#ffeef0" access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) minimal_access = list(access_medical, access_morgue, access_surgery) - alt_titles = list("Surgeon","Emergency Physician","Nurse","Orderly") + alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -74,11 +74,12 @@ if("Medical Doctor") H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) - if("Orderly") - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform) if("Nurse") - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head) + if(H.gender == FEMALE) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head) + else + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform) else H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) @@ -151,7 +152,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 -/datum/job/virologist +/*/datum/job/virologist title = "Virologist" flag = VIROLOGIST department_flag = MEDSCI @@ -182,4 +183,4 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 + return 1*/ From 484c936c6d1067957bbe807e26ddaf064fe871b2 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Feb 2013 16:29:07 +0100 Subject: [PATCH 2/3] Fixed a bug with intercept reports. --- code/game/gamemodes/intercept_report.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index f4e1b706c0..54c1ac6b07 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -124,6 +124,8 @@ var/name_2 = pick(src.org_names_2) var/mob/living/carbon/human/H = get_suspect() + if(!H) return + var/fingerprints = num2text(md5(H.dna.uni_identity)) var/traitor_name = H.real_name var/prob_right_dude = rand(1, 100) @@ -147,6 +149,7 @@ var/prob_right_dude = rand(1, 100) var/mob/living/carbon/human/H = get_suspect() + if(!H) return var/traitor_job = H.mind.assigned_role src.text += "

It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can." @@ -165,6 +168,7 @@ var/prob_right_dude = rand(1, 100) var/mob/living/carbon/human/H = get_suspect() + if(!H) return var/traitor_job = H.mind.assigned_role src.text += "

It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector." From afccc33ddbabdcfe4ecd25a0b115adabdd8afcbd Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Feb 2013 23:13:18 +0100 Subject: [PATCH 3/3] Forgot to give MD virology access. --- code/game/jobs/job/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index e15570d8c8..079b1ab7eb 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -48,7 +48,7 @@ supervisors = "the chief medical officer" selection_color = "#ffeef0" access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_morgue, access_surgery) + minimal_access = list(access_medical, access_morgue, access_surgery, access_virology) alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist") equip(var/mob/living/carbon/human/H)