cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rustsql

Browse Source
This commit is contained in:
Letter N
2021-01-20 15:40:41 +08:00
parent cd5d558fad 4a3fe48710
commit 125cd17cee
606 changed files with 9932 additions and 4818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/RandomRuins/SpaceRuins/crashedship.dmm
View File

@@ -2372,7 +2372,7 @@
},
/area/awaymission/BMPship/Midship)
"hh" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"hi" = (

8
_maps/RandomRuins/SpaceRuins/skelter.dmm
View File

@@ -2729,9 +2729,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"gx" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -2742,9 +2740,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/shields)
"gy" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
name = "Shields"