diff --git a/code/datums/outfits/plasmamen_outfits.dm b/code/datums/outfits/plasmamen_outfits.dm index 38e24ff45fe..5502d71803f 100644 --- a/code/datums/outfits/plasmamen_outfits.dm +++ b/code/datums/outfits/plasmamen_outfits.dm @@ -203,3 +203,15 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/trainer uniform = /obj/item/clothing/under/plasmaman/trainer + +/datum/outfit/plasmaman/navyofficer + name = "Plasmaman Navy Officer" + + head = /obj/item/clothing/head/helmet/space/plasmaman/centcom + uniform = /obj/item/clothing/under/plasmaman/centcom + +/datum/outfit/plasmaman/soo + name = "Plasmaman Special Operations Officer" + + head = /obj/item/clothing/head/helmet/space/plasmaman/centcom/soo + uniform = /obj/item/clothing/under/plasmaman/centcom diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 1ae34482e3f..8bcfdfbd1ef 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -369,3 +369,22 @@ desc = "A plasmaman envirohelm designed for the nanotrasen career trainer." icon_state = "trainer_envirohelm" item_state = "trainer_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/centcom + name = "centeral command envirosuit helmet" + desc = "A plasmaman containment helmet designed for central command officials." + icon_state = "centcom_envirohelm" + item_state = "centcom_envirohelm" + armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150) + +/obj/item/clothing/head/helmet/space/plasmaman/centcom/soo + desc = "A plasmaman containment helmet designed for central command officials. This one has been modified for use by special operations officers." + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + resistance_flags = FIRE_PROOF | ACID_PROOF + flags = STOPSPRESSUREDMAGE | THICKMATERIAL + flags_2 = RAD_PROTECT_CONTENTS_2 + vision_flags = SEE_MOBS + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + HUDType = MEDHUD + see_in_dark = 8 + armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) diff --git a/code/modules/clothing/under/jobs/plasmamen/antags.dm b/code/modules/clothing/under/jobs/plasmamen/antags.dm index c1ec8062825..b521df41caa 100644 --- a/code/modules/clothing/under/jobs/plasmamen/antags.dm +++ b/code/modules/clothing/under/jobs/plasmamen/antags.dm @@ -4,3 +4,13 @@ icon_state = "wizard_envirosuit" item_state = "wizard_envirosuit" item_color = "wizard_envirosuit" + +//technically not an antag but a special role none the less +/obj/item/clothing/under/plasmaman/centcom + name = "centeral command plasma envirosuit" + desc = "A gold trimed envirosuit issued to plasmamen representing the \"N.A.S. Trurl\". Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection." + icon_state = "centcom_envirosuit" + item_state = "centcom_envirosuit" + item_color = "centcom_envirosuit" + armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) + displays_id = FALSE diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index da8355d9ea6..7e4d2bd31f0 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -69,13 +69,13 @@ if("Botanist") O = new /datum/outfit/plasmaman/botany - if("Bartender", "Internal Affairs Agent", "Magistrate", "Nanotrasen Representative", "Nanotrasen Navy Officer") + if("Bartender", "Internal Affairs Agent", "Magistrate", "Nanotrasen Representative") O = new /datum/outfit/plasmaman/bar if("Chef") O = new /datum/outfit/plasmaman/chef - if("Security Officer", "Special Operations Officer") + if("Security Officer") O = new /datum/outfit/plasmaman/security if("Detective") @@ -153,6 +153,12 @@ if("Nanotrasen Career Trainer") O = new /datum/outfit/plasmaman/trainer + if("Nanotrasen Navy Officer") + O = new /datum/outfit/plasmaman/navyofficer + + if("Special Operations Officer", "Trans-Solar Federation General") + O = new /datum/outfit/plasmaman/soo + H.equipOutfit(O, visualsOnly) H.internal = H.r_hand H.update_action_buttons_icon() diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index eb38bc0d99f..dc60d368275 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 79a6c8df413..70ba67ef721 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 6d10fe604a7..5c7dc5c9f00 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 80362fc4331..8f790c16012 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ