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

Already on GitHub? Sign in to your account

Jump to bottom

UPP Operations #108

Merged
merged 87 commits into from
Mar 4, 2024
Merged

UPP Operations #108

merged 87 commits into from
Mar 4, 2024

Conversation

AndroBetel
Copy link
Contributor

@AndroBetel AndroBetel commented Feb 5, 2024 •
edited
Loading

Adds new shipmap - SSV Chapaev along with NAVAL INFANTRY Platoon "Red Dawn"
Buffs some UPP weapons to be on par with PVE USCM weapons
Gives new button to GMs that allows them to choose which type of platoon to deploy (only two are available rn - upp and default one)

@AndroBetel AndroBetel changed the title [TM ONLY] UPP Operations UPP Operations Feb 7, 2024
@FslashN FslashN added the needs tested testmerge this to see what breaks label Feb 7, 2024
@FslashN
Copy link
Contributor

FslashN commented Feb 7, 2024

I've looked through it and everything appears to be present. Definitely needs to be tested in a few games to make sure everything is working correctly, but otherwise I don't see any immediate problems. The GM button allows one to change what map/platoon is used when the game round has not started, which is fine.

My only real concern is that people will use their marine characters on this, which can be immersion breaking.

@AndroBetel
Copy link
Contributor Author

i consider this pr to be ready for testing!

@FslashN
Copy link
Contributor

FslashN commented Feb 8, 2024

i consider this pr to be ready for testing!

Cool. It is currently test merged and should be available for GMs.

morrowwolf
morrowwolf requested changes Feb 26, 2024
View reviewed changes
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

Code review, will take a look at sprites/maps now

code/datums/ammo/bullet/special_ammo.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm Outdated Show resolved Hide resolved
code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm Show resolved Hide resolved
code/game/objects/items/devices/radio/headset.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/marine_armor.dm Show resolved Hide resolved
code/modules/defenses/sentry.dm Show resolved Hide resolved
code/modules/gear_presets/uscm.dm Outdated Show resolved Hide resolved
morrowwolf
morrowwolf reviewed Feb 26, 2024
View reviewed changes
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

Mapping/sprites seem fine

@morrowwolf morrowwolf marked this pull request as draft February 26, 2024 19:53
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

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

@AndroBetel AndroBetel marked this pull request as ready for review February 27, 2024 11:25
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

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

@morrowwolf morrowwolf enabled auto-merge (squash) March 4, 2024 18:22
@morrowwolf morrowwolf merged commit bab7c3e into cmss13-devs:master Mar 4, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FslashN FslashN FslashN left review comments

@morrowwolf morrowwolf morrowwolf approved these changes

@fira fira Awaiting requested review from fira fira is a code owner

Assignees
No one assigned
Labels
needs tested testmerge this to see what breaks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AndroBetel @FslashN @morrowwolf