Map Adjustments v.3 (#6694)

This commit is contained in:
Joshie
2019-07-09 01:45:56 +02:00
committed by Werner
parent ba20132d2d
commit 32c8cd4b0c
6 changed files with 1656 additions and 730 deletions
@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Furrycactus
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Tidied up some pipes and wires around the station, added disposals to some more places lacking them."
- maptweak: "Added a backup SMES to the engineering sublevel, can be charged over the shift like a backup battery."
- maptweak: "Engineering sublevel now has a proper hallway, instead of a weird maintenance section just outside the elevator."
@@ -96,3 +96,8 @@
/area/engineering/gravity_gen
name = "\improper Engineering - Gravity Generator"
icon_state = "engine"
/area/engineering/backup_SMES
name = "\improper Engineering - Backup Power Storage"
icon_state = "substation"
sound_env = SMALL_ENCLOSED
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+16
View File
@@ -1104,6 +1104,10 @@
d2 = 8;
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating{
roof_type = null
},
@@ -7571,6 +7575,10 @@
pixel_x = -22;
pixel_y = 0
},
/obj/structure/disposalpipe/up{
icon_state = "pipe-u";
dir = 4
},
/turf/simulated/floor/plating{
roof_type = null
},
@@ -8243,6 +8251,10 @@
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"yf" = (
@@ -10664,6 +10676,10 @@
icon_state = "11-1"
},
/obj/structure/lattice,
/obj/structure/disposalpipe/down{
icon_state = "pipe-d";
dir = 8
},
/turf/simulated/open,
/area/maintenance/maintcentral)
"MV" = (
+165 -63
View File
@@ -11225,7 +11225,6 @@
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
@@ -11298,6 +11297,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"vw" = (
@@ -11510,10 +11513,6 @@
},
/area/crew_quarters/fitness/pool)
"vZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
@@ -11522,6 +11521,8 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wa" = (
@@ -11529,9 +11530,6 @@
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"wb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
@@ -11540,6 +11538,9 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wc" = (
@@ -11597,6 +11598,7 @@
icon_state = "corner_white";
dir = 6
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wh" = (
@@ -11895,6 +11897,9 @@
/area/crew_quarters/fitness/pool)
"wL" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/bridge/levela)
"wM" = (
@@ -11902,6 +11907,9 @@
dir = 1;
pixel_y = -22
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/bridge/levela)
"wN" = (
@@ -11912,10 +11920,6 @@
/turf/simulated/floor/plating,
/area/bridge/levela)
"wO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -11928,6 +11932,10 @@
pixel_x = -22
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/machinery/meter{
name = "Air supply"
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wP" = (
@@ -11938,13 +11946,13 @@
/obj/machinery/light{
dir = 8
},
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j2";
dir = 2
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -11952,6 +11960,10 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wR" = (
@@ -11972,6 +11984,9 @@
icon_state = "corner_white_full";
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"wT" = (
@@ -11979,6 +11994,9 @@
icon_state = "corner_white";
dir = 9
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wU" = (
@@ -12001,6 +12019,9 @@
name = "Command Dock Monitoring";
req_access = list(19)
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wW" = (
@@ -12066,6 +12087,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"xb" = (
@@ -12079,6 +12103,9 @@
/obj/machinery/firealarm/north{
pixel_y = 36
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xc" = (
@@ -12089,6 +12116,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xd" = (
@@ -12493,6 +12523,7 @@
icon_state = "corner_white_full";
dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xU" = (
@@ -12503,6 +12534,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xV" = (
@@ -12516,6 +12550,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xW" = (
@@ -12535,6 +12572,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xY" = (
@@ -12841,6 +12882,9 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"yD" = (
@@ -12863,6 +12907,9 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"yE" = (
@@ -12881,6 +12928,10 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"yF" = (
@@ -13203,6 +13254,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"zl" = (
@@ -13349,6 +13401,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"zJ" = (
@@ -13363,6 +13418,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"zK" = (
@@ -14274,6 +14333,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"BM" = (
@@ -14914,6 +14976,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dk" = (
@@ -14990,6 +15053,7 @@
d2 = 8;
icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dr" = (
@@ -15036,6 +15100,10 @@
d2 = 1;
icon_state = "11-1"
},
/obj/structure/disposalpipe/down{
icon_state = "pipe-d";
dir = 4
},
/turf/simulated/open,
/area/bridge/levela)
"Dw" = (
@@ -15049,6 +15117,10 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dx" = (
@@ -18854,6 +18926,7 @@
/obj/structure/sign/drop{
pixel_x = 32
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Lr" = (
@@ -19057,6 +19130,16 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/sleep/cryo)
"Mj" = (
/obj/structure/bed/chair{
dir = 8
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"Mk" = (
/obj/structure/closet/toolcloset,
/obj/random/tech_supply,
@@ -19360,6 +19443,10 @@
icon_state = "intact-supply";
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/bridge/levela)
"NA" = (
@@ -20616,6 +20703,13 @@
temperature = 303.15
},
/area/crew_quarters/fitness/pool)
"RU" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal,
/turf/simulated/floor/wood,
/area/bridge/levela)
"RW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -20771,6 +20865,16 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"SE" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/bed/chair{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"SF" = (
/obj/structure/cable/green{
d1 = 4;
@@ -20873,6 +20977,7 @@
dir = 9;
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/bridge/levela)
"Te" = (
@@ -21325,6 +21430,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Ve" = (
@@ -21520,6 +21626,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/bridge/levela)
"VI" = (
@@ -21594,6 +21703,10 @@
/obj/machinery/photocopier/faxmachine{
department = "Command Study"
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/bridge/levela)
"VT" = (
@@ -21618,6 +21731,10 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"VV" = (
@@ -21631,6 +21748,7 @@
/obj/structure/sign/drop{
pixel_x = 32
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"VW" = (
@@ -21679,6 +21797,10 @@
d2 = 4;
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"Wa" = (
@@ -21813,6 +21935,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/bridge/levela)
"Wr" = (
@@ -22008,6 +22134,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/random/junk,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"WH" = (
@@ -22265,15 +22392,6 @@
icon_state = "asteroidplating"
},
/area/mine/explored)
"Xq" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/machinery/light/small/emergency{
dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"Xr" = (
/obj/effect/floor_decal/corner/paleblue{
icon_state = "corner_white";
@@ -22303,11 +22421,8 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/fitness/changing)
"Xt" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/machinery/meter{
name = "Scrubbers"
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
@@ -22339,30 +22454,14 @@
},
/area/crew_quarters/fitness/pool)
"Xw" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/machinery/meter{
name = "Air supply"
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"Xx" = (
/obj/machinery/atmospherics/pipe/simple/visible{
icon_state = "intact";
dir = 10
name = "Scrubbers"
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"Xz" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"XA" = (
/obj/machinery/atmospherics/pipe/simple/visible{
icon_state = "intact";
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/turf/simulated/floor/plating,
@@ -22490,6 +22589,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/levela)
"Ya" = (
@@ -47832,9 +47934,9 @@ ey
ey
ey
gv
gv
mk
mA
mA
mO
gv
nr
@@ -51430,9 +51532,9 @@ eI
eI
eI
gv
gv
mk
mA
mA
mO
gv
ag
@@ -51761,7 +51863,7 @@ GQ
Px
Px
Px
Xq
Px
Xt
Xw
Xz
@@ -52017,11 +52119,11 @@ HC
GQ
ag
ag
ag
Px
Px
Px
Px
Xx
XA
Xx
XA
AV
Px
ag
@@ -52274,10 +52376,10 @@ HD
GQ
ag
ag
Px
Px
Px
Px
ag
ag
ag
ag
Px
AV
Px
@@ -66624,7 +66726,7 @@ VQ
Vw
VD
VJ
VQ
RU
rV
Pp
Md
@@ -68166,7 +68268,7 @@ rV
uB
Ik
VN
VN
SE
wa
yF
rV
@@ -68937,7 +69039,7 @@ rV
vl
Ms
wi
wi
Mj
xW
yH
rV