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

Let Them Eat Dirt - Elzu Rooting #2949

Merged
merged 41 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d1c064c
Rooting framework
Gristlebee Apr 30, 2024
d156361
no overcharge
Gristlebee Apr 30, 2024
33fa527
mood events
Gristlebee Apr 30, 2024
eccfd2b
handling
Gristlebee Apr 30, 2024
cd5a083
scuffed grass checking
Gristlebee Apr 30, 2024
6dc4b05
terrain checks
Gristlebee Apr 30, 2024
1a91e7f
cant root in space suit
Gristlebee Apr 30, 2024
8f9683d
immobile while rooting
Gristlebee May 1, 2024
f982f37
unneeded code plus minor adjustments
Gristlebee May 1, 2024
082211d
Uprooting behavior
Gristlebee May 1, 2024
6781edc
other good soil types
Gristlebee May 1, 2024
c1ce2c2
I forgot to add spans to the root mood event
Gristlebee May 1, 2024
be02b5d
Exceptions
Gristlebee May 1, 2024
eec37a3
bwah bwah
Gristlebee May 1, 2024
ccd46dd
time values
Gristlebee May 1, 2024
7ac5c49
better uprooting handling
Gristlebee May 1, 2024
9a1e8f6
ages, visual feedback, some value changes
Gristlebee May 1, 2024
ef4444e
Revert "ages, visual feedback, some value changes"
Gristlebee May 2, 2024
a80fbf7
Reapply "ages, visual feedback, some value changes"
Gristlebee May 2, 2024
3f3d88b
no tileswap while rooted, makes digging a function
Gristlebee May 3, 2024
ae14f4a
removes extra punctuation
Gristlebee May 3, 2024
068b140
Revert "removes extra punctuation"
Gristlebee May 4, 2024
d5e1e4f
Reapply "removes extra punctuation"
Gristlebee May 4, 2024
b4372af
Merge branch 'master' into let-them-eat-dirt
Gristlebee May 5, 2024
71494f3
converts everything to span macros
Gristlebee May 5, 2024
e942b95
Emote scream
Gristlebee May 8, 2024
64a28bd
signal handling
Gristlebee May 11, 2024
a899424
some defines
Gristlebee May 12, 2024
e0ce64a
soil define, goodbye vesitgal code
Gristlebee May 12, 2024
71fe0e5
non-single letter defines
Gristlebee May 12, 2024
9f61c30
icons and stuff
Gristlebee May 12, 2024
fd07777
Merge branch 'master' into let-them-eat-dirt
Gristlebee May 12, 2024
2e67cd4
Update code/datums/mood_events/generic_positive_events.dm
Gristlebee May 12, 2024
606b1a2
Update code/datums/mood_events/generic_positive_events.dm
thgvr May 12, 2024
f6b80c0
Update code/datums/mood_events/generic_positive_events.dm
thgvr May 12, 2024
82be7e6
snake case, define spacing
Gristlebee May 12, 2024
0fb9003
Merge branch 'let-them-eat-dirt' of https://github.com/Gristlebee/Shi…
Gristlebee May 12, 2024
4ea0eab
falcon's suggestions, temp revert of snake case
Gristlebee May 12, 2024
3ad243b
oops typo
Gristlebee May 12, 2024
fa2cb5d
Revert "oops typo"
Gristlebee May 12, 2024
f1b3f4e
Reapply "oops typo"
Gristlebee May 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -773,3 +773,6 @@

///called in /obj/item/gun/process_chamber (src)
#define COMSIG_GUN_CHAMBER_PROCESSED "gun_chamber_processed"

///called when an elzu should unroot
#define COMSIG_DIGOUT "dig_out"
5 changes: 5 additions & 0 deletions code/datums/mood_events/generic_positive_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,8 @@
description = "Fishing is relaxing"
mood_change = 5
timeout = 3 MINUTES

/datum/mood_event/root
description = span_nicegreen(I rooted recently, it feels good to charge naturally.\n)"
thgvr marked this conversation as resolved.
Show resolved Hide resolved
mood_change = 5
timeout = 5 MINUTES
26 changes: 26 additions & 0 deletions code/datums/status_effects/neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -275,3 +275,29 @@
/atom/movable/screen/alert/status_effect/surrender/Click(location, control, params)
. = ..()
owner.emote("surrender")

/datum/status_effect/rooted
id = "rooted"
alert_type = /atom/movable/screen/alert/status_effect/rooted

/datum/status_effect/rooted/on_apply()
. = ..()
ADD_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
ADD_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "root", /datum/mood_event/root)

/datum/status_effect/rooted/on_remove()
. = ..()
REMOVE_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
REMOVE_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))

/atom/movable/screen/alert/status_effect/rooted
name = "Rooted"
desc = "You're currently rooted into the ground and can't move. Click here to start digging yourself out."
icon_state = "dig_out"

/atom/movable/screen/alert/status_effect/rooted/Click(location, control, params)
. = ..()
to_chat(owner, span_notice("You begin digging yourself free."))
SEND_SIGNAL(owner,COMSIG_DIGOUT)

Loading
Loading