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

loadout items now spawn in lockers in dorms + persistent GM medals !!!NEED TESTING!!! #123

Merged
merged 30 commits into from
Mar 12, 2024

Conversation

AndroBetel
Copy link
Contributor

i'm not smart enough to set up a database for medals to spawn but i hope it works out, still needs testing

@morrowwolf morrowwolf added the needs tested testmerge this to see what breaks label Feb 26, 2024
@FslashN FslashN marked this pull request as draft February 29, 2024 01:48
Copy link
Contributor

@FslashN FslashN left a comment

Choose a reason for hiding this comment

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

Very soulful. Small issue:
Squad sergeants don't seem to spawn with a personal locker from what we were able to discover.
Update: Apparently the lockers do exist in the sergeant room, just kind of hard to find. Maybe something to address with mapping.

Also consider combining the cryo lockers with the personal lockers, so marines get all of their gear from their personal locker instead of two different lockers.

@AndroBetel
Copy link
Contributor Author

sgt and pltsgt lockers moved to dorms
removed cryo lockers, added cryo gear to personal lockers
"persistent" medals tested and they should work, might need a bit of tweaking, but for now they're fine

@AndroBetel AndroBetel marked this pull request as ready for review February 29, 2024 08:34
code/game/objects/structures/crates_lockers/closets.dm Outdated Show resolved Hide resolved
code/game/objects/structures/crates_lockers/closets.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft March 4, 2024 18:29
@private-tristan
Copy link
Contributor

Vendors (specifically the medic one) will spawn uniforms with payment pins.
Medic Vendor distributing clothing (other than helmet/sterile gloves) should probably be removed so that you use the personal locker.
medic's personal locker will contain a normal uniform, and not the corpsman variant.

@morrowwolf morrowwolf removed the needs tested testmerge this to see what breaks label Mar 11, 2024
@morrowwolf morrowwolf marked this pull request as ready for review March 12, 2024 04:48
@morrowwolf morrowwolf enabled auto-merge (squash) March 12, 2024 04:48
@morrowwolf morrowwolf merged commit 40ae227 into cmss13-devs:master Mar 12, 2024
34 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.

4 participants