Let Them Eat Dirt - Elzu Rooting #2949
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
|
|
|
Please convert all the |
|
All spans have been made into macros as requested. |
Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: Gristlebee <[email protected]>
| @@ -259,8 +356,8 @@ | |||
| default_color = sanitize_hexcolor(new_etherealcolor, 6, TRUE) | |||
| current_color = health_adjusted_color(H, default_color) | |||
| spec_updatehealth(H) | |||
| H.visible_message("<span class='notice'>[H] modulates \his EM frequency to [new_etherealcolor].</span>") | |||
| H.visible_message(span_notice("[H] modulates \his EM frequency to [new_etherealcolor]")) | |||
There was a problem hiding this comment.
modern way of doing this.
Suggested change
| H.visible_message(span_notice("[H] modulates \his EM frequency to [new_etherealcolor]")) | |
| H.visible_message(span_notice("[H] modulates [H.p_their()] EM frequency to [new_etherealcolor]")) |
Comment on lines
305
to
306
| to_chat(H,span_warning("You begin to lose control over your charge!")) | ||
| H.visible_message(span_danger("[H] begins to spark violently!")) |
There was a problem hiding this comment.
Suggested change
| to_chat(H,span_warning("You begin to lose control over your charge!")) | |
| H.visible_message(span_danger("[H] begins to spark violently!")) | |
| H.visible_message(span_danger("[H] begins to spark violently!"), span_warning("You begin to lose control over your charge!")) |
|
I took Falcon's suggestion of using signals and defines for rooting, and it definitely looks much much better I think. I'll get to the rest later, but rooting itself works. |
thgvr
requested changes
May 12, 2024
| @@ -1,5 +1,13 @@ | |||
| #define ELZUOSE_EMAG_COLORS list("#00ffff", "#ffc0cb", "#9400D3", "#4B0082", "#0000FF", "#00FF00", "#FFFF00", "#FF7F00", "#FF0000") | |||
|
|
|||
| #define GOOD_SOIL list(/turf/open/floor/plating/grass, /turf/open/floor/plating/dirt, /turf/open/floor/ship/dirt, /turf/open/floor/grass/ship, /turf/open/floor/plating/asteroid/whitesands/grass, /turf/open/floor/grass/fairy/beach) | |||
There was a problem hiding this comment.
Suggested change
| #define GOOD_SOIL list(/turf/open/floor/plating/grass, /turf/open/floor/plating/dirt, /turf/open/floor/ship/dirt, /turf/open/floor/grass/ship, /turf/open/floor/plating/asteroid/whitesands/grass, /turf/open/floor/grass/fairy/beach) | |
| #define GOOD_SOIL list(/turf/open/floor/plating/grass, /turf/open/floor/plating/dirt, /turf/open/floor/plating/asteroid/whitesands/grass, /turf/open/floor/grass/fairy/beach) |
This is more like astroturf than grass, just make sure it's all of the planetary ""soil"" types.
There was a problem hiding this comment.
Those are the grass/dirt subtypes the SRM ships use AFAIK which is lorewise proper soil? It's turf/open/grass that's the astroturf
| icon_icon = 'icons/obj/flora/plants.dmi' | ||
| background_icon_state = "bg_alien" | ||
|
|
||
| /datum/action/innate/root/Activate() |
There was a problem hiding this comment.
lowercase, snake_case is the standard versus Pascal_Case or camel_Case
There was a problem hiding this comment.
so turns out all the parent procs in action.dm are capitalized like this, and it's tied to a whole bunch of child procs. Would it be okay if I left this as is for now, and fix it in another PR, or should I change it here?
| _human.remove_status_effect(/datum/status_effect/rooted) | ||
| return | ||
|
|
||
| /datum/action/innate/root/IsAvailable() |
| @@ -14,6 +22,7 @@ | |||
| attack_type = BURN //burn bish | |||
| exotic_bloodtype = "E" | |||
| damage_overlay_type = "" //We are too cool for regular damage overlays | |||
| species_age_max = 300 | |||
There was a problem hiding this comment.
unrelated, but we really need to add some handling to guestbook age code that bases the age off of this variable instead of how it works now.
Co-authored-by: thgvr <[email protected]> Signed-off-by: Gristlebee <[email protected]>
thgvr
reviewed
May 12, 2024
Signed-off-by: thgvr <[email protected]>
thgvr
reviewed
May 12, 2024
Signed-off-by: thgvr <[email protected]>
…ptest-Fork into let-them-eat-dirt
This reverts commit 3ad243b.
This reverts commit fa2cb5d.
thgvr
approved these changes
May 13, 2024
shiptest-server
pushed a commit
that referenced
this pull request
May 13, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
May 19, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Adds the ability for elzu to root on top of good soil turfs (dirt, planetary grass, etc) to feed. Elzu will get some minor healing and an additional mood buff along with the charge they get from rooting. You can't root in thick clothing like space suits due to them needing a direct connection to the ground. Being moved while rooted will uproot you, dealing damage to your torso and legs. Also changes the max age for elzu to 300. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game The ELZOOT. Anyways, elzu should be able to root in lore and that being reflected in gameplay is probably good. In lore, elzu that only root are supposed to be able to hit up to 300 years old. So I bumped up the age max since they can root ingame now. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Elzu rooting tweak: Max age for elzu characters can be 300. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: Gristlebee <[email protected]> Signed-off-by: thgvr <[email protected]> Co-authored-by: FalloutFalcon <[email protected]> Co-authored-by: thgvr <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
About The Pull Request
Adds the ability for elzu to root on top of good soil turfs (dirt, planetary grass, etc) to feed.
Elzu will get some minor healing and an additional mood buff along with the charge they get from rooting. You can't root in thick clothing like space suits due to them needing a direct connection to the ground.
Being moved while rooted will uproot you, dealing damage to your torso and legs.
Also changes the max age for elzu to 300.
Why It's Good For The Game
The ELZOOT.
Anyways, elzu should be able to root in lore and that being reflected in gameplay is probably good.
In lore, elzu that only root are supposed to be able to hit up to 300 years old. So I bumped up the age max since they can root ingame now.
Changelog
🆑
add: Elzu rooting
tweak: Max age for elzu characters can be 300.
/:cl: