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

Merge pull request #15527 from TripleShades/fuck

Browse Source 
Omega Solars + two things
This commit is contained in:
Lin
2022-02-24 08:27:30 +00:00
committed by GitHub
parent 64697f6663 1678d8a551
commit 05f86ba5a4
1 changed files with 306 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/OmegaStation/OmegaStation.dmm
+306 -271
View File
@@ -6155,6 +6155,9 @@
/turf/closed/wall/r_wall,
/area/command/heads_quarters/cmo)
"ajH" = (
/obj/machinery/door/window/eastleft{
req_access_txt = "48;50"
},
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -10523,6 +10526,7 @@
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/closet/secure_closet/contraband/armory,
/turf/open/floor/plasteel,
/area/security/brig)
"aqC" = (
@@ -20157,17 +20161,21 @@
/turf/open/floor/plasteel,
/area/engineering/main)
"aFB" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Starboard Bow Solar";
network = list("ss13","engine")
},
/obj/machinery/power/solar_control{
id = "forestarboard";
name = "Starboard Bow Solar Control"
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"aFC" = (
@@ -23300,7 +23308,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/space/basic,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aKo" = (
/obj/structure/lattice,
@@ -24244,13 +24252,10 @@
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"aLL" = (
/obj/effect/turf_decal/box,
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/tracker,
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/port/aft)
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"aLM" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -32798,7 +32803,6 @@
pixel_x = -32;
pixel_y = 32
},
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -32811,6 +32815,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/caution,
/turf/open/floor/plasteel,
/area/maintenance/solars/port/aft)
"bal" = (
@@ -33358,13 +33363,13 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bbf" = (
/obj/machinery/power/smes,
/obj/machinery/camera{
c_tag = "Port Quarter Solar";
dir = 4;
network = list("ss13","engine")
},
/obj/structure/cable{
/obj/machinery/power/smes,
/obj/structure/cable/white{
icon_state = "0-4"
},
/turf/open/floor/plating,
@@ -33379,6 +33384,9 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"bbi" = (
@@ -33389,10 +33397,7 @@
pixel_x = 24
},
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/structure/cable/white{
icon_state = "0-2"
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
@@ -33481,10 +33486,10 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/structure/cable/white{
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"bbp" = (
@@ -33831,9 +33836,15 @@
/area/solars/starboard/fore)
"bbR" = (
/obj/machinery/light/small,
/obj/structure/cable/white{
icon_state = "1-8"
/obj/machinery/power/solar_control{
dir = 8;
id = "aftport";
name = "Port Quarter Solar Control"
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"bbS" = (
@@ -33881,7 +33892,6 @@
/turf/open/floor/plating/airless,
/area/solars/starboard/fore)
"bbZ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -33891,6 +33901,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/effect/turf_decal/caution,
/turf/open/floor/plasteel,
/area/maintenance/solars/starboard/fore)
"bca" = (
@@ -33902,7 +33913,6 @@
dir = 8
},
/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -34318,25 +34328,19 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"bcJ" = (
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/turf_decal/box,
/obj/machinery/power/tracker,
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/starboard/fore)
/obj/structure/lattice,
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"bcK" = (
/obj/machinery/power/solar_control{
id = "forestarboard";
name = "Starboard Bow Solar Control"
},
/obj/effect/turf_decal/bot,
/obj/machinery/power/terminal{
dir = 4
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"bcL" = (
@@ -34400,6 +34404,10 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"bcS" = (
@@ -34889,14 +34897,11 @@
/turf/open/floor/plating/airless,
/area/solars/starboard/fore)
"bdC" = (
/obj/machinery/power/solar_control{
id = "aftport";
name = "Port Quarter Solar Control"
},
/obj/effect/turf_decal/bot,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "1-8"
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
@@ -34926,17 +34931,17 @@
},
/area/command/heads_quarters/rd)
"bdE" = (
/obj/machinery/power/apc{
areastring = "/area/maintenance/solars/starboard/fore";
name = "Starboard Bow Solar APC";
pixel_y = -26
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/maintenance/solars/starboard/fore";
name = "Starboard Bow Solar APC";
pixel_y = -26
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"bdF" = (
@@ -34963,7 +34968,7 @@
dir = 1;
pixel_y = -22
},
/obj/structure/cable/white{
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plating,
@@ -36808,8 +36813,11 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"bgk" = (
/obj/structure/cable/white{
icon_state = "4-8"
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
@@ -40900,6 +40908,10 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
"eDE" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
/area/space/station_ruins)
"eOg" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
@@ -47272,6 +47284,14 @@
/obj/item/pickaxe,
/turf/open/floor/plating,
/area/engineering/atmos)
"uBW" = (
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/turf_decal/box,
/obj/machinery/power/tracker,
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/starboard/fore)
"uCY" = (
/turf/open/pool,
/area/maintenance/starboard/aft)
@@ -47650,6 +47670,14 @@
"vMb" = (
/turf/open/floor/engine/n2o,
/area/engineering/atmos)
"vPH" = (
/obj/effect/turf_decal/box,
/obj/machinery/power/tracker,
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/solars/port/aft)
"vPZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -47778,6 +47806,13 @@
},
/turf/open/floor/plasteel/dark,
/area/command/bridge)
"wle" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/space/basic,
/area/solars/starboard/fore)
"wqL" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
@@ -71072,7 +71107,7 @@ jFP
jFP
jFP
jFP
jFP
eDE
jFP
jFP
jFP
@@ -71584,23 +71619,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
jFP
jFP
jFP
@@ -71841,23 +71876,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
jFP
jFP
jFP
@@ -72098,23 +72133,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
jFP
jFP
jFP
@@ -72355,23 +72390,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
fMP
sdX
aLL
aLL
aLL
sdX
vPH
sdX
aLL
aLL
aLL
sdX
aLL
aaa
aaa
jFP
jFP
jFP
@@ -72612,23 +72647,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
fMP
aaa
aaa
aaa
aaa
aaa
aMH
aaa
aaa
aaa
aaa
aaa
aLL
aaa
aaa
jFP
jFP
jFP
@@ -72869,21 +72904,21 @@ jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
fMP
aaa
aKr
aKr
aKr
aKr
aMI
aKr
aKr
aKr
aKr
aaa
aLL
aaa
aaa
jFP
@@ -73126,21 +73161,21 @@ jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aab
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
sdX
sdX
aKB
aLz
aLz
aLz
aMQ
bar
bar
bar
bbS
sdX
sdX
aaa
aaa
jFP
@@ -73385,19 +73420,19 @@ aaa
aaa
aaa
aaa
pZU
sdX
pZU
pZU
pZU
sdX
aLL
sdX
pZU
pZU
pZU
sdX
pZU
aaa
aKF
aKF
aKF
aKF
aMH
aKF
aKF
aKF
aKF
aaa
bcJ
aaa
aaa
jFP
@@ -73642,13 +73677,13 @@ aaa
aaa
aaa
aaa
pZU
aLL
aaa
aaa
aaa
aaa
aaa
aMH
aZS
aaa
aaa
aaa
@@ -96711,7 +96746,7 @@ aaa
aaa
aaa
aaa
pZU
sdX
aaa
aaa
aaa
@@ -96723,7 +96758,7 @@ aaa
aaa
aaa
aaa
pZU
sdX
aaa
aaa
aaa
@@ -96968,7 +97003,7 @@ aaa
aaa
aaa
aaa
sdX
aLL
aaa
abL
abL
@@ -96980,7 +97015,7 @@ abL
abL
abL
aaa
sdX
pZU
aaa
aaa
aaa
@@ -97225,7 +97260,7 @@ jFP
aaa
aaa
aaa
pZU
aLL
sdX
abM
bbQ
@@ -97482,13 +97517,13 @@ jFP
aaa
aaa
aaa
pZU
aLL
aaa
acu
acu
acu
acu
aef
wle
acu
acu
acu
@@ -97739,19 +97774,19 @@ jFP
aaa
aaa
aaa
pZU
sdX
aaa
aaa
aaa
aaa
aaa
adt
aef
aaa
aaa
aaa
aaa
aaa
pZU
sdX
aaa
aaa
aaa
@@ -97996,19 +98031,19 @@ jFP
aaa
aaa
aaa
sdX
sdX
pZU
pZU
pZU
sdX
bcJ
sdX
aaa
abL
abL
abL
abL
adt
abL
abL
abL
abL
aaa
pZU
pZU
pZU
sdX
sdX
aaa
aaa
aaa
@@ -98253,19 +98288,19 @@ jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aLL
sdX
abM
bbQ
bbQ
bbQ
adM
bbV
bbV
bbV
bcD
sdX
pZU
aaa
aaa
aaa
@@ -98510,19 +98545,19 @@ jFP
aaa
aaa
aaa
pZU
aaa
acu
acu
acu
acu
aef
acu
acu
acu
acu
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
pZU
aaa
aaa
aaa
@@ -98767,19 +98802,19 @@ jFP
aaa
aaa
aaa
pZU
aaa
aaa
aaa
aaa
aaa
adt
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
pZU
aaa
aaa
aaa
@@ -99024,19 +99059,19 @@ jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
pZU
sdX
pZU
pZU
pZU
sdX
uBW
sdX
pZU
pZU
pZU
sdX
pZU
aaa
aaa
aaa
@@ -99536,23 +99571,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
jFP
jFP
jFP
@@ -99793,23 +99828,23 @@ jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
jFP
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
jFP
jFP
jFP