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

Add Non-Hostile UPP ERT #4713

Merged
merged 5 commits into from
Oct 20, 2023
Merged

Add Non-Hostile UPP ERT #4713

merged 5 commits into from
Oct 20, 2023

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Oct 18, 2023

About the pull request

Adds a non-hostile UPP ERT alternative to the hostile ERT spawn. Has the same chance to spawn as the hostile version.

Explain why it's good for the game

In lore the UPP enjoy a cold war esque relationship with the UA, a possibly neutral ERT helps better reflect this.

Furthermore, as more UPP are added to the game, the need to help shift the community meta regarding UPP away from 100% hostile to 50/50 hostile is going to become more important, this would be 1 small step.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: UPP ERT's have a chance to be neutral to the USCM.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Oct 18, 2023
@JackieEstegado
Copy link
Contributor

You may want to put in an exclusivity check so that a (non admin) UPP ERT of the oppossing friendliness cant spawn if one was spawned earlier (ie by an admin)

@fira
Copy link
Member

fira commented Oct 19, 2023

Funny. A global toggle to ensure consistency might be cool but that means having to hack into ERT code

code/datums/emergency_calls/upp.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/upp.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/upp.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft October 19, 2023 19:43
@Steelpoint Steelpoint marked this pull request as ready for review October 20, 2023 04:56
@harryob harryob added this pull request to the merge queue Oct 20, 2023
Merged via the queue into cmss13-devs:master with commit e953a78 Oct 20, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Oct 20, 2023
@Skatuk
Copy link

Skatuk commented Oct 20, 2023

USCM and UPP are in a hostile situation. If USCM were to get damaged, the UPP would start a war and end them whenever they can. I don't see a reason why they'd want to help eachother when they both want eachothers death. Lore wise they also had the largest conflict between eachother, operation canton being the example. Sorry, but its a no from me.

@Steelpoint Steelpoint deleted the ERTUPP branch July 17, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants