From 599185654f5caa17167ded2e6acabb8bea8eace0 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 31 Jan 2020 21:54:21 -0500 Subject: [PATCH 1/4] Rename, Add item to Loadout Renamed scrubs based on color, added Mailman Hat to loadout. --- code/modules/clothing/under/jobs/medsci.dm | 6 +++--- modular_citadel/code/modules/client/loadout/head.dm | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index c27882aac7..6952a581da 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -178,19 +178,19 @@ permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) /obj/item/clothing/under/rank/medical/blue - name = "medical scrubs" + name = "blue medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" item_color = "scrubsblue" can_adjust = FALSE /obj/item/clothing/under/rank/medical/green - name = "medical scrubs" + name = "green medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" item_color = "scrubsgreen" can_adjust = FALSE /obj/item/clothing/under/rank/medical/purple - name = "medical scrubs" + name = "purple medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." icon_state = "scrubspurple" item_color = "scrubspurple" diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 8634460d4e..dd7d2cdc4b 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -59,6 +59,11 @@ category = SLOT_HEAD path = /obj/item/clothing/head/rabbitears +/datum/gear/mailmanhat + name = "Mailman's Hat" + category = SLOT_HEAD + path = /obj/item/clothing/head/mailman + //trek fancy Hats! /datum/gear/trekcap name = "Federation Officer's Cap (White)" @@ -105,6 +110,7 @@ path = /obj/item/clothing/head/christmashatg */ +//Cowboy Stuff /datum/gear/cowboyhat name = "Cowboy Hat, Brown" category = SLOT_HEAD From 12c0e475d83abdc008df8f5ce345a12c9a002b53 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 31 Jan 2020 22:36:25 -0500 Subject: [PATCH 2/4] Add Nurse Stuff to Loadout, fixes. --- .../code/modules/client/loadout/_medical.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm index eed1ad32a1..bd0b9ad3e9 100644 --- a/modular_citadel/code/modules/client/loadout/_medical.dm +++ b/modular_citadel/code/modules/client/loadout/_medical.dm @@ -1,9 +1,23 @@ -/datum/gear/stethoscope +/datum/gear/medicbriefcase name = "Medical Briefcase" category = SLOT_HANDS path = /obj/item/storage/briefcase/medical restricted_roles = list("Medical Doctor", "Chief Medical Officer") +/datum/gear/nursehat + name = "Nurse Hat" + category = SLOT_HANDS + path = /obj/item/clothing/head/nursehat + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") + restricted_desc = "Medical" + +/datum/gear/nursesuit + name = "Nurse Suit" + category = SLOT_HEAD + path = /obj/item/clothing/under/rank/nursesuit + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") + restricted_desc = "Medical" + /datum/gear/stethoscope name = "Stethoscope" category = SLOT_NECK From 847946bfe3da73a67d2866978ee858fe0ea0de9a Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 31 Jan 2020 22:53:27 -0500 Subject: [PATCH 3/4] Fix cause I'm dumb --- modular_citadel/code/modules/client/loadout/_medical.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm index bd0b9ad3e9..5a3ad43aa7 100644 --- a/modular_citadel/code/modules/client/loadout/_medical.dm +++ b/modular_citadel/code/modules/client/loadout/_medical.dm @@ -3,17 +3,18 @@ category = SLOT_HANDS path = /obj/item/storage/briefcase/medical restricted_roles = list("Medical Doctor", "Chief Medical Officer") + restricted_desc = "MD, CMO" /datum/gear/nursehat name = "Nurse Hat" - category = SLOT_HANDS + category = SLOT_HEAD path = /obj/item/clothing/head/nursehat restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" /datum/gear/nursesuit name = "Nurse Suit" - category = SLOT_HEAD + category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/nursesuit restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" From c3ca88427393410b4e92a1d0053590b552196bf0 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:08:31 -0500 Subject: [PATCH 4/4] Moved Nurse Stuff below Scrubs --- .../code/modules/client/loadout/_medical.dm | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm index 5a3ad43aa7..b1b5c9a62e 100644 --- a/modular_citadel/code/modules/client/loadout/_medical.dm +++ b/modular_citadel/code/modules/client/loadout/_medical.dm @@ -5,20 +5,6 @@ restricted_roles = list("Medical Doctor", "Chief Medical Officer") restricted_desc = "MD, CMO" -/datum/gear/nursehat - name = "Nurse Hat" - category = SLOT_HEAD - path = /obj/item/clothing/head/nursehat - restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") - restricted_desc = "Medical" - -/datum/gear/nursesuit - name = "Nurse Suit" - category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/rank/nursesuit - restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") - restricted_desc = "Medical" - /datum/gear/stethoscope name = "Stethoscope" category = SLOT_NECK @@ -45,3 +31,17 @@ path = /obj/item/clothing/under/rank/medical/purple restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") restricted_desc = "Medical" + +/datum/gear/nursehat + name = "Nurse Hat" + category = SLOT_HEAD + path = /obj/item/clothing/head/nursehat + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") + restricted_desc = "Medical" + +/datum/gear/nursesuit + name = "Nurse Suit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/rank/nursesuit + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist") + restricted_desc = "Medical" \ No newline at end of file