diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index c756a3d30ea..c14eafd08f2 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -15,7 +15,7 @@ /datum/outfit/plasmaman/chef name = "Chef Plasmaman" - head = /obj/item/clothing/head/helmet/space/plasmaman/white + head = /obj/item/clothing/head/helmet/space/plasmaman/chef uniform = /obj/item/clothing/under/plasmaman/chef /datum/outfit/plasmaman/botany @@ -61,6 +61,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/security/warden uniform = /obj/item/clothing/under/plasmaman/security/warden +/datum/outfit/plasmaman/hos + name = "Head of Security Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/security/hos + uniform = /obj/item/clothing/under/plasmaman/security/hos + /datum/outfit/plasmaman/cargo name = "Cargo Plasmaman" @@ -79,6 +85,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/medical uniform = /obj/item/clothing/under/plasmaman/medical +/datum/outfit/plasmaman/cmo + name = "Chief Medical Officer Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/cmo + uniform = /obj/item/clothing/under/plasmaman/cmo + /datum/outfit/plasmaman/viro name = "Virology Plasmaman" @@ -103,6 +115,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/science uniform = /obj/item/clothing/under/plasmaman/science +/datum/outfit/plasmaman/rd + name = "Research Director Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/rd + uniform = /obj/item/clothing/under/plasmaman/rd + /datum/outfit/plasmaman/robotics name = "Robotics Plasmaman" @@ -115,6 +133,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/engineering uniform = /obj/item/clothing/under/plasmaman/engineering +/datum/outfit/plasmaman/ce + name = "Chief Engineer Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce + uniform = /obj/item/clothing/under/plasmaman/engineering/ce + /datum/outfit/plasmaman/atmospherics name = "Atmospherics Plasmaman" @@ -133,4 +157,22 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/clown uniform = /obj/item/clothing/under/plasmaman/clown - mask = /obj/item/clothing/mask/gas/clown_hat \ No newline at end of file + mask = /obj/item/clothing/mask/gas/clown_hat + +/datum/outfit/plasmaman/hop + name = "Head of Personnel Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/hop + uniform = /obj/item/clothing/under/plasmaman/hop + +/datum/outfit/plasmaman/captain + name = "Captain Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/captain + uniform = /obj/item/clothing/under/plasmaman/captain + +/datum/outfit/plasmaman/blueshield + name = "Blueshield Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield + uniform = /obj/item/clothing/under/plasmaman/blueshield \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 60a0c754438..fef732ed01b 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -93,12 +93,24 @@ icon_state = "warden_envirohelm" item_state = "warden_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/security/hos + name = "security plasma envirosuit helmet" + desc = "A plasmaman containment helmet designed for the head of security." + icon_state = "hos_envirohelm" + item_state = "hos_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/medical name = "medical's plasma envirosuit helmet" desc = "An envriohelmet designed for plasmaman medical doctors, having two stripes down it's length to denote as much" icon_state = "doctor_envirohelm" item_state = "doctor_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/cmo + name = "chief medical officer's plasma envirosuit helmet" + desc = "An envriohelmet designed for plasmaman employed as the cheif medical officer." + icon_state = "cmo_envirohelm" + item_state = "cmo_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/genetics name = "geneticist's plasma envirosuit helmet" desc = "A plasmaman envirohelmet designed for geneticists." @@ -123,6 +135,12 @@ icon_state = "scientist_envirohelm" item_state = "scientist_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/rd + name = "research director plasma envirosuit helmet" + desc = "A plasmaman envirohelmet designed for the research director." + icon_state = "rd_envirohelm" + item_state = "rd_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/robotics name = "robotics plasma envirosuit helmet" desc = "A plasmaman envirohelmet designed for roboticists." @@ -136,6 +154,12 @@ item_state = "engineer_envirohelm" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 10) +/obj/item/clothing/head/helmet/space/plasmaman/engineering/ce + name = "chief engineer's plasma envirosuit helmet" + desc = "A space-worthy helmet specially designed for chief engineer employed plasmamen." + icon_state = "ce_envirohelm" + item_state = "ce_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/atmospherics name = "atmospherics plasma envirosuit helmet" desc = "A space-worthy helmet specially designed for atmos technician plasmamen, the usual purple stripes being replaced by engineering's blue." @@ -167,6 +191,12 @@ icon_state = "white_envirohelm" item_state = "white_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/chef + name = "chef plasma envirosuit helmet" + desc = "An envirohelm designed for plasmamen chefs." + icon_state = "chef_envirohelm" + item_state = "chef_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/librarian name = "librarian's plasma envirosuit helmet" desc = "A slight modification on a tradiational voidsuit helmet, this helmet was Nano-Trasen's first solution to the *logistical problems* that come with employing plasmamen. Despite their limitations, these helmets still see use by historian and old-styled plasmamen alike." @@ -199,4 +229,22 @@ desc = "The make-up is painted on, it's a miracle it doesn't chip. 'HONK!'" icon_state = "clown_envirohelm" item_state = "clown_envirohelm" - visor_icon = "clown_envisor" \ No newline at end of file + visor_icon = "clown_envisor" + +/obj/item/clothing/head/helmet/space/plasmaman/hop + name = "head of personnel envirosuit helmet" + desc = "A plasmaman envirohelm that reeks of bureaucracy." + icon_state = "hop_envirohelm" + item_state = "hop_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/captain + name = "captain envirosuit helmet" + desc = "A plasmaman envirohelm designed with the insignia and markings befitting a captain." + icon_state = "cap_envirohelm" + item_state = "cap_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/blueshield + name = "blueshield envirosuit helmet" + desc = "A plasmaman envirohelm designed for the blueshield." + icon_state = "bs_envirohelm" + item_state = "bs_envirohelm" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm index 7659805f3a2..617e0284848 100644 --- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm +++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm @@ -29,6 +29,9 @@ next_extinguish = world.time + extinguish_cooldown extinguishes_left-- H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") + if(!extinguishes_left) + to_chat(H, "Onboard auto-extinguisher depleted, refill with a cartridge.") + playsound(H.loc, 'sound/effects/spray.ogg', 10, 1, -3) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) return FALSE diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 79253894d12..69697d3be6f 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -84,3 +84,24 @@ H.ExtinguishMob() new /obj/effect/particle_effect/foam(loc) //Truely terrifying. return FALSE + +/obj/item/clothing/under/plasmaman/hop + name = "head of personnel envirosuit" + desc = "An envirosuit designed for plasmamen employed as the head of personnel." + icon_state = "hop_envirosuit" + item_state = "hop_envirosuit" + item_color = "hop_envirosuit" + +/obj/item/clothing/under/plasmaman/captain + name = "captain envirosuit" + desc = "An envirosuit designed for plasmamen employed as the captain." + icon_state = "cap_envirosuit" + item_state = "cap_envirosuit" + item_color = "cap_envirosuit" + +/obj/item/clothing/under/plasmaman/blueshield + name = "blueshield envirosuit" + desc = "An envirosuit designed for plasmamen employed as the blueshield." + icon_state = "bs_envirosuit" + item_state = "bs_envirosuit" + item_color = "bs_envirosuit" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering.dm b/code/modules/clothing/under/jobs/plasmamen/engineering.dm index 1429ef28929..e83eef2917c 100644 --- a/code/modules/clothing/under/jobs/plasmamen/engineering.dm +++ b/code/modules/clothing/under/jobs/plasmamen/engineering.dm @@ -6,6 +6,13 @@ item_color = "engineer_envirosuit" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 10) +/obj/item/clothing/under/plasmaman/engineering/ce + name = "chief engineer plasma envirosuit" + desc = "An air-tight suit designed to be used by plasmamen exployed as the chief engineer" + icon_state = "ce_envirosuit" + item_state = "ce_envirosuit" + item_color = "ce_envirosuit" + /obj/item/clothing/under/plasmaman/atmospherics name = "atmospherics plasma envirosuit" desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue." diff --git a/code/modules/clothing/under/jobs/plasmamen/medsci.dm b/code/modules/clothing/under/jobs/plasmamen/medsci.dm index 5aa61e7faf7..69e14c0e878 100644 --- a/code/modules/clothing/under/jobs/plasmamen/medsci.dm +++ b/code/modules/clothing/under/jobs/plasmamen/medsci.dm @@ -5,6 +5,13 @@ item_state = "doctor_envirosuit" item_color = "doctor_envirosuit" +/obj/item/clothing/under/plasmaman/cmo + name = "cmo plasma envirosuit" + desc = "A suit designed for the station's more plasma-based chief medical officer." + icon_state = "cmo_envirosuit" + item_state = "cmo_envirosuit" + item_color = "cmo_envirosuit" + /obj/item/clothing/under/plasmaman/science name = "science plasma envirosuit" desc = "A plasmaman envirosuit designed for scientists." @@ -12,6 +19,13 @@ item_state = "scientist_envirosuit" item_color = "scientist_envirosuit" +/obj/item/clothing/under/plasmaman/rd + name = "science plasma envirosuit" + desc = "A plasmaman envirosuit designed for the research director." + icon_state = "rd_envirosuit" + item_state = "rd_envirosuit" + item_color = "rd_envirosuit" + /obj/item/clothing/under/plasmaman/robotics name = "robotics plasma envirosuit" desc = "A plasmaman envirosuit designed for roboticists." diff --git a/code/modules/clothing/under/jobs/plasmamen/security.dm b/code/modules/clothing/under/jobs/plasmamen/security.dm index e4332d5f5dd..d6f85da06f7 100644 --- a/code/modules/clothing/under/jobs/plasmamen/security.dm +++ b/code/modules/clothing/under/jobs/plasmamen/security.dm @@ -12,3 +12,10 @@ icon_state = "warden_envirosuit" item_state = "warden_envirosuit" item_color = "warden_envirosuit" + +/obj/item/clothing/under/plasmaman/security/hos + name = "head of security plasma envirosuit" + desc = "A plasmaman containment suit designed for the head of security." + icon_state = "hos_envirosuit" + item_state = "hos_envirosuit" + item_color = "hos_envirosuit" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 0f158f6f9f0..b75132c7bc6 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -62,13 +62,13 @@ if("Botanist") O = new /datum/outfit/plasmaman/botany - if("Bartender", "Internal Affairs Agent", "Magistrate", "Nanotrasen Representative", "Nanotrasen Navy Officer", "Head of Personnel", "Captain", "Blueshield") + if("Bartender", "Internal Affairs Agent", "Magistrate", "Nanotrasen Representative", "Nanotrasen Navy Officer") O = new /datum/outfit/plasmaman/bar if("Chef") O = new /datum/outfit/plasmaman/chef - if("Security Officer", "Security Pod Pilot", "Head of Security", "Special Operations Officer") + if("Security Officer", "Security Pod Pilot", "Special Operations Officer") O = new /datum/outfit/plasmaman/security if("Detective") @@ -77,15 +77,21 @@ if("Warden") O = new /datum/outfit/plasmaman/warden + if("Head of Security") + O = new /datum/outfit/plasmaman/hos + if("Cargo Technician", "Quartermaster") O = new /datum/outfit/plasmaman/cargo if("Shaft Miner") O = new /datum/outfit/plasmaman/mining - if("Medical Doctor", "Brig Physician", "Paramedic", "Coroner", "Chief Medical Officer") + if("Medical Doctor", "Brig Physician", "Paramedic", "Coroner") O = new /datum/outfit/plasmaman/medical + if("Chief Medical Officer") + O = new /datum/outfit/plasmaman/cmo + if("Chemist") O = new /datum/outfit/plasmaman/chemist @@ -98,12 +104,18 @@ if("Virologist") O = new /datum/outfit/plasmaman/viro - if("Scientist", "Research Director") + if("Scientist") O = new /datum/outfit/plasmaman/science - if("Station Engineer", "Mechanic", "Chief Engineer") + if("Research Director") + O = new /datum/outfit/plasmaman/rd + + if("Station Engineer", "Mechanic") O = new /datum/outfit/plasmaman/engineering + if("Chief Engineer") + O = new /datum/outfit/plasmaman/ce + if("Atmospheric Technician") O = new /datum/outfit/plasmaman/atmospherics @@ -113,6 +125,15 @@ if("Clown") O = new /datum/outfit/plasmaman/clown + if("Head of Personnel") + O = new /datum/outfit/plasmaman/hop + + if("Captain") + O = new /datum/outfit/plasmaman/captain + + if("Blueshield") + O = new /datum/outfit/plasmaman/blueshield + H.equipOutfit(O, visualsOnly) H.internal = H.r_hand H.update_action_buttons_icon() diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/species/plasmaman/helmet.dmi index bfc863116a8..ebcb096aa7b 100644 Binary files a/icons/mob/species/plasmaman/helmet.dmi and b/icons/mob/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/species/plasmaman/uniform.dmi index 89931b8147d..6667746c438 100644 Binary files a/icons/mob/species/plasmaman/uniform.dmi and b/icons/mob/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index 95eb5c61a14..60282c030fe 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 81f0ad2933e..bc3f4d59a50 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ