[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work

This commit is contained in:
Neerti
2019-03-27 22:02:07 -04:00
committed by Novacat
parent 1b2116bf80
commit 3256202407
86 changed files with 4372 additions and 1777 deletions
@@ -69,9 +69,10 @@
else
to_chat(user, "It is full.")
/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0 || wall_mounted)) return 1
return (!density)
/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height, air_group)
if(wall_mounted)
return TRUE
return ..()
/obj/structure/closet/proc/can_open()
if(src.sealed)
+8 -3
View File
@@ -131,14 +131,20 @@
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
<<<<<<< HEAD
return 1
if(is_fulltile())
return 0 //full tile window, you can't move into it!
if(get_dir(loc, target) & dir)
=======
return TRUE
if(is_fulltile())
return FALSE //full tile window, you can't move into it!
if((get_dir(loc, target) & dir) || (get_dir(mover, target) == turn(dir, 180)))
>>>>>>> 9ff8103... Merge pull request #5636 from kevinz000/pixel_projectiles
return !density
else
return 1
return TRUE
/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf)
if(istype(O) && O.checkpass(PASSGLASS))
@@ -147,7 +153,6 @@
return 0
return 1
/obj/structure/window/hitby(AM as mob|obj)
..()
visible_message("<span class='danger'>[src] was hit by [AM].</span>")