diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 2c31f32fdab7..36825c0c62ab 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -35,7 +35,7 @@ flick("operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3) return TRUE - else if (!isliving(mover)) + else if (!isliving(mover) && !istype(mover, /obj/vehicle/ridden/wheelchair)) flick("deny", src) playsound(src,'sound/machines/deniedbeep.ogg',50,0,3) return FALSE @@ -44,6 +44,11 @@ if(!allowed && mover.pulledby) allowed = allowed(mover.pulledby) + if(istype(mover, /obj/vehicle/ridden/wheelchair)) + for(var/mob/living/rider in mover.buckled_mobs) + if(allowed(rider) && !mover.pulledby) //defer to the above dragging code if we are being dragged + allowed = TRUE + if(get_dir(loc, mover.loc) == dir || allowed || mover==machineclimber) //Make sure looking at appropriate border, loc is first so the turnstyle faces the mover flick("ministile_operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3) diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index a56e8fc8765e..8cdccdbefb7b 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -35,7 +35,7 @@ flick("operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3) return TRUE - else if (!isliving(mover)) + else if (!isliving(mover) && !istype(mover, /obj/vehicle/ridden/wheelchair)) flick("deny", src) playsound(src,'sound/machines/deniedbeep.ogg',50,0,3) return FALSE @@ -44,6 +44,11 @@ if(!allowed && mover.pulledby) allowed = allowed(mover.pulledby) + if(istype(mover, /obj/vehicle/ridden/wheelchair)) + for(var/mob/living/rider in mover.buckled_mobs) + if(allowed(rider) && !mover.pulledby) //defer to the above dragging code if we are being dragged + allowed = TRUE + if(get_dir(loc, mover.loc) == dir || allowed) //Make sure looking at appropriate border, loc is first so the turnstyle faces the mover flick("operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3)