mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Prevent falling from sudden gravity restoration if buckled.
* Also stops the floating animation while you're buckled, so you know. * Resolves https://github.com/VOREStation/VOREStation/issues/1458
This commit is contained in:
@@ -266,6 +266,8 @@ var/list/mob/living/forced_ambiance_list = new
|
|||||||
|
|
||||||
if(istype(mob,/mob/living/carbon/human/))
|
if(istype(mob,/mob/living/carbon/human/))
|
||||||
var/mob/living/carbon/human/H = mob
|
var/mob/living/carbon/human/H = mob
|
||||||
|
if(H.buckled)
|
||||||
|
return // Being buckled to something solid keeps you in place.
|
||||||
if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
|
if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@
|
|||||||
M.facing_dir = null
|
M.facing_dir = null
|
||||||
M.set_dir(buckle_dir ? buckle_dir : dir)
|
M.set_dir(buckle_dir ? buckle_dir : dir)
|
||||||
M.update_canmove()
|
M.update_canmove()
|
||||||
|
M.update_floating( M.Check_Dense_Object() )
|
||||||
buckled_mob = M
|
buckled_mob = M
|
||||||
|
|
||||||
post_buckle_mob(M)
|
post_buckle_mob(M)
|
||||||
@@ -53,6 +54,7 @@
|
|||||||
buckled_mob.buckled = null
|
buckled_mob.buckled = null
|
||||||
buckled_mob.anchored = initial(buckled_mob.anchored)
|
buckled_mob.anchored = initial(buckled_mob.anchored)
|
||||||
buckled_mob.update_canmove()
|
buckled_mob.update_canmove()
|
||||||
|
buckled_mob.update_floating( buckled_mob.Check_Dense_Object() )
|
||||||
buckled_mob = null
|
buckled_mob = null
|
||||||
|
|
||||||
post_buckle_mob(.)
|
post_buckle_mob(.)
|
||||||
|
|||||||
4
html/changelogs/Leshana-gravity-thunk.yml
Normal file
4
html/changelogs/Leshana-gravity-thunk.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
author: Leshana
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- tweak: "During the gravity failure event, you can now buckle yourself to a chair to prevent falling when gravity returns."
|
||||||
Reference in New Issue
Block a user