-
Notifications
You must be signed in to change notification settings - Fork 276
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Medal pinning fixup + new medical/engi medals (#2108)
* Re-adds medal code I accidentally removed (#76992) ## About The Pull Request In tgstation/tgstation@79c57e3 , I snapped all of the medal awarding code out of existence, as I thought I moved it all over to attach, which I did But I forgot to move the... rest of it over. The attacking part. Very foolish of me. I re-added it into pre-attack, gave accessories `nobludgeon`, and generally cleaned it up a bit. ## Why It's Good For The Game Accidentally removing code is bad ## Changelog :cl: Melbert fix: Once again you can award people medals. /:cl: * The Medal Epilogue: Engineering (And Medical) Now Gets Them Too (#78461) ## About The Pull Request **Credits to @CoiledLamb for the awesome sprites in this PR!** CE 🤝 CMO Finally, the last department to receive their own medal box, the engineering department. The saga is complete, we can go home now. Adds two types of medals: 1. For assisting the station in a crisis, the "emergency services award" 2. For showing your atmospheric prowess with a project, the "atmospheric mastery award" To me, those two awards symbolize the best engineering (and medical) has to offer. On the one hand, assisting the station and its crew in a calamity, and on the other hand just absolutely flexing your atmos knowledge on your boss. CEs now have a lockbox in their locker with 3 emergency service medals and 1 atmospheric mastery medal, and CMOs get 3 emergency services medals in their lockbox. 3 emergency service medals may seem like a lot, but remember that assisting the station is often done in a team and not alone. An engineering/medical department who can work together in a crisis really demonstrates how robust they are. As for the atmos mastery medal, well... ### THERE CAN ONLY BE ONE ! <details> <summary>Pictures</summary> ![image](https://github.com/tgstation/tgstation/assets/47710522/d3237b6a-df4e-44f6-90e0-4eed3202b351) Upper row: emergency services award, engineering Middle row: atmospheric mastery award Lower row: emergency services award, medical ![image](https://github.com/tgstation/tgstation/assets/47710522/27543c0e-e77b-46ec-8c79-3f56c0940271) ![image](https://github.com/tgstation/tgstation/assets/47710522/7b3c0a6c-2c47-4e0f-af3f-b9d0037c19d4) ![image](https://github.com/tgstation/tgstation/assets/47710522/ae5bbeb3-42af-4b52-ae02-aa48480c8fd5) Sprites without funky byond scaling ![image](https://github.com/tgstation/tgstation/assets/47710522/eab183dd-18c5-4e21-ad83-ee4bed7733b6) ![image](https://github.com/tgstation/tgstation/assets/47710522/66a85894-8163-40e7-bc91-b5c27e75b943) </details> ## Why It's Good For The Game medals are cute and awesome, i think you can agree ## Changelog :cl: distributivgesetz, CoiledLamb add: Added two new awards specifically for engineering and medical: The "Emergency Services Award" and the "Atmospheric Mastery Award". CEs get 3 Emergency Services Awards and 1 Atmospheric Mastery Award and CMOs get 3 Emergency Services Awards. /:cl: --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: distributivgesetz <[email protected]>
- Loading branch information
1 parent
d9299bf
commit af805ae
Showing
7 changed files
with
118 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.