From 195d8a68ec2e18fe03f6f05609286d400dc115ac Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 12 Aug 2019 00:07:22 -0400 Subject: [PATCH] final commit --- code/datums/outfits/plasmamen.dm | 2 +- .../living/carbon/human/species/plasmaman.dm | 4 +- .../mob/living/carbon/human/update_icons.dm | 39 +++++++++--------- icons/mob/species/plasmaman/uniform.dmi | Bin 11381 -> 11383 bytes 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index 594a5802c34..c756a3d30ea 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -3,7 +3,7 @@ head = /obj/item/clothing/head/helmet/space/plasmaman uniform = /obj/item/clothing/under/plasmaman - r_hand= /obj/item/tank/plasma/plasmaman/belt/full + r_hand = /obj/item/tank/plasma/plasmaman/belt/full mask = /obj/item/clothing/mask/breath /datum/outfit/plasmaman/bar diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index ac2538a34b1..0f158f6f9f0 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -114,9 +114,9 @@ O = new /datum/outfit/plasmaman/clown H.equipOutfit(O, visualsOnly) - H.internal = H.get_item_by_slot(H.r_hand) + H.internal = H.r_hand H.update_action_buttons_icon() - return 0 + return FALSE /datum/species/plasmaman/handle_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 73a76e00420..988f4159612 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -931,27 +931,28 @@ var/global/list/damage_icon_parts = list() if(inv) inv.update_icon() if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory))) - var/obj/item/organ/external/head/head_organ = get_organ("head") - var/datum/sprite_accessory/alt_heads/alternate_head - if(head_organ.alt_head && head_organ.alt_head != "None") - alternate_head = GLOB.alt_heads_list[head_organ.alt_head] + if(!(slot_wear_mask in check_obscured_slots())) + var/obj/item/organ/external/head/head_organ = get_organ("head") + var/datum/sprite_accessory/alt_heads/alternate_head + if(head_organ.alt_head && head_organ.alt_head != "None") + alternate_head = GLOB.alt_heads_list[head_organ.alt_head] - var/mutable_appearance/standing - var/icon/mask_icon = new(wear_mask.icon) - if(wear_mask.icon_override) - mask_icon = new(wear_mask.icon_override) - standing = mutable_appearance(wear_mask.icon_override, "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) - else if(wear_mask.sprite_sheets && wear_mask.sprite_sheets[dna.species.name]) - mask_icon = new(wear_mask.sprite_sheets[dna.species.name]) - standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) - else - standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) + var/mutable_appearance/standing + var/icon/mask_icon = new(wear_mask.icon) + if(wear_mask.icon_override) + mask_icon = new(wear_mask.icon_override) + standing = mutable_appearance(wear_mask.icon_override, "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) + else if(wear_mask.sprite_sheets && wear_mask.sprite_sheets[dna.species.name]) + mask_icon = new(wear_mask.sprite_sheets[dna.species.name]) + standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) + else + standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) - if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA) - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood") - bloodsies.color = wear_mask.blood_color - standing.overlays += bloodsies - overlays_standing[FACEMASK_LAYER] = standing + if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA) + var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood") + bloodsies.color = wear_mask.blood_color + standing.overlays += bloodsies + overlays_standing[FACEMASK_LAYER] = standing apply_overlay(FACEMASK_LAYER) diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/species/plasmaman/uniform.dmi index 74e4f5ed23d029b78493cc0f20a84a4c3730bd61..89931b8147dc182955eadfe22029e4930f201bd8 100644 GIT binary patch delta 268 zcmV+n0rUR#Soc`4rviWVdQ@0+L}hbha%pgMX>V=-0C=38)WJ@}FboFZbMq9{c1OUt zazUHW4(t^slX|Toi6h%vx3{MSB(60#Tk@wriR7%?m)-0B&~D%M;ew*XrG0Ln?(Rb~ zQfI@|Y#u{1AoYX&G-_Ztm8+USGh`@7U4^D2(V2$kB#?2gAO3%472{dRZbvK^64o=> z0yTnkSbQc9P`v_AKB1AY7^(SKj|GjQ+f4_|ZZwZ3?%l5AXe>S>{LcTm*asAHheeQ{ zeFRHS1<@G6E#8@q0Ihwb;r S^99?kZ@uL4Vra9Y1JWpiz=oy( delta 268 zcmV+n0rUR%SoK)2rviWTdQ@0+L}hbha%pgMX>V=-0C=30lub?pF$_l6lT$?P9`Uzj zgIZNx&?_L5aWjUA9XW1?-kupiVp+VirT6qDQS5bm-tP8?xOv%!GioE@_!J*+ZbLUw zZ^PU?+=p&J%7gth&A@OjS9OF|pa8Ez*ORtI4Bb(o;8NfHkqv*-Ny#p+$Y)Y%C$g)~ z1ll8ej5I*?@p$y`EfKO&Gmn&!(I`2s`Dn$dEZ`{FY4ws!)MKc;iT^_Hz~l@{pjkWu zawbM}g@6@lu8_|