From 7b8470ccaedccee2da5aaeb11a6078b221cfe114 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Sat, 7 Apr 2018 11:17:45 -0700 Subject: [PATCH] Removes nurse's outfit (#4520) Argument was that nurse's outfit is too exposed for medical staff, and against sterile protocols. Removes nurse's outfit to be spawned in medical lockers Removes nurse's to spawn with nurse's outfit Edit: Forum Topic regarding that is here: https://forums.aurorastation.org/viewtopic.php?f=18&t=10752 --- code/game/jobs/job/medical.dm | 7 +--- .../crates_lockers/closets/secure/medical.dm | 3 -- html/changelogs/poze-nurseoutfit.yml | 37 +++++++++++++++++++ 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/poze-nurseoutfit.yml diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index bacad18d188..2c7afc69558 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -99,13 +99,8 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/viro(H), slot_belt) else if(has_alt_title(H, alt_title,"Nurse")) if(H.gender == FEMALE) - if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform) - else - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(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) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt) else if(has_alt_title(H, alt_title,"Medical Doctor")) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 80aea736658..cd8fc764238 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -57,7 +57,6 @@ new /obj/item/weapon/storage/backpack/medic(src) else new /obj/item/weapon/storage/backpack/satchel_med(src) - new /obj/item/clothing/under/rank/nursesuit (src) new /obj/item/clothing/head/nursehat (src) switch(pick("blue", "green", "purple")) if ("blue") @@ -80,12 +79,10 @@ new /obj/item/clothing/under/rank/medical/purple(src) new /obj/item/clothing/head/surgery/purple(src) new /obj/item/clothing/under/rank/medical(src) - new /obj/item/clothing/under/rank/nurse(src) new /obj/item/clothing/under/rank/orderly(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/fr_jacket(src) new /obj/item/clothing/shoes/white(src) -// new /obj/item/weapon/cartridge/medical(src) new /obj/item/device/radio/headset/headset_med(src) diff --git a/html/changelogs/poze-nurseoutfit.yml b/html/changelogs/poze-nurseoutfit.yml new file mode 100644 index 00000000000..4d59b5a3b5a --- /dev/null +++ b/html/changelogs/poze-nurseoutfit.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: PoZe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Removed the nurse dress from medical lockers and changes the default nurse outfit to purple scrubs."