diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index adbb0d9120c..4c2ceef46cf 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -104,6 +104,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/cargo uniform = /obj/item/clothing/under/plasmaman/cargo +/datum/outfit/plasmaman/qm + name = "Quartermaster Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/qm + uniform = /obj/item/clothing/under/plasmaman/qm + /datum/outfit/plasmaman/mining name = "Mining Plasmaman" @@ -116,6 +122,24 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/medical uniform = /obj/item/clothing/under/plasmaman/medical +/datum/outfit/plasmaman/brigdoc + name = "Brigmed Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/brigphysician + uniform = /obj/item/clothing/under/plasmaman/brigphysician + +/datum/outfit/plasmaman/paramedic + name = "Paramedic Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/paramedic + uniform = /obj/item/clothing/under/plasmaman/paramedic + +/datum/outfit/plasmaman/coroner + name = "Coroner Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/coroner + uniform = /obj/item/clothing/under/plasmaman/coroner + /datum/outfit/plasmaman/cmo name = "Chief Medical Officer Plasmaman" @@ -173,7 +197,7 @@ /datum/outfit/plasmaman/engineering/mecha name = "Mechanic Plasmaman" head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/mecha - uniform = /obj/item/clothing/under/plasmaman/engineering + uniform = /obj/item/clothing/under/plasmaman/mechanic /datum/outfit/plasmaman/ce name = "Chief Engineer Plasmaman" diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index cb45dbfe08f..292f6636e5c 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -149,6 +149,24 @@ HUDType = DATA_HUD_MEDICAL_ADVANCED examine_extensions = EXAMINE_HUD_MEDICAL +/obj/item/clothing/head/helmet/space/plasmaman/medical/brigphysician + name = "brig physician's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman brig doctors, having two red stripes down its length to denote as much." + icon_state = "brigphysician_envirohelm" + item_state = "brigphysician_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/medical/coroner + name = "coroner's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman coroners, having two white stripes down its length to denote as much." + icon_state = "coroner_envirohelm" + item_state = "coroner_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/medical/paramedic + name = "paramedic's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman paramedics, having two white stripes down its length to denote as much." + icon_state = "paramedic_envirohelm" + item_state = "paramedic_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/cmo name = "chief medical officer's plasma envirosuit helmet" desc = "An envirohelmet designed for plasmamen employed as the chief medical officer." @@ -229,9 +247,9 @@ /obj/item/clothing/head/helmet/space/plasmaman/engineering/mecha name = "mechanic plasma envirosuit helmet" - desc = "A space-worthy helmet specially designed for engineer plasmamen, the usual purple stripes being replaced by engineering's orange." - icon_state = "engineer_envirohelm" - item_state = "engineer_envirohelm" + desc = "A space-worthy helmet specially designed for mechanic plasmamen, the usual purple stripes being replaced by engineering's orange." + icon_state = "mechanic_envirohelm" + item_state = "mechanic_envirohelm" HUDType = DATA_HUD_DIAGNOSTIC /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce @@ -258,10 +276,16 @@ /obj/item/clothing/head/helmet/space/plasmaman/cargo name = "cargo plasma envirosuit helmet" - desc = "A plasmaman envirohelmet designed for cargo techs and quartermasters." + desc = "A plasmaman envirohelmet designed for cargo techs." icon_state = "cargo_envirohelm" item_state = "cargo_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/qm + name = "quartermaster's plasma envirosuit helmet" + desc = "A plasmaman envirohelmet designed for quartermasters." + icon_state = "qm_envirohelm" + item_state = "qm_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/mining name = "mining plasma envirosuit helmet" desc = "A khaki helmet given to plasmaman miners operating on Lavaland." diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 6e86461364c..1ba0eb88171 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/plasmaman/cargo name = "cargo plasma envirosuit" - desc = "An envirosuit used by plasmaman quartermasters and cargo techs alike, due to the logistical problems of differentiating the two by the length of their pant legs." + desc = "An envirosuit used by plasmaman cargo techs, due to the logistical problems of differentiating the two by the length of their pant legs." icon_state = "cargo_envirosuit" item_state = "cargo_envirosuit" item_color = "cargo_envirosuit" @@ -12,6 +12,12 @@ item_state = "explorer_envirosuit" item_color = "explorer_envirosuit" +/obj/item/clothing/under/plasmaman/qm + name = "quartermaster plasma envirosuit" + desc = "An envirosuit used by plasmaman quartermasters, due to the logistical problems of differentiating the two by the length of their pant legs." + icon_state = "qm_envirosuit" + item_state = "qm_envirosuit" + item_color = "qm_envirosuit" /obj/item/clothing/under/plasmaman/chef name = "chef's plasma envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering.dm b/code/modules/clothing/under/jobs/plasmamen/engineering.dm index 8b4e59bbb93..f17d80f6304 100644 --- a/code/modules/clothing/under/jobs/plasmamen/engineering.dm +++ b/code/modules/clothing/under/jobs/plasmamen/engineering.dm @@ -19,3 +19,9 @@ item_state = "atmos_envirosuit" item_color = "atmos_envirosuit" +/obj/item/clothing/under/plasmaman/mechanic + name = "mechanic plasma envirosuit" + desc = "An airtight suit designed to be used by plasmamen employed as mechanics, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage." + icon_state = "mechanic_envirosuit" + item_state = "mechanic_envirosuit" + item_color = "mechanic_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/medsci.dm b/code/modules/clothing/under/jobs/plasmamen/medsci.dm index 531bc3fb124..1cba254830e 100644 --- a/code/modules/clothing/under/jobs/plasmamen/medsci.dm +++ b/code/modules/clothing/under/jobs/plasmamen/medsci.dm @@ -53,3 +53,24 @@ icon_state = "chemist_envirosuit" item_state = "chemist_envirosuit" item_color = "chemist_envirosuit" + +/obj/item/clothing/under/plasmaman/brigphysician + name = "brigphysician plasma envirosuit" + desc = "A plasmaman envirosuit designed for brigphysicians." + icon_state = "brigphysician_envirosuit" + item_state = "brigphysician_envirosuit" + item_color = "brigphysician_envirosuit" + +/obj/item/clothing/under/plasmaman/coroner + name = "coroner plasma envirosuit" + desc = "A plasmaman envirosuit designed for coroners." + icon_state = "coroner_envirosuit" + item_state = "coroner_envirosuit" + item_color = "coroner_envirosuit" + +/obj/item/clothing/under/plasmaman/paramedic + name = "paramedic plasma envirosuit" + desc = "A plasmaman envirosuit designed for paramedics." + icon_state = "paramedic_envirosuit" + item_state = "paramedic_envirosuit" + item_color = "paramedic_envirosuit" diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index d9982ae1f02..41a5e79ee60 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -140,15 +140,27 @@ if(JOB_TITLE_HOS) O = new /datum/outfit/plasmaman/hos - if(JOB_TITLE_CARGOTECH, JOB_TITLE_QUARTERMASTER) + if(JOB_TITLE_CARGOTECH) O = new /datum/outfit/plasmaman/cargo + if(JOB_TITLE_QUARTERMASTER) + O = new /datum/outfit/plasmaman/qm + if(JOB_TITLE_MINER) O = new /datum/outfit/plasmaman/mining - if(JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_BRIGDOC, JOB_TITLE_PARAMEDIC, JOB_TITLE_CORONER) + if(JOB_TITLE_DOCTOR, JOB_TITLE_INTERN) O = new /datum/outfit/plasmaman/medical + if(JOB_TITLE_BRIGDOC) + O = new /datum/outfit/plasmaman/brigdoc + + if(JOB_TITLE_PARAMEDIC) + O = new /datum/outfit/plasmaman/paramedic + + if(JOB_TITLE_CORONER) + O = new /datum/outfit/plasmaman/coroner + if(JOB_TITLE_CMO) O = new /datum/outfit/plasmaman/cmo diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index fb1262d618e..84c134a4867 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 367238253c7..bc3fa9ab1c9 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index daecb1d4de5..f0eeeb903e8 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index aa5e2230b06..a855ad214b7 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ