-
Notifications
You must be signed in to change notification settings - Fork 283
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Monkeys now use filters & Simians are now monkeys (Attempt #2) #3846
Merged
Conversation
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 reverts commit 3585b0a.
This makes it not work in pref menu properly but should hopefully cut down on the amount of times it gets called.
This was referenced Oct 18, 2024
code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
Show resolved
Hide resolved
code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png
Outdated
Show resolved
Hide resolved
Co-authored-by: wraith-54321 <69217972+wraith-54321@users.noreply.github.com>
This was referenced Oct 26, 2024
Closed
Open
Closed
Closed
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Monkestation stopped being a fork and became an actual repo I can now fork off of, which fucked up github and made it endlessly get stuck 'processing' recent pushes which made it impossible for me to add any more commits
![image](https://private-user-images.githubusercontent.com/53777086/377590562-8e323610-d3bf-4611-8d72-76dffda281e4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5MzE2ODgsIm5iZiI6MTczODkzMTM4OCwicGF0aCI6Ii81Mzc3NzA4Ni8zNzc1OTA1NjItOGUzMjM2MTAtZDNiZi00NjExLThkNzItNzZkZmZkYTI4MWU0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA3VDEyMjk0OFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWYwYjI1MTA2NWFkMDhiODc0MWExMTZmMzM5NGEzMDVmYmE3ZmFhOWU2YTFhYWFhNGNiMjEzODYxYjZhODVmMWImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.0MWY2RtI3hqNqTI_ys7qdoeyxu8fgR6TSvFqZf0yDoM)
So now instead of figuring out how to actually fix this I just made a new PR instead.
About The Pull Request
Ports tgstation/tgstation#81598 which uses filters to allow monkeys to wear any clothes, and makes Simians a subtype of monkeys.
Simians now inherit the height filters among other monkey things like attack chain.
Ignore the half-opaque pixels sticking out the sides, it has been fixed.
![image](https://private-user-images.githubusercontent.com/53777086/374703116-e5cfb815-dcde-4bd1-aa47-c4af181b5730.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5MzE2ODgsIm5iZiI6MTczODkzMTM4OCwicGF0aCI6Ii81Mzc3NzA4Ni8zNzQ3MDMxMTYtZTVjZmI4MTUtZGNkZS00YmQxLWFhNDctYzRhZjE4MWI1NzMwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA3VDEyMjk0OFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBmOGIzMzEzYTUyYmRjZjA3MGE2YzdmZWIyNGExZDc3YjM4ZTM2ZmJjNDczNGU2ZDEzM2I4OTRmZWQ4NjdjMDgmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.57iODPaCPOH6Q1b1QUdHxjd9CfxiAEo0c3_J9MFfoZQ)
The prefs menu's tail icons looks a little fucked up on local but I was told this is apparently normal and is fine on the server. For some reason, it loads just fine when running unit tests locally, so I used that to ensure they look right at the very least.
Monkeys now also use Simians' bodyparts, fur, and eyes
![image](https://private-user-images.githubusercontent.com/53777086/377769936-f1a42aa3-27b0-4f71-841a-7b2d3b623038.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5MzE2ODgsIm5iZiI6MTczODkzMTM4OCwicGF0aCI6Ii81Mzc3NzA4Ni8zNzc3Njk5MzYtZjFhNDJhYTMtMjdiMC00ZjcxLTg0MWEtN2IyZDNiNjIzMDM4LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA3VDEyMjk0OFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTM0OGI4MjMwMTVjYTQ1ZGMzODcxNDQyMWVhNTVlNzVkOWMyMzNiMDdmNjk3Yzg2ZTU1NTVkY2YzYThkZjIwNTQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.hPyT7IgaEu3uYfnVSXKIdRlXWngQT8lXmDokWM5Gpyc)
They now look like this
Also fixes monkeys sometimes not having a tail.
Why It's Good For The Game
Simians seems like just Monkey+ so why not just make it so, cuts down on some copy paste and should make it easier to change monkeys without having to mirror everything for Simians.
Monkeys also now make use of Fur and eye colors, cutting even more down on copy paste. Simians looking to replace body parts now only need to look for monkey cubes, as they can't get robotic limbs.
Changelog
🆑
add: Monkeys can now wear any outfit rather than just the waiter outfit.
add: Simians now use the same height filter system as Monkeys to wear outfits instead of having their own icon for each individual piece of clothing.
add: Monkeys now use the same prefs as Simians, having Fur and eye colors. By default monkeys are all brown, and simians can choose to be brown as well.
add: Simians and monkeys are now at the bottom of the tile they are on, rather than the middle.
del: Big legged species and monkey abominations.
fix: Gigantism no longer doubles your size twice.
/:cl: