Skip to content

Commit

Permalink
[MIRROR] Webedit, fixes sanity checks for tackle and wellcheers. (WEB…
Browse files Browse the repository at this point in the history
…EDIT PR, TESTED IN VSC.) (#2294)

* Webedit, fixes sanity checks for tackle and wellcheers. (WEBEDIT PR, TESTED IN VSC.) (#81855)

## About The Pull Request
Fixes both tackle Insanity checks and wellcheers sanity check. 

I couldn't get make VSC clone my fork so I just did a webedit, and
tested changes with VSC.


https://github.com/tgstation/tgstation/assets/24631139/73730216-0c0a-45ee-8ee3-94c7695f4337


https://github.com/tgstation/tgstation/assets/24631139/90d96a5f-98cd-4bf5-b1d3-d0e0d14a917a
## Why It's Good For The Game
Bugfixes are good.
Fixes tgstation/tgstation#81852
## Changelog
:cl:
fix: Tackle and wellcheers code for sanity values now function.
/:cl:

* Webedit, fixes sanity checks for tackle and wellcheers. (WEBEDIT PR, TESTED IN VSC.)

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: 2whatever2 <[email protected]>
  • Loading branch information
3 people authored Mar 7, 2024
1 parent 4bde688 commit f2a3316
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/datums/components/tackle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
if(human_sacker.get_mob_height() <= HUMAN_HEIGHT_SHORTEST) //JUST YOU WAIT TILL I FIND A CHAIR, BUDDY, THEN YOU'LL BE SORRY
attack_mod -= 2

if(human_sacker.mob_mood.sanity_level == SANITY_INSANE) //I've gone COMPLETELY INSANE
if(human_sacker.mob_mood.sanity_level == SANITY_LEVEL_INSANE) //I've gone COMPLETELY INSANE
attack_mod += 15
human_sacker.adjustStaminaLoss(100) //AHAHAHAHAHAHAHAHA

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
. = ..()
affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick)
var/need_mob_update
switch(affected_mob.mob_mood.sanity_level)
switch(affected_mob.mob_mood.sanity)
if (SANITY_INSANE to SANITY_CRAZY)
need_mob_update = affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
if (SANITY_UNSTABLE to SANITY_DISTURBED)
Expand Down

0 comments on commit f2a3316

Please sign in to comment.