diff --git a/code/game/machinery/vending/wardrobe.dm b/code/game/machinery/vending/wardrobe.dm index 5d9e8587f1c..9ee33ca8b6f 100644 --- a/code/game/machinery/vending/wardrobe.dm +++ b/code/game/machinery/vending/wardrobe.dm @@ -630,7 +630,9 @@ /obj/item/clothing/under/rank/medical/surgeon/pmc/alt = 2, /obj/item/clothing/under/rank/medical/surgeon/zeng = 2, /obj/item/clothing/under/medical_gown = 6, - /obj/item/clothing/under/medical_gown/white = 6, + /obj/item/clothing/under/medical_gown/blue = 6, + /obj/item/clothing/under/medical_gown/green = 6, + /obj/item/clothing/under/medical_gown/pink = 6, /obj/item/clothing/suit/storage/surgical_gown/nt = 3, /obj/item/clothing/suit/storage/surgical_gown/zeng = 3, /obj/item/clothing/suit/storage/surgical_gown/pmc/alt = 3, diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 0bb60e0b80f..ba4c2ceefba 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -265,3 +265,14 @@ /obj/random/wizard_dressup/post_spawn(obj/thing) var/obj/item/clothing/head/wizard/H = pick(typesof(/obj/item/clothing/head/wizard)) new H(loc) + +/obj/random/medical_gown + name = "random medical gown" + desc = "A random color of medical patient's gown." + icon_state = "uniform" + problist = list( + /obj/item/clothing/under/medical_gown = 1, + /obj/item/clothing/under/medical_gown/blue = 1, + /obj/item/clothing/under/medical_gown/green = 1, + /obj/item/clothing/under/medical_gown/pink = 1 + ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 6d56f1c693c..b97a7b6c8c3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -16,12 +16,8 @@ name = "patient's closet" /obj/structure/closet/secure_closet/personal/patient/fill() - if(prob(50)) - new /obj/item/clothing/under/medical_gown(src) - new /obj/item/clothing/under/medical_gown(src) - else - new /obj/item/clothing/under/medical_gown/white(src) - new /obj/item/clothing/under/medical_gown/white(src) + new /obj/random/medical_gown(src) + new /obj/random/medical_gown(src) new /obj/item/clothing/shoes/sneakers( src ) new /obj/item/clothing/shoes/sneakers( src ) diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 609d07f3808..353e76ca01a 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -340,6 +340,13 @@ gear_tweaks += new /datum/gear_tweak/path(dress_colorable) +/datum/gear/uniform/miscellaneous/medical_gown + display_name = "medical gown" + description = "A loose piece of clothing, commonly worn by medical patients." + path = /obj/item/clothing/under/medical_gown + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + allowed_roles = list("Off-Duty Crew Member", "Passenger") + /* Uniform Rolled State Adjustment */ diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a64c25391ba..028f495c230 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -505,15 +505,20 @@ /obj/item/clothing/under/medical_gown name = "medical gown" - desc = "A loose pieces of clothing, commonly worn by medical patients." + desc = "A loose piece of clothing, commonly worn by medical patients." icon_state = "medicalgown" item_state = "medicalgown" has_sensor = SUIT_LOCKED_SENSORS sensor_mode = SUIT_SENSOR_TRACKING -/obj/item/clothing/under/medical_gown/white - icon_state = "whitemedicalgown" - worn_state = "whitemedicalgown" +/obj/item/clothing/under/medical_gown/blue + color = "#99ccff" + +/obj/item/clothing/under/medical_gown/green + color = "#8dd7a3" + +/obj/item/clothing/under/medical_gown/pink + color = "#ffb7db" /obj/item/clothing/under/legion name = "Tau Ceti Foreign Legion uniform" diff --git a/html/changelogs/greenjoe - medgown.yml b/html/changelogs/greenjoe - medgown.yml new file mode 100644 index 00000000000..111d3bdb829 --- /dev/null +++ b/html/changelogs/greenjoe - medgown.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Greenjoe + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the medical patient gown to the loadout, locked to offduty and passengers only." + - imageadd: "Replaces the sprite of the medical gown with one from Bay. Two new colors are also added." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 40a7522d11e..516939b439a 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 2668378ca5c..696d2e4c6a5 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ