Fixes riding vehicles on tables and lying on beds (#80053)

## About The Pull Request
Fixes #80027. My bad.
EDIT: Also fixes #80050.

## Why It's Good For The Game
See the issues above.

## Changelog
🆑
fix: Fixed an issue with the offsets of ridden vehicles on tables, and
another when buckled to a bed.
/🆑
This commit is contained in:
Ghom
2023-12-01 14:55:21 -07:00
committed by GitHub
parent bb9d648221
commit bb76600b95
4 changed files with 32 additions and 35 deletions
@@ -67,16 +67,6 @@
deconstruct(disassembled = TRUE)
return TRUE
/obj/structure/bed/post_buckle_mob(mob/living/buckled)
. = ..()
buckled.base_pixel_y -= elevation
buckled.pixel_y -= elevation
/obj/structure/bed/post_unbuckle_mob(mob/living/buckled)
. = ..()
buckled.base_pixel_y += elevation
buckled.pixel_y += elevation
/// Medical beds
/obj/structure/bed/medical
name = "medical bed"
@@ -342,13 +332,11 @@
/obj/structure/bed/double/post_buckle_mob(mob/living/target)
. = ..()
if(buckled_mobs.len > 1 && !goldilocks) // Push the second buckled mob a bit higher from the normal lying position
target.base_pixel_y += 12
target.pixel_y += 12
target.pixel_y += 6
goldilocks = target
/obj/structure/bed/double/post_unbuckle_mob(mob/living/target)
. = ..()
if(target == goldilocks)
target.base_pixel_y -= 12
target.pixel_y -= 12
target.pixel_y -= 6
goldilocks = null
+4 -6
View File
@@ -766,16 +766,14 @@
visible_message(span_notice("[user] lays [pushed_mob] on [src]."))
///Align the mob with the table when buckled.
/obj/structure/bed/post_buckle_mob(mob/living/buckled)
/obj/structure/table/optable/post_buckle_mob(mob/living/buckled)
. = ..()
buckled.base_pixel_y -= 6
buckled.pixel_y -= 6
buckled.pixel_y += 6
///Disalign the mob with the table when unbuckled.
/obj/structure/bed/post_unbuckle_mob(mob/living/buckled)
/obj/structure/table/optable/post_unbuckle_mob(mob/living/buckled)
. = ..()
buckled.base_pixel_y += 6
buckled.pixel_y += 6
buckled.pixel_y -= 6
/// Any mob that enters our tile will be marked as a potential patient. They will be turned into a patient if they lie down.
/obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/carbon/potential_patient)