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

engraveable + two items that use it #1329

Merged
merged 6 commits into from
Jan 13, 2025
Merged

Conversation

hivehum
Copy link

@hivehum hivehum commented Jan 12, 2025

this is a port of DeltaV-Station/Delta-v#2301 which is a cleanup and port of EngraveableComponent and a trinket that uses it, dogtags, from i believe cosmatic-drift-14/cosmatic-drift#399 but they did not clarify

i took the liberty of changing the locale strings to be more generic to allow better reuse of engraveable. also i think its a really fun admin toy option

oh i also alphabetized the trinket loadout screen because it was bothering me and pinkbat opened #1327 while i was testing so i wanted to cause the worst conflict merge possible

Changelog
🆑

  • add: Added a new trinket, dogtags, from Cosmatic Drift.
  • add: Added a fun heart locket for your honey :)

@hivehum
Copy link
Author

hivehum commented Jan 12, 2025

hold on carousel is doing some cocomelon shit to me

@hivehum hivehum marked this pull request as draft January 12, 2025 20:09
@hivehum hivehum marked this pull request as ready for review January 12, 2025 20:54
@hivehum
Copy link
Author

hivehum commented Jan 12, 2025

okay that got scope crept a little but its fine. ready for review ❤️

@Pinkbat5
Copy link

890395278786572378

@hivehum hivehum changed the title dogtags from cosmatic drift engraveable + two items that use it Jan 12, 2025
@formlessnameless formlessnameless merged commit 0964b35 into impstation:master Jan 13, 2025
9 checks passed
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