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.

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

Shoving someone into a vendor now informs people around them. #26108

Merged
merged 3 commits into from
Jul 3, 2024

Conversation

Spaghetti-bit
Copy link
Contributor

What Does This PR Do

Fixes #26072

Shoving someone into a vendor now informs people around them who shoved the poor sucker.

Why It's Good For The Game

Fixes an oversight.

On late arrival station traits, shove spamming is an issue, you can tell who shoves who into a wall but... not into a vendor meaning that the crime is often let go. People scrambling out of the shuttle like that and shoving one another sporadically like maniacs is... not good.

Images of changes

N/A

Testing

There was a lot of moth-on-moth violence. I shoved a moth into a vendor! And another! And another!

Changelog

馃啈
fix: Fixed vendors not announcing who shoved who into them.
/:cl:

@Spaghetti-bit Spaghetti-bit added the Fix This PR will fix an issue in the game label Jul 2, 2024
Copy link
Contributor

@Fordoxia Fordoxia left a comment

Choose a reason for hiding this comment

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

Cool and epic.

Approved for the crunch.

Copy link
Contributor

@Fordoxia Fordoxia left a comment

Choose a reason for hiding this comment

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

But also probably these should be danger case.

code/game/machinery/vendors/vending.dm Outdated Show resolved Hide resolved
code/game/machinery/vendors/vending.dm Outdated Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Jul 2, 2024
Spaghetti-bit and others added 2 commits July 1, 2024 18:18
Co-authored-by: CRUNCH <[email protected]>
Co-authored-by: Luc <[email protected]>
Signed-off-by: Spaghetti-bit <[email protected]>
Copy link
Contributor

@Fordoxia Fordoxia left a comment

Choose a reason for hiding this comment

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

I suppose having the pacifist smash only be a warning is acceptable.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jul 2, 2024
@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 Jul 3, 2024
@DGamerL DGamerL added this pull request to the merge queue Jul 3, 2024
Merged via the queue into ParadiseSS13:master with commit 06a52c5 Jul 3, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Fix This PR will fix an issue in the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The Proc For Telling You Who Shoved Who Into an Object Doesn't Work With Vendors
7 participants