cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5207 from Heroman3003/mapfixes2

Browse Source 
Fixes some map bugs
This commit is contained in:
Novacat
2019-05-09 07:02:31 -04:00
committed by GitHub
parent 7a5efc3fcf 02ad80db1f
commit a174fdb084
4 changed files with 74 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm
+25 -24
View File
@@ -147,6 +147,12 @@
name = "Unknown Shuttle"
},
/area/submap/virgo2/Blackshuttledown)
"aA" = (
/obj/machinery/computer/communications{
dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown)
"aB" = (
/mob/living/simple_mob/mechanical/viscerator,
/mob/living/simple_mob/mechanical/viscerator,
@@ -228,8 +234,19 @@
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown)
"aP" = (
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/hyper;
dir = 4;
name = "Unknown APC";
pixel_x = -24
},
/turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown)
"aQ" = (
/obj/machinery/computer/communications,
/obj/machinery/computer/area_atmos{
dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown)
"aR" = (
@@ -301,22 +318,6 @@
},
/turf/simulated/floor/plating,
/area/submap/virgo2/Blackshuttledown)
"bc" = (
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/hyper;
dir = 4;
name = "Unknown APC";
pixel_x = 24
},
/turf/simulated/shuttle/wall/dark{
icon_state = "dark0";
name = "Unknown Shuttle"
},
/area/submap/virgo2/Blackshuttledown)
"bd" = (
/obj/machinery/computer/area_atmos,
/turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown)
"be" = (
/obj/structure/table/steel,
/obj/item/weapon/paper{
@@ -708,12 +709,12 @@ af
af
ai
aj
aA
aF
aF
aF
aF
aQ
aF
aF
aF
aF
bd
aj
au
af
@@ -1341,7 +1342,7 @@ aj
aj
ba
ba
bc
aj
aj
aj
aq
@@ -1378,7 +1379,7 @@ aU
aF
aq
aq
aq
aP
bh
aj
ba
maps/tether/tether-03-surface3.dmm
+19 -11
View File
@@ -20436,10 +20436,22 @@
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"Hy" = (
/obj/structure/closet/hydrant{
pixel_y = 32
},
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/shuttle_pad)
"Hz" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"HA" = (
/obj/structure/closet/hydrant{
pixel_y = -32
},
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/shuttle_pad)
"HH" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -22528,10 +22540,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"WN" = (
/obj/structure/closet/hydrant,
/turf/simulated/wall,
/area/tether/surfacebase/shuttle_pad)
"WZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -35611,8 +35619,8 @@ Uj
NB
NB
Uj
KW
WN
HA
IR
KW
Uj
Uj
@@ -36173,8 +36181,8 @@ IR
IR
Rf
XZ
WN
KW
IR
Hy
Gt
Mq
OL
@@ -36888,7 +36896,7 @@ Jr
Js
Wh
JE
Hy
Hz
IY
bg
RO
@@ -37030,7 +37038,7 @@ Js
Js
Jz
JE
Hy
Hz
IY
bg
RO
@@ -37172,7 +37180,7 @@ Jt
Js
Jz
JE
Hy
Hz
IY
bg
RO
maps/tether/tether-05-station1.dmm
+20 -20
View File
@@ -6542,6 +6542,25 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"alV" = (
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "tether_dock";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
req_one_access = list(13)
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4;
icon_state = "map"
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
"alW" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/steeldecal/steel_decals_central6{
@@ -21466,25 +21485,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
"bPA" = (
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "tether_dock";
name = "interior access button";
pixel_x = 28;
pixel_y = 26;
req_one_access = list(13)
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4;
icon_state = "map"
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_two)
"bPD" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -30667,7 +30667,7 @@ aDJ
aDJ
aDJ
aGa
bPA
alV
bPN
aJa
aFZ
maps/tether/tether-06-station2.dmm
+10 -9
View File
@@ -10609,11 +10609,6 @@
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
"pD" = (
@@ -11490,13 +11485,14 @@
icon_state = "warning";
dir = 4
},
/obj/structure/extinguisher_cabinet{
pixel_x = 25;
pixel_y = 0
},
/obj/structure/table/rack,
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
"qV" = (
@@ -14244,6 +14240,11 @@
dir = 8
},
/obj/effect/floor_decal/industrial/warning,
/obj/structure/extinguisher_cabinet{
dir = 1;
icon_state = "extinguisher_closed";
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
"vJ" = (