Skip to content

Commit

Permalink
add two scrub colors
Browse files Browse the repository at this point in the history
  • Loading branch information
nefarious committed Jun 7, 2024
1 parent dc58c8e commit a8632de
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 6 deletions.
6 changes: 6 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/medical.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list(
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Olive Scrubs", 0, /obj/item/clothing/under/rank/medical/olive, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Grey Scrubs", 0, /obj/item/clothing/under/rank/medical/grey, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_MRE, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -111,6 +113,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list(
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Olive Scrubs", 0, /obj/item/clothing/under/rank/medical/olive, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Grey Scrubs", 0, /obj/item/clothing/under/rank/medical/grey, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
list("Medical's apron", 0, /obj/item/clothing/suit/chef/classic/medical, MARINE_CAN_BUY_MRE, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -181,6 +185,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Olive Scrubs", 0, /obj/item/clothing/under/rank/medical/olive, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Grey Scrubs", 0, /obj/item/clothing/under/rank/medical/grey, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat/researcher, MARINE_CAN_BUY_MRE, VENDOR_ITEM_RECOMMENDED),
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Olive Scrubs", 0, /obj/item/clothing/under/rank/medical/olive, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Grey Scrubs", 0, /obj/item/clothing/under/rank/medical/grey, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_MRE, VENDOR_ITEM_RECOMMENDED),
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Olive", 12, /obj/item/clothing/under/rank/medical/olive, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Grey", 12, /obj/item/clothing/under/rank/medical/grey, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),
list("USCM Service Uniform, Tan", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR),
list("USCM Service Uniform, White", 12, /obj/item/clothing/under/marine/dress, null, VENDOR_ITEM_REGULAR),
Expand Down
26 changes: 20 additions & 6 deletions code/modules/clothing/under/jobs/medsci.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
item_state_slots = list(WEAR_BODY = "orderly")

/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
desc = "They're made of a special fiber that provides minor protection against biohazards. They have a cross on the chest denoting that the wearer is trained medical personnel."
name = "medical doctor's uniform"
icon_state = "medical"
item_state = "w_suit"
Expand All @@ -178,35 +178,49 @@

/obj/item/clothing/under/rank/medical/lightblue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in light blue."
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in light blue."
icon_state = "scrubslightblue"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubslightblue")

/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in formal blue."
icon_state = "scrubsblue"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsblue")

/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in jade green."
icon_state = "scrubsgreen"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsgreen")

/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in berry red."
icon_state = "scrubspurple"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubspurple")

/obj/item/clothing/under/rank/medical/olive
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in olive green."
icon_state = "scrubsolive"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsolive")

/obj/item/clothing/under/rank/medical/grey
name = "medical scrubs"
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in mundane grey."
icon_state = "scrubsgrey"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsgrey")

/obj/item/clothing/under/rank/medical/orange
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in prisoner orange."
desc = "They're made of a special fiber that provides minor protection against biohazards. These are in prisoner orange."
icon_state = "scrubsorange"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsorange")
Expand Down
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
View file
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
View file
Binary file not shown.

0 comments on commit a8632de

Please sign in to comment.