Merge pull request #11744 from Very-Soft/woemoretweaks

More map tweaks
This commit is contained in:
Casey
2021-11-01 05:35:02 -04:00
committed by GitHub
5 changed files with 442 additions and 389 deletions
+4 -4
View File
@@ -2399,7 +2399,7 @@
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
/obj/effect/overmap/visitable/ship/landable/ccboat,
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"ih" = (
/obj/effect/floor_decal/corner/blue{
@@ -4542,7 +4542,7 @@
id_tag = "ccboat";
pixel_y = 29
},
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"qZ" = (
/obj/machinery/body_scanconsole{
@@ -4655,7 +4655,7 @@
id_tag = null
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"rU" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -6077,7 +6077,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"zy" = (
/obj/effect/floor_decal/derelict/d11,
File diff suppressed because it is too large Load Diff
+27 -2
View File
@@ -413,6 +413,10 @@
/obj/structure/low_wall/bay/reinforced/steel,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portfore)
"aV" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portaft)
"aW" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -1243,6 +1247,7 @@
/obj/effect/landmark{
name = "morphspawn"
},
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck2/portaft)
"cW" = (
@@ -4502,6 +4507,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck2/briefingroom)
"kE" = (
@@ -10299,6 +10305,9 @@
/obj/random/tech_supply,
/obj/random/tech_supply,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/tiled/techmaint,
/area/storage/primary)
"xL" = (
@@ -11941,6 +11950,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/engineering/storage)
"BB" = (
@@ -16066,6 +16076,10 @@
/obj/machinery/light{
dir = 4
},
/obj/item/paint_palette,
/obj/item/paint_palette,
/obj/item/paint_brush,
/obj/item/paint_brush,
/turf/simulated/floor/tiled,
/area/storage/art)
"KD" = (
@@ -18054,6 +18068,9 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/tiled/eris/steel/brown_platform,
/area/crew_quarters/bar)
"Pf" = (
@@ -20907,6 +20924,7 @@
req_one_access = list(19);
stripe_color = "#f7d35c"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/stellardelight/deck2/briefingroom)
"VG" = (
@@ -22289,6 +22307,13 @@
},
/turf/simulated/floor/tiled/eris/dark/cargo,
/area/crew_quarters/recreation_area)
"YO" = (
/obj/structure/table/gamblingtable,
/obj/machinery/recharger{
pixel_y = 5
},
/turf/simulated/floor/carpet,
/area/crew_quarters/recreation_area)
"YP" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -29864,7 +29889,7 @@ kg
RZ
dC
cV
iz
aV
qC
zv
Xm
@@ -32672,7 +32697,7 @@ JL
nt
BS
Dl
UX
YO
BK
Fw
vS
+20 -3
View File
@@ -3075,6 +3075,10 @@
/obj/effect/landmark/start/visitor,
/turf/simulated/floor/wood,
/area/stellardelight/deck3/cafe)
"ms" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portfore)
"mv" = (
/obj/machinery/atmospherics/unary/engine{
dir = 1
@@ -4406,6 +4410,13 @@
/obj/random/vendorfood,
/turf/simulated/floor/tiled,
/area/stellardelight/deck3/aft)
"qY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portaft)
"qZ" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/power/apc/angled{
@@ -7747,6 +7758,11 @@
},
/turf/simulated/floor/airless,
/area/stellardelight/deck3/exterior)
"Dk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portaft)
"Dn" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
@@ -9703,6 +9719,7 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/portfore)
"KS" = (
@@ -20956,7 +20973,7 @@ eF
IP
YD
bC
Ns
ms
Ns
Ns
Hk
@@ -26386,8 +26403,8 @@ Ne
iS
iS
Kz
iS
FG
Dk
qY
JW
Ld
KD
+4 -4
View File
@@ -1897,7 +1897,7 @@
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
/obj/effect/overmap/visitable/ship/landable/ccboat,
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"gj" = (
/obj/machinery/vending/cola{
@@ -2099,7 +2099,7 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"gP" = (
/obj/structure/table/rack,
@@ -5573,7 +5573,7 @@
id_tag = null
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"wx" = (
/obj/structure/bed/chair/shuttle{
@@ -6550,7 +6550,7 @@
id_tag = "ccboat";
pixel_y = 29
},
/turf/simulated/floor/tiled/eris/dark/danger,
/turf/simulated/floor/airless,
/area/shuttle/ccboat)
"Cn" = (
/turf/unsimulated/wall,