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

Cryo loadout changes + locker stuff #378

Merged
merged 5 commits into from
Sep 3, 2024

Conversation

DexterDude
Copy link
Contributor

Makes it so the Platoon Commander does not start equipped anymore. I assume this was the case because rounds were much quicker in the olden days and they had to go to their office to get their fax quick. This change promotes platoon commanders eating with their marines.
Removes satchels on spawn for all cryo presets. Now that loadout items spawn in lockers, there's no need for satchels.
Removes un-needed weapons from platoon sergeant lockers. Considering they gear up with their marines, they don't need it. UPP platsarge guns stay because they don't gear up with everyone else.
Kills squad sergeant snowflake helmets. They kinda look ugly and aren't needed, I've kept the platoon sergeant helmet so he remains distinct.

code/modules/gear_presets/uscm_ship.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm_ship.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@AndroBetel AndroBetel left a comment

Choose a reason for hiding this comment

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

i got ahead of myself actually...

code/modules/gear_presets/uscm_ship.dm Show resolved Hide resolved
code/modules/gear_presets/uscm.dm Show resolved Hide resolved
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@AndroBetel AndroBetel merged commit 76b76d9 into cmss13-devs:master Sep 3, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants