Merge pull request #10765 from Very-Soft/messeswithstuff

Map touchups
This commit is contained in:
Novacat
2021-06-27 08:30:07 -04:00
committed by GitHub
7 changed files with 912 additions and 479 deletions
@@ -115,7 +115,8 @@
/obj/structure/sign/poster
name = "poster"
desc = "A large piece of space-resistant printed paper. "
icon = 'icons/obj/contraband.dmi'
icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit
icon_state = "poster" //VOREStation Edit
anchored = 1
var/decl/poster/poster_decl = null
var/target_poster_decl_path = /decl/poster
+67 -13
View File
@@ -2868,7 +2868,7 @@
dir = 8
},
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
@@ -3815,6 +3815,7 @@
dir = 8;
pixel_x = 24
},
/obj/machinery/light/small,
/turf/simulated/floor/tiled,
/area/rnd/hardstorage)
"ags" = (
@@ -6361,9 +6362,11 @@
/turf/simulated/floor/plating,
/area/hallway/lower/first_west)
"akT" = (
/obj/structure/sign/poster,
/turf/simulated/wall,
/area/hallway/lower/first_west)
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/reinforced,
/area/rnd/testingroom)
"akU" = (
/obj/item/device/radio/intercom{
dir = 8;
@@ -6533,6 +6536,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/sign/poster{
dir = 1
},
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"alh" = (
@@ -7797,6 +7803,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"anc" = (
@@ -10311,7 +10320,7 @@
dir = 8
},
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/first_aid_west)
@@ -13210,6 +13219,9 @@
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/tiled,
/area/security/checkpoint)
"awi" = (
@@ -17593,6 +17605,9 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker/laundry_arrival)
"aCI" = (
@@ -21769,6 +21784,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"aJY" = (
@@ -26672,6 +26690,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 4
},
/obj/machinery/light,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/processing)
"aTg" = (
@@ -28356,6 +28375,9 @@
"aWb" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/weapon/stool/padded,
/obj/structure/sign/poster{
dir = 1
},
/turf/simulated/floor/wood,
/area/vacant/vacant_bar)
"aWc" = (
@@ -29147,6 +29169,9 @@
/obj/structure/table/steel,
/obj/item/weapon/paper_bin,
/obj/item/weapon/pen,
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/wood,
/area/vacant/vacant_bar)
"aXB" = (
@@ -31056,6 +31081,7 @@
dir = 5
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/rnd/external)
"bcV" = (
@@ -32584,6 +32610,10 @@
/obj/effect/floor_decal/corner/red/border,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
"fna" = (
/obj/machinery/light/small,
/turf/simulated/floor/tiled,
/area/rnd/hardstorage)
"fpU" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/hidden/green,
@@ -33123,6 +33153,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"haz" = (
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/engineering/atmos/processing)
"hco" = (
/obj/machinery/atmospherics/pipe/simple/hidden/green{
dir = 9
@@ -33953,6 +33987,12 @@
},
/turf/simulated/floor/carpet/gaycarpet,
/area/tether/surfacebase/funny/clownoffice)
"jYP" = (
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"kbZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -34767,6 +34807,10 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"lZU" = (
/obj/structure/sign/poster,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
"meS" = (
/turf/simulated/floor/carpet/gaycarpet,
/area/tether/surfacebase/funny/clownoffice)
@@ -34850,6 +34894,10 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/tether/surfacebase/tram)
"mtL" = (
/obj/structure/sign/poster,
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"mvM" = (
/obj/structure/cable/green{
d1 = 4;
@@ -35877,6 +35925,12 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/crew_quarters/visitor_laundry)
"pxk" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/grey/border,
/obj/structure/sign/poster,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
"pyD" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Mining Maintenance Access"
@@ -44360,7 +44414,7 @@ axI
awU
aAk
abN
aeR
akT
aeR
agl
agN
@@ -44893,7 +44947,7 @@ akn
abE
jbU
akJ
akT
ahl
alg
alq
alB
@@ -45355,7 +45409,7 @@ abn
abn
acx
afg
abv
fna
abm
aCm
akg
@@ -46095,7 +46149,7 @@ aQR
aRu
aPl
aPl
aPl
haz
aOR
aTW
aUv
@@ -47652,7 +47706,7 @@ aOx
aJI
aPt
aJI
aJI
jYP
aQy
aRD
aRW
@@ -53204,7 +53258,7 @@ aVA
aVQ
bHR
aUP
bcT
pxk
aVn
anK
aYi
@@ -53321,7 +53375,7 @@ aDu
atm
aCQ
aJV
aDu
mtL
aLj
aLT
aME
@@ -54451,7 +54505,7 @@ auB
aEO
lsh
aFW
auB
lZU
aCO
jCv
aIz
+22 -30
View File
@@ -752,7 +752,7 @@
},
/obj/effect/floor_decal/steeldecal/steel_decals10,
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/recoveryward)
@@ -1961,7 +1961,7 @@
dir = 4
},
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/evidence)
@@ -5669,9 +5669,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"aiO" = (
@@ -6757,9 +6755,7 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 9
},
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"akF" = (
@@ -6948,7 +6944,7 @@
dir = 8
},
/obj/structure/sign/poster{
pixel_x = -32
dir = 8
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
@@ -7653,9 +7649,7 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 6
},
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"alW" = (
@@ -10332,10 +10326,6 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"aqt" = (
/obj/structure/sign/poster,
/turf/simulated/wall,
/area/tether/surfacebase/public_garden_two)
"aqu" = (
/obj/structure/table/standard{
name = "plastic table frame"
@@ -10346,6 +10336,9 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 9
},
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"aqv" = (
@@ -11352,14 +11345,10 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/machinery/vending/cigarette{
name = "Cigarette machine";
prices = list();
products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/obj/effect/floor_decal/techfloor/hole{
dir = 1
},
/obj/machinery/vending/sovietvend,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"ash" = (
@@ -12609,6 +12598,9 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 6
},
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"auk" = (
@@ -14370,12 +14362,12 @@
/area/tether/surfacebase/surface_two_hall)
"axu" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/sign/poster{
pixel_x = -32
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"axv" = (
@@ -25880,7 +25872,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/machinery/vending/snack{
/obj/machinery/vending/weeb{
dir = 1
},
/turf/simulated/floor/tiled/monotile,
@@ -34679,15 +34671,15 @@
/area/ai_upload)
"xbt" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/sign/poster{
pixel_x = -32
},
/obj/structure/bed/chair{
dir = 4
},
/obj/effect/landmark/start{
name = "Medical Doctor"
},
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"xfa" = (
@@ -39377,7 +39369,7 @@ adt
adt
adt
akX
aqt
akX
akX
akX
adt
@@ -40517,7 +40509,7 @@ aqz
aog
ars
atI
aqt
akX
akX
aPv
aPD
+40 -47
View File
@@ -791,13 +791,13 @@
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 4
},
/obj/structure/sign/poster{
pixel_x = 32
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"abj" = (
@@ -7085,6 +7085,9 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/chemistry)
"akC" = (
@@ -10071,6 +10074,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
"apU" = (
@@ -11072,7 +11078,6 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/recreation_area_restroom)
"arE" = (
/obj/machinery/vending/cola,
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
},
@@ -11089,6 +11094,7 @@
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/machinery/vending/bepis,
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/surface_three_hall)
"arF" = (
@@ -13685,6 +13691,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"awy" = (
@@ -14091,32 +14100,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/research)
"axb" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
/obj/effect/floor_decal/corner/blue/border{
dir = 8
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 8
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 8
},
/obj/machinery/computer/id_restorer{
dir = 4;
pixel_x = -30
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
"axc" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -23732,9 +23715,6 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aNy" = (
/obj/structure/sign/poster{
pixel_x = -32
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
@@ -24730,7 +24710,7 @@
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"aPB" = (
/obj/machinery/vending/snack{
/obj/machinery/vending/weeb{
dir = 4
},
/turf/simulated/floor/tiled,
@@ -24970,7 +24950,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/barrestroom)
"aQg" = (
/obj/machinery/vending/cola{
/obj/machinery/vending/bepis{
dir = 4
},
/turf/simulated/floor/tiled,
@@ -27983,9 +27963,7 @@
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"aVM" = (
@@ -33177,6 +33155,9 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"beB" = (
@@ -33898,6 +33879,9 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar)
"bfY" = (
@@ -35518,15 +35502,15 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/topairlock)
"biU" = (
/obj/machinery/vending/snack{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey{
dir = 5
},
/obj/effect/floor_decal/corner/lightgrey{
dir = 10
},
/obj/machinery/vending/sol{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/cafeteria)
"biV" = (
@@ -38700,6 +38684,12 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"eWS" = (
/obj/structure/sign/poster{
dir = 1
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/cafeteria)
"faL" = (
/obj/structure/lattice,
/obj/structure/cable/orange{
@@ -39805,7 +39795,7 @@
dir = 4
},
/obj/structure/sign/poster{
pixel_x = 32
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/breakroom)
@@ -41105,6 +41095,9 @@
/area/tether/surfacebase/security/hos)
"oMK" = (
/obj/machinery/atmospherics/unary/engine,
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/shuttle_pad)
"oOD" = (
@@ -42506,9 +42499,6 @@
"uiJ" = (
/obj/machinery/chemical_dispenser/full,
/obj/structure/table/reinforced,
/obj/structure/sign/poster{
pixel_x = 32
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 6
},
@@ -42518,6 +42508,9 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/structure/sign/poster{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/chemistry)
"ukn" = (
@@ -57473,7 +57466,7 @@ aqR
aZS
aZZ
anL
axb
vvA
viF
vKm
nlf
@@ -58102,7 +58095,7 @@ beU
bhx
beU
biF
biL
eWS
bjc
bjj
bjq
+17 -36
View File
@@ -19,14 +19,12 @@
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
@@ -186,8 +184,7 @@
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
dir = 4;
icon_state = "map-scrubbers"
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
dir = 4
@@ -214,12 +211,10 @@
"oz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
@@ -257,14 +252,13 @@
/obj/structure/cable{
icon_state = "1-8"
},
/turf/simulated/floor/holofloor/tiled/dark,
/turf/simulated/floor/tiled/dark,
/area/tether/midpoint)
"tn" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -282,8 +276,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -331,8 +324,7 @@
/area/tether/midpoint)
"xl" = (
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/obj/machinery/atmospherics/pipe/zpipe/down,
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
@@ -352,8 +344,7 @@
/area/maintenance/tether_midpoint)
"zi" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
dir = 8
},
/turf/simulated/floor/wood,
/area/tether/midpoint)
@@ -460,25 +451,21 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"Iq" = (
/obj/machinery/light{
dir = 2
},
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/tether/midpoint)
"It" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -497,8 +484,7 @@
dir = 5
},
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
@@ -508,9 +494,7 @@
dir = 4
},
/obj/machinery/firealarm{
dir = 2;
layer = 3.3;
pixel_x = 0;
pixel_y = 26
},
/turf/simulated/floor/wood,
@@ -533,8 +517,7 @@
dir = 1
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/obj/structure/lattice,
/obj/machinery/door/firedoor/glass,
@@ -566,8 +549,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/structure/lattice,
/obj/structure/disposalpipe/down,
@@ -698,12 +680,11 @@
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/holofloor/tiled/dark,
/turf/simulated/floor/tiled/dark,
/area/tether/midpoint)
"YB" = (
/obj/structure/table/woodentable,
/obj/structure/flora/pottedplant/smallcactus{
pixel_x = 0;
pixel_y = 8
},
/turf/simulated/floor/wood,
File diff suppressed because it is too large Load Diff
+4
View File
@@ -951,6 +951,10 @@
name = "\improper Dock Three"
icon_state = "dk_yellow"
/area/tether/station/restroom
name = "\improper Unisex Restroom"
icon_state = "dk_yellow"
/area/maintenance/station/abandonedholodeck
name = "\improper Old Holodeck"
icon_state = "dk_yellow"