Skip to content
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

Revert "Fixes and balances some problems with satyrs (#4712)" #4894

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Revert "Fixes and balances some problems with satyrs (#4712)" #4894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions monkestation/code/modules/ranching/satyr/components/living_drunk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
/datum/component/living_drunk
var/current_drunkness = 100
var/max_drunkness = 100
var/min_drunkness = 0

COOLDOWN_DECLARE(drank_grace)
var/grace_period = 5 MINUTES
var/booze_per_drunkness = 1
var/booze_per_drunkness = 100

var/drunk_state = 0

/datum/component/living_drunk/Initialize(grace_period = 5 MINUTES, booze_per_drunkness = 1)
/datum/component/living_drunk/Initialize(grace_period = 5 MINUTES, booze_per_drunkness = 100)
. = ..()
src.grace_period = grace_period
src.booze_per_drunkness = booze_per_drunkness
Expand Down Expand Up @@ -47,7 +46,7 @@
/datum/component/living_drunk/process(seconds_per_tick)
if(!COOLDOWN_FINISHED(src, drank_grace))
return
current_drunkness = min(min_drunkness, (current_drunkness -= 0.2))
current_drunkness -= 0.1
drunkness_change_effects()

/datum/component/living_drunk/proc/drunkness_change_effects()
Expand All @@ -56,10 +55,11 @@
living.apply_status_effect(/datum/status_effect/inebriated/drunk, 80)
drunk_state = 2
return
if((current_drunkness <= 30) && drunk_state != 1 && drunk_state != 2)
if((current_drunkness <= 30) && (drunk_state != 1 || drunk_state != 2))
living.apply_status_effect(/datum/status_effect/inebriated/tipsy, 5)
drunk_state = 1
return

if(current_drunkness > 30)
drunk_state = 0
living.remove_status_effect(/datum/status_effect/inebriated/tipsy)
Expand Down
Loading