From d1301219a78bd584e67485e29c4399b65284b91c Mon Sep 17 00:00:00 2001 From: Neerti Date: Wed, 29 Jul 2015 05:37:20 -0400 Subject: [PATCH] Minor alt-title changes. Adds Resident alt-title for assistants. Adds Security Cadet back as an alt-title for security officers. Visitors and Residents do not have a grey jumpsuit as their default uniform. --- code/game/jobs/job/assistant.dm | 12 ++++++++++-- code/game/jobs/job/security.dm | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index f390303452f..df4dd3a24b5 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -10,7 +10,7 @@ selection_color = "#dddddd" access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() - alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor") + alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor", "Resident") /datum/job/assistant/equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -18,7 +18,15 @@ if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) + if (H.mind.role_alt_title) + switch(H.mind.role_alt_title) + if("Visitor") //I doubt someone visiting the station would want to wear an ugly grey uniform + H.equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(H), slot_w_uniform) + + if("Resident") + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform) + else + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index cb7a7d23f4c..24fa69dbdc9 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -135,6 +135,7 @@ selection_color = "#ffeeee" access = list(access_security, access_eva, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_external_airlocks) minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_external_airlocks) + alt_titles = list("Security Cadet") minimal_player_age = 3 equip(var/mob/living/carbon/human/H) if(!H) return 0