Skip to content

[MIRROR] [MIRROR] Fixes Strip #3290

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

Open
VoRe-bot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MIRROR] [MIRROR] Fixes Strip #3290

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
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/stripping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@
visible_message(span_danger("\The [user] is trying to put \a [G.wrapped] on \the [src]!"))
//CHOMPEdit End

<<<<<<< HEAD

Check failure on line 109 in code/modules/mob/living/carbon/human/stripping.dm

View workflow job for this annotation

GitHub Actions / DreamChecker 

got '<<', expected one of: ';', '//!', '/*!', '/'
if(!do_after(user,HUMAN_STRIP_DELAY,src))
=======
if(!do_after(user, HUMAN_STRIP_DELAY, target = src, max_interact_count = 15))
>>>>>>> 7401d6fba9 ([MIRROR] Fixes Strip (#11781))
return

if(!stripping)
Expand Down
Loading