Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
This commit is contained in:
Artur
@@ -11418,9 +11418,6 @@
|
||||
/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
|
||||
@@ -11441,9 +11438,6 @@
|
||||
/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
|
||||
@@ -11458,9 +11452,6 @@
|
||||
/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
|
||||
@@ -11945,43 +11936,9 @@
|
||||
/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,
|
||||
@@ -12320,40 +12277,6 @@
|
||||
},
|
||||
/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{
|
||||
@@ -13424,8 +13347,7 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/ai_monitored/nuke_storage)
|
||||
"aEQ" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/paper/pamphlet/gateway,
|
||||
/obj/machinery/computer/gateway_control,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/gateway)
|
||||
"aER" = (
|
||||
@@ -13439,6 +13361,7 @@
|
||||
},
|
||||
/obj/item/storage/firstaid/regular,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/item/paper/pamphlet/gateway,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/gateway)
|
||||
"aES" = (
|
||||
|
||||
@@ -76431,6 +76431,8 @@
|
||||
/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" = (
|
||||
@@ -76441,9 +76443,6 @@
|
||||
/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{
|
||||
@@ -76459,9 +76458,6 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/gateway)
|
||||
"cyF" = (
|
||||
/obj/machinery/gateway{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/status_display/evac{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -76480,9 +76476,6 @@
|
||||
/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{
|
||||
@@ -77421,9 +77414,6 @@
|
||||
/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{
|
||||
@@ -77446,24 +77436,6 @@
|
||||
/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{
|
||||
@@ -78274,9 +78246,6 @@
|
||||
/turf/closed/wall,
|
||||
/area/gateway)
|
||||
"cBD" = (
|
||||
/obj/machinery/gateway{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
@@ -78317,9 +78286,6 @@
|
||||
/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";
|
||||
@@ -159678,7 +159644,7 @@ aAb
|
||||
aAb
|
||||
aAb
|
||||
aIL
|
||||
ePi
|
||||
arB
|
||||
aLz
|
||||
aLz
|
||||
aLz
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2575,14 +2575,33 @@
|
||||
},
|
||||
/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
|
||||
@@ -7443,9 +7462,6 @@
|
||||
/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
|
||||
@@ -13963,9 +13979,6 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/gateway{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/airalarm{
|
||||
dir = 4;
|
||||
@@ -78936,9 +78949,6 @@
|
||||
/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
|
||||
@@ -79005,9 +79015,6 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/gateway{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Gateway";
|
||||
@@ -80154,9 +80161,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/greenglow,
|
||||
/obj/machinery/gateway{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/gateway)
|
||||
@@ -80176,9 +80180,6 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/greenglow,
|
||||
/obj/machinery/gateway{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/gateway)
|
||||
@@ -80238,7 +80239,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/greenglow,
|
||||
/obj/machinery/gateway,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
@@ -80255,9 +80255,6 @@
|
||||
/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)
|
||||
|
||||
@@ -44652,9 +44652,6 @@
|
||||
/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
|
||||
@@ -44669,9 +44666,6 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/gateway)
|
||||
"bJZ" = (
|
||||
/obj/machinery/gateway{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/status_display/evac{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -44689,9 +44683,6 @@
|
||||
/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
|
||||
@@ -45380,11 +45371,10 @@
|
||||
/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
|
||||
},
|
||||
@@ -45395,9 +45385,6 @@
|
||||
/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
|
||||
@@ -45415,23 +45402,6 @@
|
||||
/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"
|
||||
@@ -46295,23 +46265,6 @@
|
||||
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{
|
||||
@@ -46330,23 +46283,6 @@
|
||||
},
|
||||
/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"
|
||||
|
||||
@@ -5787,9 +5787,6 @@
|
||||
/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
|
||||
@@ -5804,9 +5801,6 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/gateway)
|
||||
"aoB" = (
|
||||
/obj/machinery/gateway{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
@@ -5824,9 +5818,6 @@
|
||||
/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
|
||||
@@ -6161,9 +6152,6 @@
|
||||
/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
|
||||
@@ -6181,23 +6169,6 @@
|
||||
/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
|
||||
@@ -6378,25 +6349,7 @@
|
||||
"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
|
||||
@@ -6410,23 +6363,6 @@
|
||||
},
|
||||
/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,12 +7240,11 @@
|
||||
c_tag = "Gateway";
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/table,
|
||||
/obj/structure/sign/warning/biohazard{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/item/paper/pamphlet,
|
||||
/obj/machinery/computer/gateway_control,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/gateway)
|
||||
"arY" = (
|
||||
@@ -7366,6 +7301,7 @@
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/item/radio/off,
|
||||
/obj/item/paper/pamphlet,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/gateway)
|
||||
"asb" = (
|
||||
|
||||
Reference in New Issue
Block a user