shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hard resets _maps to master

Browse Source
This commit is contained in:
Artur
2020-06-16 16:09:05 +03:00
parent 5df0cbfc40
commit bc30fb7710
17 changed files with 869 additions and 71211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+84 -6
View File
@@ -11789,6 +11789,9 @@
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"azJ" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -11809,6 +11812,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"azL" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -11823,6 +11829,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"azM" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -12307,9 +12316,43 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/ai_monitored/nuke_storage)
"aBd" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBe" = (
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBf" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBg" = (
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
@@ -12648,7 +12691,42 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aBX" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBY" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBZ" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -13717,7 +13795,8 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aEQ" = (
/obj/machinery/computer/gateway_control,
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"aER" = (
@@ -13731,7 +13810,6 @@
},
/obj/item/storage/firstaid/regular,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"aES" = (
@@ -83976,8 +84054,8 @@ awb
axt
ayG
azJ
azM
azL
aBd
aBX
aDi
aEQ
aFW
@@ -84490,8 +84568,8 @@ vgJ
hSl
ayG
azL
azM
azJ
aBf
aBY
aDw
aES
aJh
_maps/map_files/Deltastation/DeltaStation2.dmm
+39 -3
View File
@@ -64841,6 +64841,7 @@
pixel_x = -26
},
/obj/structure/sign/painting/library{
pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/wood,
@@ -75566,8 +75567,6 @@
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/effect/turf_decal/bot,
/obj/item/paper/pamphlet/gateway,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"cyD" = (
@@ -75578,6 +75577,9 @@
/turf/open/floor/plating,
/area/gateway)
"cyE" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
@@ -75593,6 +75595,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cyF" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -75611,6 +75616,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cyG" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -76568,6 +76576,9 @@
/turf/open/floor/plating,
/area/gateway)
"cAi" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
@@ -76590,6 +76601,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
"cAk" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"cAl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
@@ -77399,6 +77428,9 @@
/turf/closed/wall,
/area/gateway)
"cBD" = (
/obj/machinery/gateway{
dir = 10
},
/obj/machinery/light{
dir = 8
},
@@ -77439,6 +77471,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cBF" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Bridge - Gateway Chamber";
@@ -125421,6 +125456,7 @@
/area/chapel/office)
"iNK" = (
/obj/structure/sign/painting/library{
pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/wood,
@@ -170067,7 +170103,7 @@ cul
cvE
cvz
cyG
cyG
cAk
cBF
cDm
cFa
_maps/map_files/KiloStation/KiloStation.dmm
+22 -19
View File
@@ -2536,33 +2536,14 @@
},
/area/space/nearstation)
"aeG" = (
<<<<<<< HEAD
/obj/machinery/atmospherics/pipe/simple/general/visible{
=======
/obj/machinery/light/small,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/maintenance/starboard/fore)
"aeH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
>>>>>>> d02e0cc... Gateway refactor (#49868)
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
<<<<<<< HEAD
/obj/effect/turf_decal/tile/blue{
dir = 1
=======
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel/dark,
/area/gateway)
"aeI" = (
/obj/effect/turf_decal/tile/red{
dir = 8
>>>>>>> d02e0cc... Gateway refactor (#49868)
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -7224,6 +7205,9 @@
/turf/open/floor/plasteel/dark,
/area/tcommsat/computer)
"amk" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -13620,6 +13604,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gateway{
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
dir = 4;
@@ -76347,6 +76334,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/box/corners{
dir = 4
@@ -76413,6 +76403,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Gateway";
@@ -77558,6 +77551,9 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -77577,6 +77573,9 @@
dir = 4
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -77636,6 +77635,7 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "0-2"
@@ -77652,6 +77652,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
_maps/map_files/MetaStation/MetaStation.dmm
+66 -1
View File
@@ -44581,6 +44581,9 @@
/turf/open/floor/plating,
/area/gateway)
"bJY" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -44595,6 +44598,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"bJZ" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -44612,6 +44618,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"bKa" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45283,10 +45292,11 @@
/turf/open/floor/plasteel,
/area/gateway)
"bLB" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel{
dir = 1
},
@@ -45297,6 +45307,9 @@
/turf/open/floor/plating,
/area/gateway)
"bLD" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45314,6 +45327,23 @@
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
/area/gateway)
"bLF" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bLG" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -46165,6 +46195,23 @@
dir = 1
},
/area/gateway)
"bNp" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNq" = (
/obj/machinery/gateway,
/obj/structure/cable/yellow{
@@ -46183,6 +46230,23 @@
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNr" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNs" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -67109,6 +67173,7 @@
name = "Test Chamber Telescreen";
network = list("toxins");
pixel_x = -32;
pixel_y = 0
},
/turf/open/floor/plasteel,
/area/science/mixing)
_maps/map_files/OmegaStation/OmegaStation.dmm
+3 -1
View File
@@ -4290,7 +4290,8 @@
department = "Head of Security's Desk";
departmentType = 5;
name = "Head of Security RC";
pixel_x = 30
pixel_x = 30;
pixel_y = 0
},
/obj/machinery/computer/security/hos{
icon_state = "computer";
@@ -13316,6 +13317,7 @@
dir = 9
},
/obj/machinery/computer/security/wooden_tv{
pixel_x = 0;
pixel_y = 4
},
/turf/open/floor/wood,
_maps/map_files/PubbyStation/PubbyStation.dmm
+66 -2
View File
@@ -5811,6 +5811,9 @@
/turf/closed/wall,
/area/maintenance/fore)
"aoA" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -5825,6 +5828,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"aoB" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/light{
dir = 1
},
@@ -5842,6 +5848,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"aoC" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6181,6 +6190,9 @@
/turf/open/space,
/area/space/nearstation)
"apq" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6198,6 +6210,23 @@
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
/area/gateway)
"aps" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apt" = (
/obj/structure/chair{
dir = 4
@@ -6383,7 +6412,25 @@
"apT" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/nuke_storage)
"apU" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apV" = (
/obj/machinery/gateway,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6397,6 +6444,23 @@
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apW" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apX" = (
/turf/closed/wall,
/area/crew_quarters/dorms)
@@ -7304,11 +7368,12 @@
c_tag = "Gateway";
dir = 4
},
/obj/structure/table,
/obj/structure/sign/warning/biohazard{
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/computer/gateway_control,
/obj/item/paper/pamphlet,
/turf/open/floor/plasteel,
/area/gateway)
"arY" = (
@@ -7365,7 +7430,6 @@
pixel_x = 32
},
/obj/item/radio/off,
/obj/item/paper/pamphlet,
/turf/open/floor/plasteel,
/area/gateway)
"asb" = (