diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 9d7b0dd3..1df6633e 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -126,3 +126,34 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/clown uniform = /obj/item/clothing/under/plasmaman/clown mask = /obj/item/clothing/mask/gas/clown_hat + +/datum/outfit/plasmaman/captain + name = "Plasmaman Captain" + head = /obj/item/clothing/head/helmet/space/plasmaman/captain + uniform = /obj/item/clothing/under/plasmaman/captain + +/datum/outfit/plasmaman/hop + name = "Plasmaman Head of Personnel" + head = /obj/item/clothing/head/helmet/space/plasmaman/hop + uniform = /obj/item/clothing/under/plasmaman/hop + +/datum/outfit/plasmaman/ce + name = "Plasmaman Chief Engineer" + head = /obj/item/clothing/head/helmet/space/plasmaman/ce + uniform = /obj/item/clothing/under/plasmaman/ce + +/datum/outfit/plasmaman/cmo + name = "Plasmaman Chief Medical Officer" + head = /obj/item/clothing/head/helmet/space/plasmaman/cmo + uniform = /obj/item/clothing/under/plasmaman/cmo + +/datum/outfit/plasmaman/rd + name = "Plasmaman Research Director" + head = /obj/item/clothing/head/helmet/space/plasmaman/rd + uniform = /obj/item/clothing/under/plasmaman/rd + +/datum/outfit/plasmaman/hos + name = "Plasmaman Head of Security" + head = /obj/item/clothing/head/helmet/space/plasmaman/hos + uniform = /obj/item/clothing/under/plasmaman/hos + diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index e4ba758d..f6ddbf02 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -267,4 +267,46 @@ icon_state = "clown_envirohelm" item_state = "clown_envirohelm" visor_icon = "clown_envisor" - smile_state = "clown_smile" \ No newline at end of file + smile_state = "clown_smile" + +/obj/item/clothing/head/helmet/space/plasmaman/captain + name = "captain envirosuit helmet" + desc = "A blue and gold envirosuit helmet designed only for the most important plasmaman on board." + icon_state = "captain_envirohelm" + item_state = "captain_envirohelm" + armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/head/helmet/space/plasmaman/hop + name = "head of personnel envirosuit helmet" + desc = "A blue envirosuit helmet with red details. The plasma bureaucrat's helmet of choice. Not that he has much choice, anyway." + icon_state = "hop_envirohelm" + item_state = "hop_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/ce + name = "chief engineer envirosuit helmet" + desc = "A durable yellow and white envirosuit helmet with green stripes. It reflects lights for high visibility of the wearer. The Chief Engineer must stand out, after all." + icon_state = "ce_envirohelm" + item_state = "ce_envirohelm" + armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 90) + +/obj/item/clothing/head/helmet/space/plasmaman/cmo + name = "chief medical officer envirosuit helmet" + desc = "A light blue envirosuit helmet with white stripes. It looks very clean. Let the plasma bring health to those who need it (the healing, not plasma)." + icon_state = "cmo_envirohelm" + item_state = "cmo_envirohelm" + armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/head/helmet/space/plasmaman/rd + name = "research director envirosuit helmet" + desc = "An envirosuit helmet with a bizarrely unfitting black and white coloration. Has extended cranium space for the biggest egghead on board." + icon_state = "rd_envirohelm" + item_state = "rd_envirohelm" + visor_icon = "rd_envisor" + armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 80) + +/obj/item/clothing/head/helmet/space/plasmaman/hos + name = "head of security envirosuit helmet" + desc = "A red and black envirosuit helmet with golden stripes. It is well-armored. All must bow before the Purple Skeleton of Law." + icon_state = "hos_envirohelm" + item_state = "hos_envirohelm" + armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 95) diff --git a/code/modules/clothing/under/jobs/Plasmaman/command.dm b/code/modules/clothing/under/jobs/Plasmaman/command.dm new file mode 100644 index 00000000..a32c2f3e --- /dev/null +++ b/code/modules/clothing/under/jobs/Plasmaman/command.dm @@ -0,0 +1,47 @@ +/obj/item/clothing/under/plasmaman/captain + name = "captain plasma envirosuit" + desc = "A blue and gold envirosuit designed only for the most important plasmaman on board." + icon_state = "captain_envirosuit" + item_state = "captain_envirosuit" + item_color = "captain_envirosuit" + armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/under/plasmaman/hop + name = "head of personnel plasma envirosuit" + desc = "A blue envirosuit with red details and a snazzy imitation collar. The plasma bureaurcrat's outfit of choice. Not that he has much choice, anyway." + icon_state = "hop_envirosuit" + item_state = "hop_envirosuit" + item_color = "hop_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/under/plasmaman/ce + name = "chief engineer plasma envirosuit" + desc = "A durable envirosuit with a highly reflective surface. Stand out from the working crowd, skeleton." + icon_state = "ce_envirosuit" + item_state = "ce_envirosuit" + item_color = "ce_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/under/plasmaman/cmo + name = "chief medical officer plasma envirosuit" + desc = "A light blue and white envirosuit with a big white reflective cross on the chest. Here to save your lives and breath some plasma." + icon_state = "cmo_envirosuit" + item_state = "cmo_envirosuit" + item_color = "cmo_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/under/plasmaman/rd + name = "research director plasma envirosuit" + desc = "A snazzy brown envirosuit imitating the uniform of a less boney-phoroney Research Director. For the king of plasma and science." + icon_state = "rd_envirosuit" + item_state = "rd_envirosuit" + item_color = "rd_envirosuit" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) + +/obj/item/clothing/under/plasmaman/hos + name = "head of security plasma envirosuit" + desc = "A crimson red envirosuit with black and gold details. For a real law revenant." + icon_state = "hos_envirosuit" + item_state = "hos_envirosuit" + item_color = "hos_envirosuit" + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 4eb0a1e5..5abb6945 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -119,6 +119,24 @@ if("Clown") O = new /datum/outfit/plasmaman/clown + if("Captain") + O = new /datum/outfit/plasmaman/captain + + if("Head of Personnel") + O = new /datum/outfit/plasmaman/hop + + if("Chief Engineer") + O = new /datum/outfit/plasmaman/ce + + if("Chief Medical Officer") + O = new /datum/outfit/plasmaman/cmo + + if("Research Director") + O = new /datum/outfit/plasmaman/rd + + if("Head of Security") + O = new /datum/outfit/plasmaman/hos + H.equipOutfit(O, visualsOnly) H.internal = H.get_item_for_held_index(2) H.update_internals_hud_icon(1) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b21c68bc..c6c1844a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 671743f2..a2e286d7 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 33db51e1..c568ea27 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 20045222..b81863b8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a9ea9f06..7aa5d8ae 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1700,6 +1700,7 @@ #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\jobs\Plasmaman\civilian_service.dm" +#include "code\modules\clothing\under\jobs\Plasmaman\command.dm" #include "code\modules\clothing\under\jobs\Plasmaman\engineering.dm" #include "code\modules\clothing\under\jobs\Plasmaman\medsci.dm" #include "code\modules\clothing\under\jobs\Plasmaman\security.dm"