-
Notifications
You must be signed in to change notification settings - Fork 30
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
EE Merge to Fix ChemMaster Demonic Possession + Shadowkin #207
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
# Description Updated guidebook text, and fixed enviro damage values (for humans it's 0.1 and 1.5, so for tajara it's 0.065 and 2). Also removed temperature protection cuz it does like, literally nothing. --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog :cl: - fix: Fixed typos in guidebook entry for tajara - fix: Temperature related fixes for tajara
# Description Honestly... much needed until they can get a proper rework from the original creators. This PR nerfs them a shit ton (no more teleporting away when you're in danger, smh) to make them more in line with the other species so they aren't powergamer central. Additionally, brings them more in-line with the traditional SS13 shadowkin. Shadowkins should no longer get darkswap and such, in fact I've commented out the entire ability until it too can get a rework. --- # TODO - [x] Removed DarkSwap from Shadowkin - [x] Made shadowkins take more damage from heat, slash, and piercing - [x] Brought shadowkin much more in line with their SS13 counterparts - [x] Fixed shadowkin lore, making the guidebook entry more interesting - [x] Fixed shadowkin lore file, adding in their species lore instead of relying on a google doc - [x] Shadowkin can be chosen as a player species roundstart - [x] Rework Marish to have a more fleshed out language protoype - [ ] Make DarkSwap unable to interact with the world as a whole - [ ] Give DarkSwap a longer cooldown - [ ] Make DarkSwap unable to be used if stunned - [ ] Adjust DarkSwap glimmer production - [x] Shadowkin do not have black eyes by default - [x] Shadowkin have the black eyes trait listed (Waveform Misalignment equivalent) - [x] Shadowkin can now be mystagogue, mantis, chaplain, cataloguer, and prisoner. - [x] Shadowkin cannot have blackeye trait for mystagogue, mantis, chaplain, or cataloguer. - [x] Shadowkin must have blackeye trait for prisoner. --- # Changelog :cl: ShirouAjisai - add: Shadowkins can now be roundstart species again - add: Shadowkins now have a lungs, yippee! - add: Shadowkins now have organs with funny little descriptions - add: Shadowkins now have a brand new and expanded list of names - add: Shadowkins now have roundstart innate telepathy ability rather than a whole new language for it. - tweak: Shadowkins take more damage from heat, slash, and piercing - tweak: Shadowkins are much more like their SS13 counterparters - tweak: Shadowkins now have much better lore in their guidebook entry - tweak: Shadowkins now have a more fleshed out language (to outside observers) - tweak: Shadowkins now can be mystagogue, mantis, chaplain, and cataloguer - tweak: Shadowkins must now have blackeye trait to play prisoner - tweak: Shadowkins no longer have blackeye trait by default - tweak: Shadowkins now take asphyxiation damage, albeit at half the rate of others. - tweak: Shadowkins now have a more pronounced snout. - remove: Removed DarkSwap from Shadowkin roundstart --------- Signed-off-by: SixplyDev <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: ShirouAjisai <[email protected]> Co-authored-by: VMSolidus <[email protected]>
🆑 - fix: ChemMaster no longer loses your last added progress because of a silly goose move.
i probably missed a few but someone better than me with markings can fix 'em later --------- Signed-off-by: Skubman <[email protected]> Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: Lyndomen <[email protected]> Co-authored-by: Skubman <[email protected]> Co-authored-by: ElusiveCoin <[email protected]>
simplify this shitcode i borked it last time, sorry --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: VMSolidus <[email protected]>
…ngines into fix-ee-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
🆑 EE contributors
than a whole new language for it.
observers)
cataloguer
rate of others.