diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 45812a3bf9..2513757c1c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -391,4 +391,8 @@ /datum/gear/head/blackngoldheaddress display_name = "black and gold headdress" - path = /obj/item/clothing/head/blackngoldheaddress \ No newline at end of file + path = /obj/item/clothing/head/blackngoldheaddress + +/datum/gear/head/plaguedoctor2 + display_name = "golden plague doctor's hat" + path = /obj/item/clothing/head/plaguedoctorhat/gold \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 716cdb4268..5de81409f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -24,4 +24,9 @@ /datum/gear/mask/veil display_name = "black veil" - path = /obj/item/clothing/mask/veil \ No newline at end of file + path = /obj/item/clothing/mask/veil + +/datum/gear/mask/plaguedoctor2 + display_name = "golden plague doctor's mask" + path = /obj/item/clothing/mask/gas/plaguedoctor/gold + cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage. \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index cd2ce4aa94..7126d0d0d0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -171,6 +171,10 @@ datum/gear/suit/duster path = /obj/item/clothing/suit/storage/toggle/labcoat/emt allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") +/datum/gear/suit/miscellaneous/labcoat + display_name = "plague doctor's coat" + path = /obj/item/clothing/suit/storage/toggle/labcoat/plaguedoctor + /datum/gear/suit/roles/surgical_apron display_name = "surgical apron" path = /obj/item/clothing/suit/surgicalapron diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 3a8f2f8915..40411684f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -640,4 +640,16 @@ /datum/gear/uniform/gothic2 display_name = "lacey gothic dress" - path = /obj/item/clothing/under/dress/gothic2 \ No newline at end of file + path = /obj/item/clothing/under/dress/gothic2 + +/datum/gear/uniform/flowerskirt + display_name = "flower skirt" + path = /obj/item/clothing/under/flower_skirt + +/datum/gear/uniform/flowerskirt/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/uniform/countess + display_name = "countess dress" + path = /obj/item/clothing/under/dress/countess \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 7846061025..0d567bb7e8 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -126,6 +126,11 @@ siemens_coefficient = 0.9 body_parts_covered = 0 +/obj/item/clothing/head/plaguedoctorhat/gold + name = "golden plague doctor's hat" + desc = "These were once used by plague doctors, allegedly. This one has gold accents." + icon_state = "plaguedoctor2" + /obj/item/clothing/head/hasturhood name = "hastur's hood" desc = "It's unspeakably stylish" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 25b9e00f68..a73e6d7a73 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -69,6 +69,11 @@ armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0) body_parts_covered = HEAD|FACE|EYES +/obj/item/clothing/mask/gas/plaguedoctor/gold + name = "gold plague doctor mask" + desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold." + icon_state = "plaguedoctor2" + /obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask that can be connected to an air supply." diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 5fb635bca2..de610ca3ee 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -86,10 +86,10 @@ /obj/item/clothing/head/bio_hood/cmo icon_state = "bio_cmo" -//Plague Dr mask can be found in clothing/masks/gasmask.dm +//Plague Dr mask can be found in clothing/masks/gasmask.dm. Golden can be found in labcoat.dm. /obj/item/clothing/suit/bio_suit/plaguedoctorsuit - name = "Plague doctor suit" + name = "plague doctor suit" desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses." icon_state = "plaguedoctor" item_state_slots = list(slot_r_hand_str = "bio", slot_l_hand_str = "bio") - flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER \ No newline at end of file diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index cc7dfa3be5..2560692656 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -104,4 +104,10 @@ /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge name = "blue-edged labcoat" desc = "A suit that protects against minor chemical spills. This one has blue trim." - icon_state = "blue_edge_labcoat" \ No newline at end of file + icon_state = "blue_edge_labcoat" + +/obj/item/clothing/suit/storage/toggle/labcoat/plaguedoctor + name = "golden plague doctor suit" + desc = "If it worked then, it works now. This classic design comes in gold." + icon_state = "plaguedoctor2" + index = 1 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index c0b911d72e..46c340203b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -560,12 +560,18 @@ icon_state = "pentagram" index = 1 -obj/item/clothing/under/dress/yellowswoop +/obj/item/clothing/under/dress/yellowswoop name = "yellow swooped dress" desc = "A yellow dress that swoops to the side." icon_state = "yellowswoop" index = 1 +/obj/item/clothing/under/dress/countess + name = "countess dress" + desc = "A red and black dress fit for a countess." + icon_state = "countess" + index = 1 + /* * wedding stuff */ @@ -895,6 +901,12 @@ Uniforms and such icon_state = "disheveled" index = 1 +/obj/item/clothing/under/flower_skirt + name = "flower skirt" + desc = "A flowery skirt that comes in a variety of colors." + icon_state = "flowerskirt" + index = 1 + /* * swimsuit */ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f845638d11..c580e2ccd4 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 5761446f43..f296b1dae2 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit_1.dmi b/icons/mob/suit_1.dmi index 7d52018483..7515beba12 100644 Binary files a/icons/mob/suit_1.dmi and b/icons/mob/suit_1.dmi differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi index 27a67cb2ca..1f22a767b6 100644 Binary files a/icons/mob/uniform_1.dmi and b/icons/mob/uniform_1.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 8391cf09ef..ea1d7579d8 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 88fa471cfd..d7daacb379 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits_1.dmi b/icons/obj/clothing/suits_1.dmi index 7a75bbba5b..3e905eda58 100644 Binary files a/icons/obj/clothing/suits_1.dmi and b/icons/obj/clothing/suits_1.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index 446758ab5a..348cf8dd94 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ