From cdb7b23728f29aa7e1a5ba7d64ce29d07f8428b7 Mon Sep 17 00:00:00 2001 From: UselessTheremin <69374474+UselessTheremin@users.noreply.github.com> Date: Wed, 15 Dec 2021 09:51:58 -0500 Subject: [PATCH 1/3] Update ministile.dm --- code/game/machinery/doors/ministile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 2c31f32fdab7..99fe2b7ad1ea 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -31,7 +31,7 @@ . = ..() if(istype(mover) && (mover.pass_flags & PASSGLASS)) return TRUE - if(istype(mover, /mob/living/simple_animal/bot)) + if(istype(mover, /mob/living/simple_animal/bot) || istype(/obj/vehicle/ridden/wheelchair)) flick("operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3) return TRUE From a6ee7d71b6e237fbe38107d096677f3457e64a77 Mon Sep 17 00:00:00 2001 From: UselessTheremin <69374474+UselessTheremin@users.noreply.github.com> Date: Wed, 15 Dec 2021 21:11:44 -0500 Subject: [PATCH 2/3] Update code/game/machinery/doors/ministile.dm Co-authored-by: Theos --- code/game/machinery/doors/ministile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 99fe2b7ad1ea..010caf860b46 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -31,7 +31,7 @@ . = ..() if(istype(mover) && (mover.pass_flags & PASSGLASS)) return TRUE - if(istype(mover, /mob/living/simple_animal/bot) || istype(/obj/vehicle/ridden/wheelchair)) + if(istype(mover, /mob/living/simple_animal/bot) || istype(mover, /obj/vehicle/ridden/wheelchair)) flick("operate", src) playsound(src,'sound/items/ratchet.ogg',50,0,3) return TRUE From 922766db2a852aca1f9fb8c7f4c4aa2a4de400b0 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Wed, 29 Dec 2021 21:27:49 -0600 Subject: [PATCH 3/3] fix code --- code/game/machinery/doors/ministile.dm | 9 +++++++-- code/game/machinery/doors/turnstile.dm | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index 010caf860b46..36825c0c62ab 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -31,11 +31,11 @@ . = ..() if(istype(mover) && (mover.pass_flags & PASSGLASS)) return TRUE - if(istype(mover, /mob/living/simple_animal/bot) || istype(mover, /obj/vehicle/ridden/wheelchair)) + if(istype(mover, /mob/living/simple_animal/bot)) 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)