Skip to content

Commit

Permalink
Shoddy mirror fix (#3802)
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy authored Oct 14, 2024
1 parent 83c89ad commit 2c701e3
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions code/game/objects/structures/mirror.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28)
return TRUE
if(broken || !Adjacent(user))
return TRUE

if(!ishuman(user))
return TRUE
if(mirror_act(user))
return TRUE

/obj/structure/mirror/proc/mirror_act(mob/living/user)
var/mob/living/carbon/human/hairdresser = user

//handle facial hair (if necessary)
Expand Down Expand Up @@ -170,13 +173,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28)
selectable_races[initial(species_type.name)] = species_type
selectable_races = sort_list(selectable_races)

/obj/structure/mirror/magic/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return TRUE
if(!ishuman(user))
return TRUE

/obj/structure/mirror/magic/mirror_act(mob/user)
var/mob/living/carbon/human/amazed_human = user

var/choice = tgui_input_list(user, "Something to change?", "Magical Grooming", list("name", "race", "gender", "hair", "eyes"))
Expand Down Expand Up @@ -306,11 +303,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28)
desc = "Pride cometh before the..."
race_flags = MIRROR_PRIDE

/obj/structure/mirror/magic/pride/attack_hand(mob/user, list/modifiers)
/obj/structure/mirror/magic/pride/mirror_act(mob/living/user)
. = ..()
if(.)
return TRUE

return
user.visible_message(span_danger("<B>The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!</B>"), \
span_notice("Perfect. Much better! Now <i>nobody</i> will be able to resist yo-"))

Expand Down

0 comments on commit 2c701e3

Please sign in to comment.