[MIRROR] [Modular] New Lockers! (Skyrat Edition) #999
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR: Skyrat-SS13/Skyrat-tg#25409
About The Pull Request
#25245 Redone because it deleted my everything when I pushed it. So, I redid it. All of it.
PR is essentially Skyrat-SS13/Skyrat-tg#25167 but for our own lockers, plus some other maintenance and a little surprise.
Full Changelist:
/station
subtype of the NTC Locker (this is the source of all map changes)To-Do: Sort out why the wall lockers have bounce on the animated state.Done, animation is now smooth!How This Contributes To The Skyrat Roleplay Experience
I love decrusting I love decrusting I love desouling I love desouling!!!!
Proof of Testing
Screenshots/Videos
Security LockersBlueshield
![image](https://private-user-images.githubusercontent.com/76465278/287518517-b578c80c-ce9a-45f7-ba90-b5a7bea114c0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MTg1MTctYjU3OGM4MGMtY2U5YS00NWY3LWJhOTAtYjVhN2JlYTExNGMwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBlMjQyMTAwMTc1ZDI3M2IzZDJmMjdhODg0ZGVhMTVmZTdiYjRlZWMwNmEwNjQ4NGNiYzhmNzdhYjJmNDFlYTYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.2VSsXKyQsaL79LB_yxBiiOesH0D9BLawbFETg6S7a9s)
NTC
![image](https://private-user-images.githubusercontent.com/76465278/287518555-632dde2c-ad15-4874-a0c9-1a3f77dd2ea1.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MTg1NTUtNjMyZGRlMmMtYWQxNS00ODc0LWEwYzktMWEzZjc3ZGQyZWExLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTg2M2U3ZDdiOGQxMWVkZmU2NmMwY2IwNGVkMTUyZjdhYTZjNzE3Y2IxNTM0NzQzN2QzOTZlMzY3ODgxMWRiYzImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.3oB59zPvpB7wogvG1eSu3c0Bwz0uiI56PB-wL9qU3qo)
Barber (God that vendor needs to be redone)
![image](https://private-user-images.githubusercontent.com/76465278/287520089-4e15bf47-ffc8-4e9b-975a-e2b546e7b8a3.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MjAwODktNGUxNWJmNDctZmZjOC00ZTliLTk3NWEtZTJiNTQ2ZTdiOGEzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWFiNGYyMDE3ZmUzNjc0YzYxNTZiN2M2YzY4YWM1OGY1NmVhM2U5MGEwY2QyMDcxYTZkNzc3MGZjNDc0Y2ZhNWQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.0jcwHd5CAus01VnGs0pWHqnvQXqLREInsJFd1bpV31o)
Wall Lockers are now not only up-to-date... (these images are a tinyyy bit outdated tho. I made them like 1px shorter and cleaned the inside's shading a bit)
![image](https://private-user-images.githubusercontent.com/76465278/287518890-fb2954de-f6a2-466e-9823-4f00176d3033.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MTg4OTAtZmIyOTU0ZGUtZjZhMi00NjZlLTk4MjMtNGYwMDE3NmQzMDMzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTZjNGU4MTBlYWE4Y2ZiNDc2YWNkYjg5ZDBhNWQ3NmZlZDRmZjViOWJmZWZlM2FmZWNkYzNlN2E3NmI5MzI5NDgmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.cCEYh6z36tEJwZ4-T9fiOqt5-ILQliJlTmxXH-ygYAE)
And have working overlays...
![image](https://private-user-images.githubusercontent.com/76465278/287519015-26287585-d0fc-414c-a1cc-97775cce9059.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MTkwMTUtMjYyODc1ODUtZDBmYy00MTRjLWExY2MtOTc3NzVjY2U5MDU5LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWExZDAzNjZjODlkYTg2YTFjNDk3MjkwYWQ0ZjMyYjNkY2JlMjVhZTExY2VmZDliMDcyODUyYjU0MDk4MGUzNzMmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.qVx_-XSEhCPiUgVDTyrkaMhWqEfhS-BMtXnupMs0xao)
But can be re-built and mounted!
![image](https://private-user-images.githubusercontent.com/76465278/287518908-a5f9222b-e346-4704-92e6-73c3d858a2d7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4ODAzNzcsIm5iZiI6MTczODg4MDA3NywicGF0aCI6Ii83NjQ2NTI3OC8yODc1MTg5MDgtYTVmOTIyMmItZTM0Ni00NzA0LTkyZTYtNzNjM2Q4NThhMmQ3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDIyMTQzN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWRkMDE4ZmNiZmIyNWJkZDA3ZGE3NjMzNjg1YjU1ZDI3OTk5NWJkZDVkZDUyZDliZjE5ZDY4MzE0N2Y0ZmY3NTEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.21Ccwpuf8Qi2E19efrIoGxptbvEncreQ2kCMFCh7Dk8)
Changelog
🆑 OrionTheFox
qol: Wall Lockers can now be rebuilt! The wall mounts can be crafted the same as a default closet, with 2 iron in-hand.
image: resprites (almost) all Skyrat lockers, including wall-mounted ones! They should be much more in line with TG's sprites now.
fix: fixed several bugs with wall-mounted lockers, and formatting inconsistencies of modular lockers
/:cl: