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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port: Disable round end pacifism and add a new command to pacify everyone #2642

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Lyndomen
Copy link
Contributor

@Lyndomen Lyndomen commented Jan 7, 2025

About the PR

Ports ss14-harmony/space-station-14#273

I have removed the automatic forced pacifism when the round ends.
I also added a new command that forces everyone to be pacified.

Why / Balance

pacifism kinda sucks, and sec has to watch antags go "i killed ur boss lol"

Firstly, it does not succeed at all at stopping EORG, there are many ways of doing EORG that are simply still possible, even with forced pacifism, such as using thieving gloves or breaking structures.
Secondly, I believe it stops actual RP from happening and just makes the end of round feel even more disconnected from the rest of the round. There are many situations where players might still have a very good reason to be fighting at CC. This breaks RP enough for me that I would honestly prefer someone trying to EORG every round over forced pacifism.

Technical details

I moved the roundend stuff to a Harmony folder

Moved the forced pacifism code from an end of round system to a new command.
None of the actual pacifism code was changed.

Media

pacifyall command real image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

  • add: Ports pacifism tweaks from Harmony, allowing some violence at CC. Don't grief, but continue to roleplay! Thank you youtissoum.

@Lyndomen Lyndomen requested a review from a team as a code owner January 7, 2025 18:27
@github-actions github-actions bot added size/M 64-255 lines S: Needs Review Changes: C# Changes any cs files labels Jan 7, 2025
@Lyndomen
Copy link
Contributor Author

Lyndomen commented Jan 7, 2025

24 hours dir review

@Lyndomen
Copy link
Contributor Author

Lyndomen commented Jan 7, 2025

prolly admeme review too

@beck-thompson
Copy link
Contributor

test fail is real unfortunately

@Lyndomen
Copy link
Contributor Author

Lyndomen commented Jan 7, 2025

Whelp I am in shambles

@deltanedas deltanedas requested a review from a team January 8, 2025 03:41
/// <summary>
/// Whether the no EORG popup is enabled.
/// </summary>
public static readonly CVarDef<bool> RoundEndNoEorgPopup =
Copy link
Member

Choose a reason for hiding this comment

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

unremove

@Sifb26
Copy link
Contributor

Sifb26 commented Jan 8, 2025

Direction consensus is to test merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants