Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

makes wheelchairs able to pass through turnstiles (maybe((idontactuallyknowhowtocode(((help))) #12906

Merged
Bibby0110 merged 4 commits into from
Feb 14, 2022
Merged

makes wheelchairs able to pass through turnstiles (maybe((idontactuallyknowhowtocode(((help))) #12906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdb7b23
Update ministile.dm
UselessTheremin Dec 15, 2021
a6ee7d7
Update code/game/machinery/doors/ministile.dm
UselessTheremin Dec 16, 2021
922766d
fix code
ToasterBiome Dec 30, 2021
ecdf270
Merge pull request #1 from ToasterBiome/patch-14
UselessTheremin Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/game/machinery/doors/ministile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion code/game/machinery/doors/turnstile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down