Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Being slapped now wakes you up #22408

Merged
merged 5 commits into from Sep 17, 2023
Merged

Being slapped now wakes you up #22408

merged 5 commits into from Sep 17, 2023

Conversation

Henri215
Copy link
Member

What Does This PR Do

Being slapped now wakes you up, 1.5 times more effective than just using help intent.

Why It's Good For The Game

Suggestion from https://www.paradisestation.org/forum/topic/24314-slapping-someone-should-wake-them-up/#comment-173944.
This is a behavior one would expect from slaps.

Testing

  • Used the abductor baton to make multiple skrells sleep
  • Slapped them to WAKE THEM UP!

Changelog

馃啈
tweak: Being slapped now wakes you up
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Sep 14, 2023
Henri215 and others added 2 commits September 14, 2023 19:07
@Henri215 @DGamerL
Update code/game/objects/items/hand_item.dm
142ab23 
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
@Henri215
lets make this run
ca5fab6
DGamerL
DGamerL approved these changes Sep 14, 2023
View reviewed changes
Copy link
Member

@DGamerL DGamerL left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha! You fell into my trap and made your Cl fail!

Edit: My laywers make me say that it was on accident and I didn't look well enough at how the proc was defined

@SteelSlayer SteelSlayer added the Tweak This PR tweaks something ingame label Sep 15, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Sep 15, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Sep 16, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Sep 16, 2023
@S34NW S34NW merged commit baf810e into ParadiseSS13:master Sep 17, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lewcc lewcc lewcc approved these changes

@DGamerL DGamerL DGamerL approved these changes

@Burzah Burzah Burzah approved these changes

Assignees
No one assigned
Labels
-Status: Awaiting merge This PR is ready for merge Tweak This PR tweaks something ingame
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Henri215 @lewcc @DGamerL @Burzah @S34NW @ParadiseSS13-Bot @SteelSlayer