Merge pull request #7570 from VOREStation/aro-baycats

One more tweak to Bay catwalks
This commit is contained in:
Aronai Sieyes
2020-05-01 14:56:40 -04:00
committed by GitHub
2 changed files with 45 additions and 10 deletions
+8
View File
@@ -28,8 +28,15 @@
/obj/structure/catwalk/Destroy()
redraw_nearby_catwalks()
update_falling()
return ..()
/obj/structure/catwalk/proc/update_falling()
spawn(1) //We get called in Destroy() and things. We might not be gone yet, so let's just put this off.
if(istype(loc, /turf/simulated/open))
var/turf/simulated/open/O = loc
O.update() //Will cause anything on the open turf to fall if it should
/obj/structure/catwalk/proc/redraw_nearby_catwalks()
for(var/direction in alldirs)
var/obj/structure/catwalk/L = locate() in get_step(src, direction)
@@ -83,6 +90,7 @@
if(hatch_open)
playsound(src, 'sound/items/Crowbar.ogg', 100, 2)
to_chat(user, "<span class='notice'>You pry open \the [src]'s maintenance hatch.</span>")
update_falling()
else
playsound(src, 'sound/items/Deconstruct.ogg', 100, 2)
to_chat(user, "<span class='notice'>You shut \the [src]'s maintenance hatch.</span>")
+37 -10
View File
@@ -2774,14 +2774,14 @@
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"afN" = (
/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/structure/disposalpipe/down,
/turf/simulated/floor/plating,
/obj/effect/catwalk_plated/dark,
/turf/simulated/open,
/area/maintenance/lower/bar)
"afO" = (
/obj/structure/railing{
@@ -29344,6 +29344,10 @@
/obj/random/cutout,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/north)
"cHq" = (
/obj/effect/catwalk_plated/dark,
/turf/simulated/open,
/area/maintenance/lower/bar)
"fYA" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -29358,10 +29362,33 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
"hNH" = (
/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/open,
/area/maintenance/lower/bar)
"kaa" = (
/obj/random/cutout,
/turf/simulated/floor,
/area/maintenance/lower/south)
"nTp" = (
/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/turf/simulated/open,
/area/maintenance/lower/bar)
"peO" = (
/obj/structure/catwalk,
/turf/simulated/open,
/area/maintenance/lower/bar)
(1,1,1) = {"
aaa
@@ -44456,9 +44483,9 @@ adL
aec
aew
aeP
aee
aee
aee
peO
cHq
peO
ago
agC
adu
@@ -44598,9 +44625,9 @@ adL
aed
aex
aeQ
afx
nTp
afN
agc
hNH
agp
agc
agc
@@ -44740,9 +44767,9 @@ adL
aee
aey
aeR
aee
aee
aee
peO
cHq
peO
agq
aee
aee