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

command prestige cloaks now qualify for the cloak steal objective. dont look at the rest of this pr #773

Merged
merged 13 commits into from
Dec 3, 2024

Conversation

hivehum
Copy link

@hivehum hivehum commented Nov 22, 2024

i turned into the joker and migrated a LOT of edits out of upstream and into our file structure. i think i might have missed something

Changelog
🆑

  • tweak: The command prestige cloaks now count as cloaks for a thief's steal objective.

@Sha-Seng
Copy link

thank you for doing this! it was a project for later for me, because i added this stuff before we had our own file structure and back then i wasn't really sure when to credit myself in the meta file if i just changed a few pixels, but i really appreciate it because you did a ton of work

i looked through it and i think the only thing you missed was you accidentally removed the EmergencyOxygenTankFilled to the _Impstation filepath and not the EmergencyOxygenTankCommandFilled, just so you know! otherwise this is incredible

image

@Sha-Seng
Copy link

all good except i think you accidentally vaporized the medipen outta the engineering oxygen survival kit

image

@hivehum
Copy link
Author

hivehum commented Dec 2, 2024

having a HELL of time trying to get the merge conflict to not add every commit in the past week. would love some assistance

@hivehum
Copy link
Author

hivehum commented Dec 3, 2024

please god merge this before i have to deal with conflicts again

@formlessnameless
Copy link
Collaborator

what if i just left this until the next upstream merge...

@formlessnameless formlessnameless merged commit fa8aa56 into impstation:master Dec 3, 2024
5 checks passed
@hivehum hivehum deleted the thief-target branch January 1, 2025 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants