cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove flip sickness for freerunners (#2550)

Browse Source 
## About The Pull Request

Puts back in the check for freerunning trait when flipping. Also moves
synthetic vomit to the vomit proc instead of typechecking on the emote.

## Why It's Good For The Game

The 8 points lets them flip.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/ad4367b4-fcb6-4b6c-bd3c-0d7b3ae36241)

</details>

## Changelog

🆑 LT3
fix: Freerunners are immune to flip and spin sickness
/🆑
This commit is contained in:
LT3
2024-11-27 20:07:36 +00:00
committed by GitHub
parent f8a729593d
commit 2b33ea898d
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/emote.dm
+7 -3
View File
@@ -88,7 +88,7 @@
var/mob/living/carbon/flippy_mcgee = user
flippy_mcgee.set_confusion_if_lower(FLIP_EMOTE_DURATION)
if(flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion) > BEYBLADE_PUKE_THRESHOLD)
flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0, vomit_type = (issynthetic(flippy_mcgee) && /obj/effect/decal/cleanable/vomit/nanites || /obj/effect/decal/cleanable/vomit/toxic))
flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
return
user.SpinAnimation(FLIP_EMOTE_DURATION, 1)
@@ -127,7 +127,7 @@
var/mob/living/flippy_mcgee = user
var/sickness = flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion)
if(sickness)
if(sickness && !(HAS_TRAIT(flippy_mcgee, TRAIT_FREERUNNING)))
if(prob(20))
flippy_mcgee.Knockdown(1.5 SECONDS)
flippy_mcgee.visible_message(
@@ -159,9 +159,13 @@
return
if(!iscarbon(user))
return
// BUBBER EDIT ADDITION BEGIN - Freerunning Quirk
if(HAS_TRAIT(user, TRAIT_FREERUNNING))
return
// BUBBER EDIT ADDITION END
if(user.get_timed_status_effect_duration(/datum/status_effect/confusion) > BEYBLADE_PUKE_THRESHOLD)
user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0, vomit_type = (issynthetic(user) && /obj/effect/decal/cleanable/vomit/nanites || /obj/effect/decal/cleanable/vomit/toxic)) // BUBBER EDIT CHANGE - Original: user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
return
if(prob(BEYBLADE_DIZZINESS_PROBABILITY))
code/modules/mob/living/carbon/carbon.dm
+5
View File
@@ -435,6 +435,11 @@
if(!force && HAS_TRAIT(src, TRAIT_STRONG_STOMACH))
lost_nutrition *= 0.5
// BUBBER EDIT ADDITION BEGIN - Synthetic Vomit
if(issynthetic(src))
vomit_type = /obj/effect/decal/cleanable/vomit/nanites
// BUBBER EDIT ADDITION END
SEND_SIGNAL(src, COMSIG_CARBON_VOMITED, distance, force)
// cache some stuff that we'll need later (at least multiple times)