cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds New Medical Berets (#31683)

Browse Source 
* Resprites current doctor beret and adds new ones

* Updates species' beret.dmi

* Updates species' beret.dmi, again

* Fixes a misnamed beret, adds obj sprites

* Makes the new berets accessible in-game

* Updates a map file to use the correct beret name

* Add desc to psych berets + small tweaks to code

* Lets other med roles use the MD beret

* Fixes species sprites

* Remove an additional blank line

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com>

---------

Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
serapher
2026-04-02 04:46:03 +00:00
committed by GitHub
co-authored by PollardTheDragon
parent a7971e4af9
commit bf974ec3ab
8 changed files with 223 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vendors/wardrobe_vendors.dm
Vendored
+16 -4
View File
@@ -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,
code/modules/client/preference/loadout/loadout_hat.dm
+69 -3
View File
@@ -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
code/modules/clothing/head/beret.dm
+138 -3
View File
@@ -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"
icons/mob/clothing/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

icons/mob/clothing/species/drask/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

icons/mob/clothing/species/kidan/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

icons/mob/clothing/species/vox/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

icons/obj/clothing/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB