diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 0ac9ebf5783..1243a464357 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -178,6 +178,7 @@ /obj/item/clothing/under/rank/medical/nurse = 3, /obj/item/clothing/under/rank/medical/gown = 3, /obj/item/clothing/head/beret/med = 3, + /obj/item/clothing/head/beret/med_alt = 3, /obj/item/clothing/head/surgery/blue = 3, /obj/item/clothing/head/surgery/green = 3, /obj/item/clothing/head/surgery/purple = 3, @@ -213,6 +214,7 @@ /obj/item/clothing/under/rank/medical/nurse = 50, /obj/item/clothing/under/rank/medical/gown = 50, /obj/item/clothing/head/beret/med = 20, + /obj/item/clothing/head/beret/med_alt = 20, /obj/item/clothing/head/surgery/blue = 20, /obj/item/clothing/head/surgery/green = 20, /obj/item/clothing/head/surgery/purple = 20, @@ -253,7 +255,9 @@ 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/head/beret/med = 2, + /obj/item/clothing/head/beret/viro = 2, + /obj/item/clothing/head/beret/viro_alt = 2, + /obj/item/clothing/head/beret/viro_green = 2, /obj/item/clothing/suit/storage/labcoat/virologist = 2, /obj/item/clothing/accessory/armband/med = 2, /obj/item/clothing/mask/surgical = 2, @@ -270,7 +274,9 @@ prices = list(/obj/item/clothing/under/rank/medical/virologist = 50, /obj/item/clothing/under/rank/medical/virologist/skirt = 50, - /obj/item/clothing/head/beret/med = 20, + /obj/item/clothing/head/beret/viro = 20, + /obj/item/clothing/head/beret/viro_alt = 20, + /obj/item/clothing/head/beret/viro_green = 20, /obj/item/clothing/suit/storage/labcoat/virologist = 75, /obj/item/clothing/accessory/armband/med = 20, /obj/item/clothing/mask/surgical = 20, @@ -297,7 +303,9 @@ 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/head/beret/med = 2, + /obj/item/clothing/head/beret/chem = 2, + /obj/item/clothing/head/beret/chem_alt = 2, + /obj/item/clothing/head/beret/chem_orange = 2, /obj/item/clothing/suit/storage/labcoat/chemist = 2, /obj/item/clothing/suit/hooded/wintercoat/chemistry = 2, /obj/item/clothing/suit/jacket/bomber/chem = 2, @@ -315,7 +323,9 @@ prices = list(/obj/item/clothing/under/rank/medical/chemist = 50, /obj/item/clothing/under/rank/medical/chemist/skirt = 50, - /obj/item/clothing/head/beret/med = 20, + /obj/item/clothing/head/beret/chem = 20, + /obj/item/clothing/head/beret/chem_alt = 20, + /obj/item/clothing/head/beret/chem_orange = 20, /obj/item/clothing/suit/storage/labcoat/chemist = 75, /obj/item/clothing/suit/hooded/wintercoat/chemistry = 75, /obj/item/clothing/suit/jacket/bomber/chem = 75, @@ -1115,6 +1125,8 @@ /obj/item/clothing/head/beret/nct/black = 2, /obj/item/clothing/head/beret/sec = 2, /obj/item/clothing/head/beret/med = 2, + /obj/item/clothing/head/beret/chem = 2, + /obj/item/clothing/head/beret/viro = 2, /obj/item/clothing/head/beret/sci = 2, /obj/item/clothing/head/beret/eng = 2, /obj/item/clothing/head/beret/atmos = 2, diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 521956f4976..6cc89241da2 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -336,16 +336,82 @@ path = /obj/item/clothing/head/beret/rd allowed_roles = list("Research Director") -/datum/gear/hat/beret_job/med - display_name = "Beret, medical" +/datum/gear/hat/beret_job/md + display_name = "Beret, doctor" path = /obj/item/clothing/head/beret/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Coroner", "Paramedic") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Coroner", "Psychologist", "Virologist") + +/datum/gear/hat/beret_job/md_alt + display_name = "Beret, doctor corporate" + path = /obj/item/clothing/head/beret/med_alt + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Coroner", "Psychologist", "Virologist") + /datum/gear/hat/beret_job/para display_name = "Beret, EMT" path = /obj/item/clothing/head/beret/paramedic allowed_roles = list("Chief Medical Officer", "Paramedic") +/datum/gear/hat/beret_job/chem + display_name = "Beret, chemist" + path = /obj/item/clothing/head/beret/chem + allowed_roles = list("Chief Medical Officer", "Chemist") + +/datum/gear/hat/beret_job/chem_alt + display_name = "Beret, chemist corporate" + path = /obj/item/clothing/head/beret/chem_alt + allowed_roles = list("Chief Medical Officer", "Chemist") + +/datum/gear/hat/beret_job/chem_orange + display_name = "Beret, chemist orange" + path = /obj/item/clothing/head/beret/chem_orange + allowed_roles = list("Chief Medical Officer", "Chemist") + +/datum/gear/hat/beret_job/coroner + display_name = "Beret, coroner" + path = /obj/item/clothing/head/beret/coroner + allowed_roles = list("Chief Medical Officer", "Coroner") + +/datum/gear/hat/beret_job/coroner_alt + display_name = "Beret, coroner corporate" + path = /obj/item/clothing/head/beret/coroner_alt + allowed_roles = list("Chief Medical Officer", "Coroner") + +/datum/gear/hat/beret_job/coroner_black + display_name = "Beret, coroner black" + path = /obj/item/clothing/head/beret/coroner_black + allowed_roles = list("Chief Medical Officer", "Coroner") + +/datum/gear/hat/beret_job/psych + display_name = "Beret, psychologist" + path = /obj/item/clothing/head/beret/psych + allowed_roles = list("Chief Medical Officer", "Psychologist") + +/datum/gear/hat/beret_job/psych_alt + display_name = "Beret, psychologist corporate" + path = /obj/item/clothing/head/beret/psych_alt + allowed_roles = list("Chief Medical Officer", "Psychologist") + +/datum/gear/hat/beret_job/psych_teal + display_name = "Beret, psychologist teal" + path = /obj/item/clothing/head/beret/psych_teal + allowed_roles = list("Chief Medical Officer", "Psychologist") + +/datum/gear/hat/beret_job/viro + display_name = "Beret, virologist" + path = /obj/item/clothing/head/beret/viro + allowed_roles = list("Virologist") + +/datum/gear/hat/beret_job/viro_alt + display_name = "Beret, virologist corporate" + path = /obj/item/clothing/head/beret/viro_alt + allowed_roles = list("Virologist") + +/datum/gear/hat/beret_job/viro_green + display_name = "Beret, virologist green" + path = /obj/item/clothing/head/beret/viro_green + allowed_roles = list("Virologist") + /datum/gear/hat/beret_job/cmo display_name = "Beret, chief medical officer" path = /obj/item/clothing/head/beret/cmo diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 18b3a65a6bd..a169549a758 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -270,9 +270,24 @@ ) /obj/item/clothing/head/beret/med - name = "medical beret" - desc = "A white beret with a green cross finely threaded into it. It has that sterile smell about it." - icon_state = "beret_med" + name = "doctor's beret" + desc = "A light blue beret with a white cross finely threaded into it. It has that sterile smell about it." + icon_state = "beret_md" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/med_alt + name = "corporate doctor's beret" + desc = "A white beret with a light blue cross finely threaded into it. It has that sterile smell about it." + icon_state = "beret_md_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) /obj/item/clothing/head/beret/paramedic name = "paramedic's beret" @@ -285,6 +300,126 @@ "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' ) +/obj/item/clothing/head/beret/chem + name = "chemist's beret" + desc = "A light blue beret with an orange insignia emblazoned on it. It smells of chemicals." + icon_state = "beret_chemist" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/chem_alt + name = "corporate chemist's beret" + desc = "A white beret with an orange insignia emblazoned on it. It smells of chemicals." + icon_state = "beret_chemist_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/chem_orange + name = "orange chemist's beret" + desc = "An orange beret with a white insignia emblazoned on it. It smells of chemicals." + icon_state = "beret_chemist_orange" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/coroner + name = "coroner's beret" + desc = "A light blue beret with a black insignia emblazoned on it. It smells of death." + icon_state = "beret_coroner" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/coroner_alt + name = "corporate coroner's beret" + desc = "A white beret with a black insignia emblazoned on it. It smells of death." + icon_state = "beret_coroner_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/coroner_black + name = "black coroner's beret" + desc = "A black beret with a white insignia emblazoned on it. It smells of death." + icon_state = "beret_coroner_black" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/psych + name = "psychologist's beret" + desc = "A light blue beret with a teal insignia emblazoned on it. It smells of marijuana." + icon_state = "beret_psych" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/psych_alt + name = "corporate psychologist's beret" + desc = "A white beret with a teal insignia emblazoned on it. It smells of marijuana." + icon_state = "beret_psych_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/psych_teal + name = "teal psychologist's beret" + desc = "A teal beret with a white insignia emblazoned on it. It smells of marijuana." + icon_state = "beret_psych_teal" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/viro + name = "virologist's beret" + desc = "A light blue beret with a green insignia emblazoned on it. Create vaccines with style." + icon_state = "beret_viro" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/viro_alt + name = "corporate virologist's beret" + desc = "A white beret with a green insignia emblazoned on it. Create vaccines with style." + icon_state = "beret_viro_alt" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + +/obj/item/clothing/head/beret/viro_green + name = "green virologist's beret" + desc = "A green beret with a white insignia emblazoned on it. Create vaccines with style." + icon_state = "beret_viro_green" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + //Cargo /obj/item/clothing/head/beret/qm name = "quartermaster's beret" diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 87d6b7ee2f1..8ef315e4867 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 8579935d7eb..4981df8fe87 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/beret.dmi b/icons/mob/clothing/species/kidan/head/beret.dmi index 232e4f53bdb..e4403b20969 100644 Binary files a/icons/mob/clothing/species/kidan/head/beret.dmi and b/icons/mob/clothing/species/kidan/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 390b1ac5de0..cfa00aff6bd 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index db6a6d40634..af8e17d0fe6 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ