mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-14 09:35:30 +01:00
Fixes some quirks with motorised wheelchair density (#68715)
* Motorised Wheelchairs will not become dense when someone is buckled. Motorised Wheelchairs will manually bump living mobs they tried to move through. * Removes unnecessary check for emag, we want this behaviour at all times.
This commit is contained in:
@@ -56,14 +56,6 @@
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
/obj/vehicle/ridden/wheelchair/motorized/post_buckle_mob(mob/living/user)
|
||||
. = ..()
|
||||
set_density(TRUE)
|
||||
|
||||
/obj/vehicle/ridden/wheelchair/motorized/post_unbuckle_mob()
|
||||
. = ..()
|
||||
set_density(FALSE)
|
||||
|
||||
/obj/vehicle/ridden/wheelchair/motorized/attack_hand(mob/living/user, list/modifiers)
|
||||
if(!power_cell || !panel_open)
|
||||
return ..()
|
||||
@@ -132,6 +124,16 @@
|
||||
. += "Energy efficiency: [power_efficiency]"
|
||||
. += "Power: [power_cell.charge] out of [power_cell.maxcharge]"
|
||||
|
||||
/obj/vehicle/ridden/wheelchair/motorized/Move(newloc, direct)
|
||||
. = ..()
|
||||
if (.)
|
||||
return
|
||||
if (!has_buckled_mobs())
|
||||
return
|
||||
for (var/mob/living/guy in newloc)
|
||||
if(!(guy in buckled_mobs))
|
||||
Bump(guy)
|
||||
|
||||
/obj/vehicle/ridden/wheelchair/motorized/Bump(atom/A)
|
||||
. = ..()
|
||||
// Here is the shitty emag functionality.
|
||||
|
||||
Reference in New Issue
Block a user