cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 21:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

CanPass errors

Browse Source
This commit is contained in:
kevinz000
2019-01-07 00:23:10 -08:00
parent 352383e196
commit 3cc35a1027
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/machinery/doors/windowdoor.dm
View File

@@ -68,33 +68,26 @@
if(istype(bot)) if(istype(bot))
if(density && src.check_access(bot.botcard)) if(density && src.check_access(bot.botcard))
open() open()
sleep(50) addtimer(CALLBACK(src, .proc/close), 50)
close()
else if(istype(AM, /obj/mecha)) else if(istype(AM, /obj/mecha))
var/obj/mecha/mecha = AM var/obj/mecha/mecha = AM
if(density) if(density)
if(mecha.occupant && src.allowed(mecha.occupant)) if(mecha.occupant && src.allowed(mecha.occupant))
open() open()
sleep(50) addtimer(CALLBACK(src, .proc/close), 50)
close()
return return
if (!( ticker )) if (!( ticker ))
return return
if (src.operating) if (src.operating)
return return
if (src.density && src.allowed(AM)) if (density && allowed(AM))
open() open()
if(src.check_access(null)) addtimer(CALLBACK(src, .proc/close), check_access(null)? 50 : 20)
sleep(50)
else //secure doors close faster
sleep(20)
close()
return
/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSGLASS)) if(istype(mover) && mover.checkpass(PASSGLASS))
return 1 return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border if(get_dir(loc, target) == turn(dir, 180)) //Make sure looking at appropriate border
if(air_group) return 0 if(air_group) return 0
return !density return !density
else else

2
code/modules/recycling/disposal.dm
View File

@@ -467,7 +467,7 @@
H.vent_gas(loc) H.vent_gas(loc)
qdel(H) qdel(H)
/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) /obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height, air_group)
if(istype(mover, /obj/item/projectile)) if(istype(mover, /obj/item/projectile))
return 1 return 1
if (istype(mover,/obj/item) && mover.throwing) if (istype(mover,/obj/item) && mover.throwing)

2
code/modules/tables/interactions.dm
View File

@@ -1,5 +1,5 @@
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) /obj/structure/table/CanPass(atom/movable/mover, turf/target, height, air_group)
if(air_group || (height==0)) return 1 if(air_group || (height==0)) return 1
if(istype(mover,/obj/item/projectile)) if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target)) return (check_cover(mover,target))