mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-22 20:57:23 +01:00
Map touchups
This commit is contained in:
Chompstation Bot
@@ -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
|
||||
|
||||
@@ -2913,7 +2913,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
pixel_y = 32
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/lowmedbaymaint)
|
||||
@@ -3862,6 +3862,7 @@
|
||||
dir = 8;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/hardstorage)
|
||||
"ags" = (
|
||||
@@ -6359,9 +6360,21 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/public_garden)
|
||||
"akT" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/structure/sign/poster,
|
||||
/turf/simulated/wall,
|
||||
/area/tether/surfacebase/public_garden)
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/structure/sign/poster,
|
||||
/turf/simulated/wall,
|
||||
/area/hallway/lower/first_west)
|
||||
=======
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/rnd/testingroom)
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"akU" = (
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 8;
|
||||
@@ -6531,6 +6544,9 @@
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/public_garden)
|
||||
"alh" = (
|
||||
@@ -7811,6 +7827,9 @@
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/public_garden)
|
||||
"anc" = (
|
||||
@@ -10313,7 +10332,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
pixel_y = 32
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/first_aid_west)
|
||||
@@ -13313,6 +13332,9 @@
|
||||
/obj/effect/floor_decal/corner/red/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/checkpoint)
|
||||
"awi" = (
|
||||
@@ -17681,6 +17703,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" = (
|
||||
@@ -21782,6 +21807,9 @@
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/hallway)
|
||||
"aJY" = (
|
||||
@@ -26703,6 +26731,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/engineering/atmos/processing)
|
||||
"aTg" = (
|
||||
@@ -28465,6 +28494,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" = (
|
||||
@@ -29247,6 +29279,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" = (
|
||||
@@ -31154,6 +31189,7 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/chamber_pump,
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/external)
|
||||
"bcV" = (
|
||||
@@ -32625,6 +32661,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,
|
||||
@@ -33143,6 +33183,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
|
||||
@@ -33919,6 +33963,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
|
||||
@@ -34739,6 +34789,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)
|
||||
@@ -34822,6 +34876,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;
|
||||
@@ -35814,6 +35872,36 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/brig)
|
||||
<<<<<<< HEAD
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"pud" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/crew_quarters/visitor_laundry)
|
||||
=======
|
||||
"pud" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/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)
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"pyD" = (
|
||||
/obj/machinery/door/airlock/maintenance/common{
|
||||
name = "Mining Maintenance Access"
|
||||
@@ -44114,7 +44202,7 @@ axI
|
||||
awU
|
||||
aAk
|
||||
abN
|
||||
aeR
|
||||
akT
|
||||
aeR
|
||||
agl
|
||||
agN
|
||||
@@ -44647,7 +44735,7 @@ akn
|
||||
abE
|
||||
jbU
|
||||
akJ
|
||||
akT
|
||||
ahl
|
||||
alg
|
||||
alq
|
||||
alB
|
||||
@@ -45109,7 +45197,7 @@ abn
|
||||
abn
|
||||
acx
|
||||
afg
|
||||
abv
|
||||
fna
|
||||
abm
|
||||
aCm
|
||||
akg
|
||||
@@ -45849,7 +45937,7 @@ aQR
|
||||
aRu
|
||||
aPl
|
||||
aPl
|
||||
aPl
|
||||
haz
|
||||
aOR
|
||||
aTW
|
||||
aUv
|
||||
@@ -47406,7 +47494,7 @@ aOx
|
||||
aJI
|
||||
aPt
|
||||
aJI
|
||||
aJI
|
||||
jYP
|
||||
aQy
|
||||
aRD
|
||||
aRW
|
||||
@@ -53160,7 +53248,7 @@ aVA
|
||||
aVQ
|
||||
aUP
|
||||
aUP
|
||||
bcT
|
||||
pxk
|
||||
aVn
|
||||
anK
|
||||
aYi
|
||||
@@ -53297,7 +53385,7 @@ aDu
|
||||
atm
|
||||
aCQ
|
||||
aJV
|
||||
aDu
|
||||
mtL
|
||||
aLj
|
||||
aLT
|
||||
aME
|
||||
@@ -54487,7 +54575,7 @@ auB
|
||||
aEO
|
||||
lsh
|
||||
aFW
|
||||
auB
|
||||
lZU
|
||||
aCO
|
||||
jCv
|
||||
aIz
|
||||
|
||||
@@ -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)
|
||||
@@ -1974,6 +1974,16 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/structure/sign/poster{
|
||||
pixel_y = 32
|
||||
},
|
||||
=======
|
||||
/obj/structure/sign/poster{
|
||||
dir = 1
|
||||
},
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/surfacebase/security/evidence)
|
||||
"acW" = (
|
||||
@@ -5669,9 +5679,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" = (
|
||||
@@ -6761,9 +6769,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" = (
|
||||
@@ -6941,8 +6947,34 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
"akR" = (
|
||||
<<<<<<< HEAD
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/tether/surfacebase/medical/uppersouthstairwell)
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/middlehall)
|
||||
=======
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/middlehall)
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"akS" = (
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/vending/fitness{
|
||||
@@ -7634,9 +7666,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" = (
|
||||
@@ -10316,10 +10346,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"
|
||||
@@ -10330,6 +10356,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" = (
|
||||
@@ -11327,14 +11356,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" = (
|
||||
@@ -12580,6 +12605,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" = (
|
||||
@@ -14373,12 +14401,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" = (
|
||||
@@ -25649,7 +25677,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,
|
||||
@@ -35402,15 +35430,15 @@
|
||||
>>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid
|
||||
"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" = (
|
||||
@@ -40100,7 +40128,7 @@ adt
|
||||
adt
|
||||
adt
|
||||
akX
|
||||
aqt
|
||||
akX
|
||||
akX
|
||||
akX
|
||||
adt
|
||||
@@ -41240,7 +41268,7 @@ aqz
|
||||
aog
|
||||
ars
|
||||
atI
|
||||
aqt
|
||||
akX
|
||||
akX
|
||||
adt
|
||||
adt
|
||||
|
||||
@@ -128463,13 +128463,13 @@ aaa
|
||||
/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" = (
|
||||
@@ -134757,6 +134757,9 @@ aaa
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/chemistry)
|
||||
"akC" = (
|
||||
@@ -137741,6 +137744,9 @@ aaa
|
||||
/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" = (
|
||||
@@ -138741,7 +138747,6 @@ aaa
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/crew_quarters/recreation_area_restroom)
|
||||
"arE" = (
|
||||
/obj/machinery/vending/cola,
|
||||
/obj/effect/floor_decal/corner/lightgrey{
|
||||
dir = 9
|
||||
},
|
||||
@@ -138758,6 +138763,7 @@ aaa
|
||||
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" = (
|
||||
@@ -141358,6 +141364,9 @@ aaa
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals7{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/research/researchdivision)
|
||||
"awy" = (
|
||||
@@ -141766,32 +141775,6 @@ aaa
|
||||
},
|
||||
/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{
|
||||
@@ -151414,9 +151397,6 @@ aaa
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/shuttle_pad)
|
||||
"aNy" = (
|
||||
/obj/structure/sign/poster{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorwhite{
|
||||
dir = 8
|
||||
},
|
||||
@@ -152411,7 +152391,7 @@ aaa
|
||||
/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,
|
||||
@@ -152651,7 +152631,7 @@ aaa
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/crew_quarters/barrestroom)
|
||||
"aQg" = (
|
||||
/obj/machinery/vending/cola{
|
||||
/obj/machinery/vending/bepis{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
@@ -155529,9 +155509,7 @@ aaa
|
||||
},
|
||||
/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)
|
||||
"aVN" = (
|
||||
@@ -160446,6 +160424,9 @@ aaa
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"beB" = (
|
||||
@@ -161159,6 +161140,9 @@ aaa
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
/area/crew_quarters/bar)
|
||||
"bfY" = (
|
||||
@@ -162710,15 +162694,15 @@ aaa
|
||||
/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" = (
|
||||
@@ -165973,6 +165957,12 @@ aaa
|
||||
},
|
||||
/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{
|
||||
@@ -167136,7 +167126,7 @@ aaa
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
pixel_x = 32
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/security/breakroom)
|
||||
@@ -231693,6 +231683,9 @@ aaa
|
||||
/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" = (
|
||||
@@ -233123,9 +233116,6 @@ aaa
|
||||
"uiJ" = (
|
||||
/obj/machinery/chemical_dispenser/full,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/structure/sign/poster{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorwhite{
|
||||
dir = 6
|
||||
},
|
||||
@@ -233135,6 +233125,9 @@ aaa
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_y = -30
|
||||
},
|
||||
/obj/structure/sign/poster{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/chemistry)
|
||||
"und" = (
|
||||
@@ -248111,7 +248104,7 @@ aqR
|
||||
aZS
|
||||
aZZ
|
||||
anL
|
||||
axb
|
||||
vvA
|
||||
viF
|
||||
vKm
|
||||
nlf
|
||||
@@ -248740,7 +248733,7 @@ beU
|
||||
bhx
|
||||
beU
|
||||
biF
|
||||
biL
|
||||
eWS
|
||||
bjc
|
||||
bjj
|
||||
bjq
|
||||
|
||||
@@ -103,14 +103,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)
|
||||
@@ -297,19 +295,286 @@
|
||||
/obj/structure/disposalpipe/down{
|
||||
dir = 1
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/light/small{
|
||||
dir = 4;
|
||||
pixel_y = 0
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
|
||||
dir = 4;
|
||||
icon_state = "map-scrubbers"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/sortjunction/flipped{
|
||||
dir = 1;
|
||||
name = "Tether Midpoint";
|
||||
sortType = "Tether Midpoint"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"nD" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
=======
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/sortjunction/flipped{
|
||||
dir = 1;
|
||||
name = "Tether Midpoint";
|
||||
sortType = "Tether Midpoint"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"nD" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
<<<<<<< HEAD
|
||||
/turf/simulated/open,
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/midpoint)
|
||||
"oz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5;
|
||||
icon_state = "intact-scrubbers"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"oN" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/random/maintenance/engineering,
|
||||
/obj/random/maintenance/engineering,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"oP" = (
|
||||
/obj/structure/grille,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"pK" = (
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"pM" = (
|
||||
/turf/simulated/floor/plating,
|
||||
=======
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/midpoint)
|
||||
"oz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"oN" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/random/maintenance/engineering,
|
||||
/obj/random/maintenance/engineering,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"oP" = (
|
||||
/obj/structure/grille,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"pK" = (
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"pM" = (
|
||||
/turf/simulated/floor/plating,
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/area/maintenance/tether_midpoint)
|
||||
<<<<<<< HEAD
|
||||
"E" = (
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"pO" = (
|
||||
/obj/machinery/media/jukebox,
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"sw" = (
|
||||
/obj/machinery/vending/bepis{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"sR" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"tn" = (
|
||||
=======
|
||||
"pO" = (
|
||||
/obj/machinery/media/jukebox,
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"sw" = (
|
||||
/obj/machinery/vending/bepis{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"sR" = (
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"tn" = (
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/structure/cable{
|
||||
<<<<<<< HEAD
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"tA" = (
|
||||
/obj/structure/table/bench/padded,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"tB" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"uA" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"uC" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/holoposter{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"vh" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/structure/flora/pottedplant/small{
|
||||
pixel_y = 8
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"vt" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/camera/network/civilian{
|
||||
dir = 1
|
||||
=======
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"tA" = (
|
||||
/obj/structure/table/bench/padded,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"tB" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"uA" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"uC" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/holoposter{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"vh" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/structure/flora/pottedplant/small{
|
||||
pixel_y = 8
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"vt" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/camera/network/civilian{
|
||||
dir = 1
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
@@ -317,11 +582,71 @@
|
||||
/obj/structure/table/bench/padded,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
<<<<<<< HEAD
|
||||
"G" = (
|
||||
/obj/structure/grille,
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"xl" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4;
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/cable{
|
||||
icon_state = "32-2"
|
||||
},
|
||||
/obj/structure/disposalpipe/down,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"yi" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/random/maintenance/engineering,
|
||||
=======
|
||||
"xl" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/cable{
|
||||
icon_state = "32-2"
|
||||
},
|
||||
/obj/structure/disposalpipe/down,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"yi" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/random/maintenance/engineering,
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
<<<<<<< HEAD
|
||||
"H" = (
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"zi" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"zG" = (
|
||||
=======
|
||||
"zi" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"zG" = (
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
@@ -386,17 +711,53 @@
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
icon_state = "1-2"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/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
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
=======
|
||||
/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,
|
||||
/turf/simulated/floor/wood,
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/area/tether/midpoint)
|
||||
"P" = (
|
||||
/obj/structure/cable{
|
||||
<<<<<<< HEAD
|
||||
icon_state = "1-4"
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
=======
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/obj/machinery/vending/snack{
|
||||
dir = 1
|
||||
@@ -420,16 +781,49 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
icon_state = "tube1"
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
<<<<<<< HEAD
|
||||
"T" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/structure/flora/pottedplant/smallcactus{
|
||||
pixel_x = 0;
|
||||
pixel_y = 8
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"Kh" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 2;
|
||||
layer = 3.3;
|
||||
pixel_x = 0;
|
||||
pixel_y = 26
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"KH" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
=======
|
||||
"Kh" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
layer = 3.3;
|
||||
pixel_y = 26
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"KH" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
@@ -439,11 +833,111 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
<<<<<<< HEAD
|
||||
"V" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5;
|
||||
icon_state = "intact-scrubbers"
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
"Ls" = (
|
||||
/obj/structure/disposalpipe/down{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4;
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"ML" = (
|
||||
/obj/structure/closet,
|
||||
/obj/random/maintenance,
|
||||
/obj/random/maintenance,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"Nt" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"NJ" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/midpoint)
|
||||
"Oq" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/disposalpipe/down,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"Or" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
=======
|
||||
"Ls" = (
|
||||
/obj/structure/disposalpipe/down{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"ML" = (
|
||||
/obj/structure/closet,
|
||||
/obj/random/maintenance,
|
||||
/obj/random/maintenance,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"Nt" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/midpoint)
|
||||
"NJ" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/midpoint)
|
||||
"Oq" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/disposalpipe/down,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/open,
|
||||
/area/maintenance/tether_midpoint)
|
||||
"Or" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
@@ -487,8 +981,25 @@
|
||||
icon_state = "1-2";
|
||||
pixel_y = 0
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
/turf/simulated/floor/holofloor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"YB" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/structure/flora/pottedplant/smallcactus{
|
||||
pixel_x = 0;
|
||||
pixel_y = 8
|
||||
=======
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
"YB" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/structure/flora/pottedplant/smallcactus{
|
||||
pixel_y = 8
|
||||
>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/tether/midpoint)
|
||||
|
||||
+1330
-282
File diff suppressed because it is too large
Load Diff
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user