diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 3e10609e25a..b9e8cd9f8d0 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -37,14 +37,14 @@ /obj/item/clothing/head/helmet/space/hardsuit/plasmaman name = "plasmaman helmet" desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies." - icon_state = "plasmaman_helmet0-plasma" + icon_state = "plasmaman" item_color = "plasma" //needed for the helmet lighting - item_state = "plasmaman_helmet0" + item_state = "plasmaman" flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL strip_delay = 80 //Removed the NODROP from /helmet/space/hardsuit. flags_inv = HIDEMASK|HIDEEARS|HIDEEYES //Removed the HIDEFACE from /helmet/space/hardsuit - basestate = "plasmaman_helmet" + basestate = "plasmaman" flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 590b64d30f2..1a03dd98d9a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -501,9 +501,9 @@ /obj/item/clothing/under/plasmaman name = "Plasma-man Jumpsuit" desc = "A specially designed suit that allows Plasma based life forms to exist in an oxygenated environment." - icon_state = "sexyclown" - item_state = "sexyclown" - item_color = "sexyclown" + icon_state = "plasmaman" + item_state = "plasmaman" + item_color = "plasmaman" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0) body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS can_adjust = 0 @@ -546,6 +546,7 @@ return return return + /obj/item/device/extinguisher_refill name = "Plasma-man jumpsuit refill pack" desc = "A compressed water pack used to refill plasma-man jumpsuit auto-extinguishers." diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 62189ec11bc..19d61215692 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -445,14 +445,6 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ P.Extinguish(H) H.update_fire() -//Heal from plasma -/datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) - if(chem.id == "plasma") - H.adjustBruteLoss(-5) - H.adjustFireLoss(-5) - H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM) - return 1 - /datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H) var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman H.equipOutfit(O) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3d38396674c..460f6480b2f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index e39c367d060..22687c6623d 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index b7f93f7fbba..631fd9fb0df 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index c7e8ecdd828..42d0ef0e1cf 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 0e81fa537d7..93d76144b71 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 d336d8158ed..fc8ca4bdfbf 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ