-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# About the pull request Adds new insulated sprites for both the item and on-mob Adds new CMB uniform/jacket/cap sprites, as well as a deputy/marshal variant. Adds two new overall sprites, tan/red and updates the blue one. Gives two heavy vehicle operator survs a blue/red trucker hat I added previously. Adds three new hazard vest sprites. Orange/Blue/Black Adds five new colonist workclothes. Grey/Khaki/Pink/Blue/Green # Explain why it's good for the game Removes legacy sprites, adds new sprites and puts said sprites in rotation. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> ### CMB Deputy and Marshal ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/8e56cfd1-b2b1-4a66-9bbe-79ff35af0959) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/7bb2ca88-ddef-4fb0-97e1-bf1b68cd01c8) ### Hazard Vests and Insulated Gloves ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/0ba75249-984b-4c20-9685-12d7c9a0bcc0) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/d58766a9-a40d-467b-ac68-38249f9571ca) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/51ff0d16-b1a3-4fa2-974d-78f1c9995279) ### Workwear ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/3a747679-6f50-4e64-8054-1766ce3be8e8) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/3f4965c8-1472-497c-956f-05b1cd9729e5) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/40d6cbfd-ac95-4839-bf2b-11d320732755) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/b7c9e8b7-178f-442b-8a7e-356d942f9cc8) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/f3199711-696e-49e6-903a-5b7a0c3be370) ### Overalls ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/27489308-3c60-42ca-a8e8-aaa854b0eabf) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/dcd1fe5d-79d6-467d-afee-d46303186e24) ![image](https://github.com/cmss13-devs/cmss13/assets/79063506/9b1f6194-ba31-4149-a157-80e1a0fcc460) </details> # Changelog :cl: add: Added trucker hats to the Solaris and Trijent Trucker survs. add: Added the CMB Marshal jacket to the CMB Marshal. imageadd: Differentiated the CMB Deputy and CMB Marshal jackets to accurately know which is which. Courtesy of AmoryBlaine. imageadd: Added new insulated gloves, coveralls (Tan/Red), updated the blue coveralls, Five Colonist Clothes (Grey/Khaki/Pink/Blue/Green), updated the Orange/Blue/Black hazard vests and updated the CMB Uniform and Cap. Courtesy of AmoryBlaine. /:cl: --------- Co-authored-by: Jeff Watchson <[email protected]>
- Loading branch information
1 parent
a60a7c7
commit 64d528e
Showing
17 changed files
with
71 additions
and
11 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
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.