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

Port Dogtags from CD and fix some minor issues with it. #2301

Merged
merged 3 commits into from
Nov 28, 2024

Conversation

Kr8art
Copy link
Contributor

@Kr8art Kr8art commented Nov 27, 2024

About the PR

Hey-hey! Since Milon recently touched up the Dogtage engraving code over on CD I thought now'd be a good time to port them over to DeltaV!

Why / Balance

Enhance player customization!

Technical details

  • Ported engraving code without changes
  • Ported the sprites without changes
  • Touched up the yaml so it actually works on DV without crashing
  • Touched up the engravings.ftl to include a forced space behind the colon (This is not present in the video below since I fixed that after recording)
  • Added dogtags to the loadout as trinket (CD comment in upstream files included)

Media

Dogtags_showcase.mp4

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

n/a

Changelog
🆑

  • add: Added customizable dogtags from Cosmatic Drift to the trinket loadout!

@Kr8art Kr8art requested review from IamVelcroboy and a team as code owners November 27, 2024 18:18
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi size/M 64-255 lines and removed S: Needs Review labels Nov 27, 2024
Copy link
Contributor

github-actions bot commented Nov 27, 2024

RSI Diff Bot; head commit 9fefc87 merging into 648b6af
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CD/Objects/Misc/dogtags.rsi

State Old New Status
dogtag Added
equipped-NECK Added

Edit: diff updated after 9fefc87

Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

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

theres other shit that can be done for CD but this is a big issue

Content.Server/_CD/Engraving/EngraveableSystem.cs Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/loadout_groups.yml Outdated Show resolved Hide resolved
@Unkn0wnGh0st333
Copy link
Contributor

This was on my ideas list, hell yeah Cath! You're becoming one of my favorite contributors

@Kr8art Kr8art requested review from MilonPL and deltanedas November 27, 2024 21:38
@JustAnOrng
Copy link

If I may suggest, put the merc Beret (possibly renamed) into the trinket menu

@Kr8art
Copy link
Contributor Author

Kr8art commented Nov 28, 2024

If I may suggest, put the merc Beret (possibly renamed) into the trinket menu

I don't think that's necessarily a 'trinket' since it's strictly a piece of clothing. If you want to have the mercenary beret to be somewhat more accessible, it'd probably be better to have it in a cloth vendor (though none of them really fit to dispense military outfits, thematically) or as a recipe in the uniform printer.

@deltanedas deltanedas merged commit 04b9239 into DeltaV-Station:master Nov 28, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants