cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21194 from WJohn/more_gunhog_mapping

Browse Source 
Minor updates to the aux base construction area.
This commit is contained in:
Cheridan
2016-10-27 07:56:40 -05:00
committed by GitHub
parent d2ca8e18f1 e0906bf2e0
commit d1a18b8d1e
2 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/MetaStation/MetaStation.dmm
+42 -19
View File
@@ -17865,7 +17865,9 @@
},
/area/shuttle/mining)
"aET" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -19602,6 +19604,11 @@
c_tag = "Auxillary Mining Base";
dir = 1
},
/obj/machinery/camera{
c_tag = "Auxillary Mining Base";
dir = 1;
network = list("SS13","AuxBase")
},
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
"aHG" = (
@@ -24088,6 +24095,9 @@
/turf/open/floor/plating,
/area/construction)
"aQe" = (
/obj/structure/closet/secure_closet/miner{
locked = 0
},
/turf/open/floor/plating/warnplate{
dir = 6
},
@@ -24877,7 +24887,9 @@
/turf/closed/wall,
/area/quartermaster/qm)
"aRy" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/obj/machinery/light_switch{
pixel_x = -23;
pixel_y = 0
@@ -27952,6 +27964,12 @@
dir = 4;
on = 1
},
/obj/machinery/status_display{
density = 0;
layer = 4;
pixel_x = 0;
pixel_y = 32
},
/turf/open/floor/plasteel/warning{
dir = 1
},
@@ -27996,12 +28014,6 @@
name = "Arrivals"
})
"aWW" = (
/obj/machinery/status_display{
density = 0;
layer = 4;
pixel_x = 0;
pixel_y = 32
},
/obj/machinery/light{
dir = 1
},
@@ -28223,7 +28235,9 @@
name = "Station Intercom (General)";
pixel_x = 27
},
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -37241,7 +37255,9 @@
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/obj/machinery/keycard_auth{
pixel_x = 0;
pixel_y = 24
@@ -45013,18 +45029,17 @@
name = "Arrivals"
})
"bzx" = (
/obj/item/device/radio/intercom{
freerange = 0;
frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/camera{
c_tag = "Arrivals - Middle Arm - Far";
dir = 1;
network = list("SS13")
},
/obj/machinery/status_display{
density = 0;
layer = 4;
pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/plasteel/warning,
/area/hallway/secondary/entry{
name = "Arrivals"
@@ -92396,6 +92411,14 @@
/obj/structure/mining_shuttle_beacon{
dir = 2
},
/obj/machinery/computer/security/telescreen{
desc = "Used for the Auxillary Mining Base.";
dir = 1;
name = "Auxillary Base Monitor";
network = list("AuxBase");
pixel_x = 0;
pixel_y = -28
},
/turf/open/floor/plasteel/yellow/side,
/area/mining_construction)
"dcF" = (
@@ -103732,7 +103755,7 @@ aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
aaa
@@ -106329,7 +106352,7 @@ bab
bum
bab
bxK
bzC
bOI
aSJ
aYo
aYo
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+36 -11
View File
@@ -4776,12 +4776,18 @@
/turf/open/floor/plasteel,
/area/atmos)
"ajZ" = (
/obj/machinery/atmospherics/pipe/manifold/green/visible{
dir = 4
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
layer = 4;
name = "EXTERNAL AIRLOCK";
pixel_x = 0;
pixel_y = 32
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/atmos)
/turf/open/floor/plating,
/area/mining_construction)
"aka" = (
/obj/structure/chair{
dir = 1
@@ -7844,6 +7850,9 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"aqN" = (
/obj/structure/closet/secure_closet/miner{
locked = 0
},
/turf/open/floor/plating/warnplate{
dir = 5
},
@@ -8841,7 +8850,8 @@
"atk" = (
/obj/machinery/camera{
c_tag = "Auxillary Mining Base";
dir = 8
dir = 8;
network = list("SS13","AuxBase")
},
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
@@ -10547,6 +10557,13 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/device/assault_pod/mining,
/obj/machinery/computer/security/telescreen{
desc = "Used for the Auxillary Mining Base.";
dir = 8;
name = "Auxillary Base Monitor";
network = list("AuxBase");
pixel_x = 28
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -20415,7 +20432,9 @@
/turf/open/floor/plasteel,
/area/bridge)
"aUd" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -34585,7 +34604,9 @@
name = "Station Intercom (General)";
pixel_x = 27
},
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -35578,7 +35599,9 @@
/turf/open/floor/engine,
/area/toxins/explab)
"bAS" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/obj/machinery/camera{
c_tag = "Quartermaster's Office";
dir = 4
@@ -37416,7 +37439,9 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"bEK" = (
/obj/machinery/computer/security/mining,
/obj/machinery/computer/security/mining{
network = list("MINE","AuxBase")
},
/obj/machinery/camera{
c_tag = "Mining Dock";
dir = 4;
@@ -72094,7 +72119,7 @@ apJ
apJ
apJ
apJ
asF
ajZ
atp
asF
asF