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

Human vs human more automated gamemode and UPP changes #6966

Merged
merged 143 commits into from
Nov 8, 2024

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented Aug 17, 2024

About the pull request

stell wanted easier HvH setups so here we are. thanks to Tex Powers for vendor update. I could use maintainer to look at it and tell me proper ways for the naked presets be done and check out the spawner changes fixes #6970

Explain why it's good for the game

easier setup for event is good all admins will have to set amount of open slots for UPP and people can just join them same as they join USCM

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
fix: UPP req vendor no longer spends points
add: adds UPP vs USCM gamemode, event only
ui: adds option to both early and latejoin UPP roles from lobby on UPP vs USCM
add: adds early and latespawners for UPP roles
balance: updates UPP ERT vendors to have 45 points
add: Added standard apparel to every UPP roles to clothing vendor
balance: A lot of changes to upp vendor stuff in order to make them on pair with USCM
add: adds option for spawners to use lists of jobs
add: enables overwatch consoles of other factions
add: UPP squad supply drops
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Aug 17, 2024
code/__DEFINES/mode.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Aug 17, 2024
@cuberound cuberound marked this pull request as ready for review August 18, 2024 13:10
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

code/__DEFINES/mode.dm Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

?

code/modules/mob/new_player/new_player.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/overwatch.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/overwatch.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/overwatch.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft November 4, 2024 09:59
@cuberound cuberound marked this pull request as ready for review November 4, 2024 11:15
code/modules/cm_marines/overwatch.dm Outdated Show resolved Hide resolved
cm13-github added a commit that referenced this pull request Nov 7, 2024
cm13-github added a commit that referenced this pull request Nov 7, 2024
cm13-github added a commit that referenced this pull request Nov 7, 2024
cm13-github added a commit that referenced this pull request Nov 7, 2024
@harryob harryob dismissed stale reviews from Nanu308 and kiVts November 8, 2024 11:26

addressed

@harryob harryob added this pull request to the merge queue Nov 8, 2024
Merged via the queue into cmss13-devs:master with commit a439b48 Nov 8, 2024
27 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Removal snap UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

/obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns value and amount price point to same var
9 participants