Merge pull request #9841 from Heroman3003/ceilingfix

Hopefully fixes ceiling blocker for good.
This commit is contained in:
Novacat
2021-03-03 09:09:39 -05:00
committed by Chompstation Bot
parent 964ca6e909
commit b6553a924c
2 changed files with 10 additions and 5 deletions

View File

@@ -105,6 +105,13 @@
to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>") to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>")
return 0 return 0
//VOREStation Addition Start
for(var/atom/A in start)
if(!A.CheckExit(src, destination))
to_chat(src, "<span class='warning'>\The [A] blocks you.</span>")
return 0
//VOREStation Addition End
for(var/atom/A in destination) for(var/atom/A in destination)
if(!A.CanPass(src, start, 1.5, 0)) if(!A.CanPass(src, start, 1.5, 0))
to_chat(src, "<span class='warning'>\The [A] blocks you.</span>") to_chat(src, "<span class='warning'>\The [A] blocks you.</span>")

View File

@@ -259,7 +259,6 @@
}, },
/obj/structure/cable, /obj/structure/cable,
/obj/effect/ceiling, /obj/effect/ceiling,
/obj/effect/ceiling,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/maintenance/tether_midpoint) /area/maintenance/tether_midpoint)
"y" = ( "y" = (
@@ -280,7 +279,6 @@
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/maintenance/tether_midpoint) /area/maintenance/tether_midpoint)
"A" = ( "A" = (
/obj/effect/ceiling,
/obj/structure/disposalpipe/up{ /obj/structure/disposalpipe/up{
dir = 8 dir = 8
}, },
@@ -293,19 +291,19 @@
"C" = ( "C" = (
/obj/structure/disposalpipe/up, /obj/structure/disposalpipe/up,
/obj/effect/ceiling, /obj/effect/ceiling,
/obj/effect/ceiling,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/maintenance/tether_midpoint) /area/maintenance/tether_midpoint)
"D" = ( "D" = (
/obj/structure/disposalpipe/down{ /obj/structure/disposalpipe/down{
dir = 1 dir = 1
}, },
/obj/effect/ceiling,
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4; dir = 4;
pixel_y = 0 pixel_y = 0
}, },
/turf/simulated/floor/plating, /obj/structure/lattice,
/obj/machinery/door/firedoor/glass,
/turf/simulated/open,
/area/maintenance/tether_midpoint) /area/maintenance/tether_midpoint)
"E" = ( "E" = (
/obj/structure/cable{ /obj/structure/cable{