Skip to content
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
merged 9 commits into from
Jan 26, 2025

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Jan 26, 2025

🆑 EE contributors

  • add: Shadowkins can now be roundstart species again
  • add: Shadowkins now have 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
  • fix: Fixed the demons of Gehenna possessing the ChemMaster

sleepyyapril and others added 9 commits January 25, 2025 23:06
# 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>


![{D10DDB25-F57D-4C5F-8B0B-CF99C6622172}](https://github.com/user-attachments/assets/d10a6a2c-79f6-4d6d-aac3-5f6da8a113d9)


</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]>
Copy link
Contributor

RSI Diff Bot; head commit 96fd4f7 merging into 25eabd8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Species/Shadowkin/parts.rsi

State Old New Status
full Modified
head_f Modified
head_m Modified

@sleepyyapril sleepyyapril merged commit a877085 into TheDenSS14:master Jan 26, 2025
14 of 15 checks passed
@sleepyyapril sleepyyapril deleted the fix-ee-merge branch January 26, 2025 18:28
TheDen-Bot added a commit that referenced this pull request Jan 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants