Skip to content

fixes not being able to remove others' make-up #38856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kurfursten merged 1 commit into from
Jan 7, 2026
Merged

fixes not being able to remove others' make-up #38856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/game/objects/items/weapons/cosmetics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,43 +203,43 @@

var/mob/living/carbon/human/H = M

if(user.zone_sel.selecting == "head")
if(user.zone_sel.selecting == "head" && H.face_style)
if(H == user)
to_chat(user, "<span class='notice'>You wipe off the face paint with [src].</span>")
H.face_style = null
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s face paint off with \the [src].</span>", \
"<span class='notice'>You begin to wipe off [H]'s face paint .</span>")
if(do_after(user, H, 10) && do_after(H, null, 10, 5, 0)) //user needs to keep their active hand, H does not.
if(do_after(user, H, 10)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] wipes [H]'s face paint off with \the [src].</span>", \
"<span class='notice'>You wipe off [H]'s face paint .</span>")
H.face_style = null
H.update_body()

else if(user.zone_sel.selecting == "eyes")
else if(user.zone_sel.selecting == "eyes" && H.eye_style)
if(H == user)
to_chat(user, "<span class='notice'>You wipe off the eyeshadow with [src].</span>")
H.eye_style = null
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s eyeshadow off with \the [src].</span>", \
"<span class='notice'>You begin to wipe off [H]'s eyeshadow.</span>")
if(do_after(user, H, 10) && do_after(H, null, 10, 5, 0)) //user needs to keep their active hand, H does not.
if(do_after(user, H, 10)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] wipes [H]'s eyeshadow off with \the [src].</span>", \
"<span class='notice'>You wipe off [H]'s eyeshadow.</span>")
H.eye_style = null
H.update_body()

else if(user.zone_sel.selecting == "mouth")
else if(user.zone_sel.selecting == "mouth" && H.lip_style)
if(H == user)
to_chat(user, "<span class='notice'>You wipe off the lipstick with [src].</span>")
H.lip_style = null
H.update_body()
else
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
"<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
if(do_after(user, H, 10) && do_after(H, null, 10, 5, 0)) //user needs to keep their active hand, H does not.
if(do_after(user, H, 10)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
"<span class='notice'>You wipe off [H]'s lipstick.</span>")
H.lip_style = null
Expand Down
Loading