diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 97eb723c77e..b94861539e6 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -181,12 +181,16 @@ /obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(mutable_appearance/standing, isinhands) . = ..() if(!isinhands && !up) - . += mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', visor_icon) + // BUBBER EDIT START + . += mutable_appearance(worn_icon, visor_icon) + // BUBBER EDIT END /obj/item/clothing/head/helmet/space/plasmaman/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands = FALSE, icon_file) . = ..() if(!isinhands && smile) - var/mutable_appearance/smiley = mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', smile_state) + // BUBBER EDIT START + var/mutable_appearance/smiley = mutable_appearance(worn_icon, smile_state) + // BUBBER EDIT END smiley.color = smile_color . += smiley @@ -206,6 +210,10 @@ if(!up) to_chat(user, span_notice("Your helmet's torch can't pass through your welding visor!")) set_light_on(FALSE) + // BUBBER EDIT ADDITION START + helmet_on = FALSE + update_appearance() + // BUBBER EDIT ADDITION END else set_light_on(TRUE) else diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi index d0672e32582..6fd4c4373e4 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 3d5130df91e..12c62cd3d2f 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -864,6 +864,7 @@ icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi' icon_state = "emissionhelm" + visor_icon = "emissionhelm-envisor" // Donation reward for CandleJax /obj/item/clothing/head/helmet/space/plasmaman/candlejax2 @@ -872,6 +873,7 @@ icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi' icon_state = "anahead" + visor_icon = "anahead-envisor" // Donation reward for CandleJax /obj/item/clothing/under/plasmaman/candlejax diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index 63c6a6951b3..aecf5bdfe9a 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -685,3 +685,12 @@ /obj/item/clothing/head/hooded/ablative // new teshari sprites worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + +/obj/item/clothing/head/helmet/space/plasmaman/plasmax_black + name = "plasMAX envirosuit helmet" + desc = "Extra large version of plasmaman helmet, made to fit those with non-humanoid skulls." + icon = 'modular_zubbers/icons/obj/clothing/head/helmet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi' + icon_state = "plasmax_black" + light_color = "#f399ff" + visor_icon = "plasmax_black-envisor" diff --git a/modular_zubbers/code/modules/loadout/categories/heads.dm b/modular_zubbers/code/modules/loadout/categories/heads.dm index 82949ffe72c..a89dd764dc1 100644 --- a/modular_zubbers/code/modules/loadout/categories/heads.dm +++ b/modular_zubbers/code/modules/loadout/categories/heads.dm @@ -181,3 +181,7 @@ name = "Imperial Police Helmet" item_path = /obj/item/clothing/head/helmet/nri_police restricted_roles = list(JOB_CUSTOMS_AGENT) + +/datum/loadout_item/head/soft/plasmax_black + name = "PlasMAX Envirosuit Helmet" + item_path = /obj/item/clothing/head/helmet/space/plasmaman/plasmax_black diff --git a/modular_zubbers/icons/mob/clothing/head/helmet.dmi b/modular_zubbers/icons/mob/clothing/head/helmet.dmi index 7f91a437591..2179a8d865e 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/helmet.dmi and b/modular_zubbers/icons/mob/clothing/head/helmet.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/head/helmet.dmi b/modular_zubbers/icons/obj/clothing/head/helmet.dmi index f45d4b8634f..01cf10328c5 100644 Binary files a/modular_zubbers/icons/obj/clothing/head/helmet.dmi and b/modular_zubbers/icons/obj/clothing/head/helmet.dmi differ