cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes density when fireman carrying (#59900)

Browse Source
This commit is contained in:
John Willard
2021-07-15 19:02:02 -07:00
committed by GitHub
parent a64b2599a5
commit a7790bc5ae
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/riding/riding_mob.dm
+1 -1
View File
@@ -185,7 +185,7 @@
unequip_buckle_inhands(parent)
var/mob/living/carbon/human/H = parent
H.remove_movespeed_modifier(/datum/movespeed_modifier/human_carry)
former_rider.set_density(TRUE)
former_rider.set_density(!former_rider.body_position)
return ..()
/// If the carrier shoves the person they're carrying, force the carried mob off
code/modules/mob/living/carbon/human/human.dm
+1 -8
View File
@@ -941,14 +941,7 @@
visible_message(span_warning("[src] fails to fireman carry [target]!"))
return
if(target.loc != loc)
var/old_density = density
density = FALSE // Hacky and doesn't use set_density()
step_towards(target, loc)
density = old_density // Avoid changing density directly in normal circumstances, without the setter.
if(target.loc == loc)
return buckle_mob(target, TRUE, TRUE, CARRIER_NEEDS_ARM)
return buckle_mob(target, TRUE, TRUE, CARRIER_NEEDS_ARM)
/mob/living/carbon/human/proc/piggyback(mob/living/carbon/target)
if(!can_piggyback(target))