Skip to content
This repository has been archived by the owner on Jul 27, 2021. It is now read-only.

[MIRROR] Departmental skirts: Medical #586

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MIRROR] Departmental skirts: Medical #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/cartridge/cmo(src)
new /obj/item/radio/headset/heads/cmo(src)
Expand Down
62 changes: 61 additions & 1 deletion code/modules/clothing/under/jobs/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0)

/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
name = "chief medical officer's jumpskirt"
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
icon_state = "cmo_skirt"
item_state = "w_suit"
item_color = "cmo_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP

/obj/item/clothing/under/rank/medical/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
name = "geneticist's jumpsuit"
Expand All @@ -16,6 +26,16 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0)

/obj/item/clothing/under/rank/medical/geneticist/skirt
name = "geneticist's jumpskirt"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
icon_state = "geneticswhite_skirt"
item_state = "w_suit"
item_color = "geneticswhite_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP

/obj/item/clothing/under/rank/medical/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
name = "virologist's jumpsuit"
Expand All @@ -25,15 +45,35 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0)

/obj/item/clothing/under/rank/medical/virologist/skirt
name = "virologist's jumpskirt"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
icon_state = "virologywhite_skirt"
item_state = "w_suit"
item_color = "virologywhite_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP

/obj/item/clothing/under/rank/medical/emt
name = "medical scrubs"
name = "paramedic's jumpsuit"
desc = "A standard jumpsuit used by paramedics onboard space stations. It's made of a special fiber that gives special protection against biohazards."
icon_state = "emt"
item_color = "emt"
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0)
can_adjust = FALSE

/obj/item/clothing/under/rank/medical/emt/skirt
name = "paramedic's jumpskirt"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
icon_state = "emt_skirt"
item_state = "w_suit"
item_color = "emt_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP

/obj/item/clothing/under/rank/medical/doctor/nurse
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
name = "nurse's suit"
Expand All @@ -55,6 +95,16 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0)

/obj/item/clothing/under/rank/medical/doctor/skirt
name = "medical doctor's jumpskirt"
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."
icon_state = "medical_skirt"
item_state = "w_suit"
item_color = "medical_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP

/obj/item/clothing/under/rank/medical/doctor/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
Expand Down Expand Up @@ -84,3 +134,13 @@
item_color = "chemistrywhite"
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65, "stamina" = 0)

/obj/item/clothing/under/rank/medical/chemist/skirt
name = "chemist's jumpskirt"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
icon_state = "chemistrywhite_skirt"
item_state = "w_suit"
item_color = "chemistrywhite_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
6 changes: 6 additions & 0 deletions code/modules/vending/wardrobes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,15 @@
/obj/item/storage/backpack/medic = 4,
/obj/item/storage/backpack/satchel/med = 4,
/obj/item/clothing/suit/hooded/wintercoat/medical = 4,
/obj/item/clothing/under/rank/medical/emt = 4,
/obj/item/clothing/under/rank/medical/emt/skirt = 4,
/obj/item/clothing/under/rank/medical/doctor/nurse = 4,
/obj/item/clothing/head/nursehat = 4,
/obj/item/clothing/under/rank/medical/doctor/blue = 4,
/obj/item/clothing/under/rank/medical/doctor/green = 4,
/obj/item/clothing/under/rank/medical/doctor/purple = 4,
/obj/item/clothing/under/rank/medical/doctor = 4,
/obj/item/clothing/under/rank/medical/doctor/skirt= 4,
/obj/item/clothing/under/plasmaman/medical = 4,
/obj/item/clothing/head/helmet/space/plasmaman/replacement/medical = 4,
/obj/item/clothing/suit/toggle/labcoat = 4,
Expand Down Expand Up @@ -421,6 +424,7 @@
product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!"
vend_reply = "Thank you for using the ChemDrobe!"
products = list(/obj/item/clothing/under/rank/medical/chemist = 2,
/obj/item/clothing/under/rank/medical/chemist/skirt = 2,
/obj/item/clothing/under/plasmaman/chemist = 2,
/obj/item/clothing/head/helmet/space/plasmaman/replacement/chemist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
Expand All @@ -441,6 +445,7 @@
product_ads = "Perfect for the mad scientist in you!"
vend_reply = "Thank you for using the GeneDrobe!"
products = list(/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/under/rank/medical/geneticist/skirt = 2,
/obj/item/clothing/under/plasmaman/genetics = 2,
/obj/item/clothing/head/helmet/space/plasmaman/replacement/genetics = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
Expand All @@ -459,6 +464,7 @@
product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!"
vend_reply = "Thank you for using the ViroDrobe"
products = list(/obj/item/clothing/under/rank/medical/virologist = 2,
/obj/item/clothing/under/rank/medical/virologist/skirt = 2,
/obj/item/clothing/under/plasmaman/viro = 2,
/obj/item/clothing/head/helmet/space/plasmaman/replacement/viro = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
Expand Down