From 8c80dcbb24db3b86bd5472988fd32fb138b919cc Mon Sep 17 00:00:00 2001 From: Kashargul Date: Mon, 30 Sep 2024 00:25:22 +0200 Subject: [PATCH] need to keep incoming, this was a partial merge --- maps/cynosure/cynosure-2.dmm | 167 +++++++++----- maps/cynosure/cynosure-3.dmm | 20 +- maps/cynosure/cynosure-6.dmm | 18 ++ maps/cynosure/cynosure-7.dmm | 428 ++++++++++++++++++----------------- 4 files changed, 370 insertions(+), 263 deletions(-) diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index 9e2f5d18d69..807e9dcf43f 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -854,10 +854,10 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/secondary/groundfloor/civilian) "azs" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "aBf" = ( /obj/effect/floor_decal/spline/plain{ @@ -5701,10 +5701,6 @@ /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain_full" }, -/obj/item/bikehorn/rubberducky{ - pixel_x = 6; - pixel_y = -6 - }, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Center"; dir = 1; @@ -13409,6 +13405,10 @@ /obj/structure/table/woodentable, /obj/item/dice/d20, /obj/item/deck/cards, +/obj/structure/flora/pottedplant/xmas{ + pixel_x = 16; + pixel_y = 25 + }, /turf/simulated/floor/carpet, /area/surface/station/library) "gvD" = ( @@ -16639,6 +16639,23 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/surface/station/medical/surgery_storage) +"ibT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/sign/level/ground{ + dir = 4; + pixel_x = -35 + }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/park) "icz" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm{ @@ -16833,6 +16850,14 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 30 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "ihg" = ( @@ -18017,11 +18042,12 @@ }, /turf/simulated/floor/plating/sif/planetuse, /area/surface/outside/station/solar/westsolar) -"iOa" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, -/area/surface/station/park) +"iOD" = ( +/obj/structure/sign/level/ground/large{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/primary/groundfloor/east) "iPo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22209,6 +22235,7 @@ "kKR" = ( /obj/structure/table/woodentable, /obj/item/deck/cards, +/obj/item/toy/xmas_cracker, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kKX" = ( @@ -24139,6 +24166,14 @@ }, /turf/simulated/floor/tiled, /area/surface/station/security/lobby) +"lIt" = ( +/obj/random/vendorfood, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/hydro, +/area/surface/station/park) "lIJ" = ( /obj/machinery/computer/aifixer{ dir = 8 @@ -27212,6 +27247,17 @@ /obj/item/folder/red, /turf/simulated/floor/plating, /area/surface/station/security/briefing_room) +"mWA" = ( +/turf/simulated/wall/r_concrete, +/area/surface/station/maintenance/kitchen) +"mWO" = ( +/obj/machinery/vending/coffee, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/hydro, +/area/surface/station/park) "mXo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -27321,6 +27367,10 @@ dir = 10 }, /obj/item/banner/nt, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "naO" = ( @@ -30155,6 +30205,15 @@ c_tag = "Ground Floor - South Hallway 3"; dir = 8 }, +/obj/structure/sign/directions/bar{ + dir = 5; + pixel_y = 39 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "osf" = ( @@ -49751,6 +49810,10 @@ /obj/item/bodybag/cryobag, /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "xGi" = ( @@ -66729,21 +66792,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66756,21 +66819,21 @@ iGM iGM iGM iGM -aNW -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -dXk -qzz -qzz -qzz -qzz -qzz +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (61,1,1) = {" @@ -66805,9 +66868,9 @@ vwy vwy vwy vwy -vwy -vwy -vwy +fyc +fyc +fyc vwy vwy vwy @@ -81574,12 +81637,12 @@ lUL jmQ lUL lUL -oqM -sYq -oqM -sYq -pts -bql +xUE +ogV +xUE +ogV +ibT +tsW wAe rIC tDF diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index e33651d8c2a..6689c57cb8c 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -2233,7 +2233,6 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, -/obj/structure/flora/pottedplant/drooping, /obj/item/radio/intercom{ dir = 4; pixel_x = 21 @@ -6077,6 +6076,14 @@ dir = 8; pixel_y = 32 }, +/obj/structure/sign/levels/security{ + dir = 5; + pixel_y = 26 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "ehU" = ( @@ -23154,10 +23161,9 @@ pixel_x = -32; pixel_y = -6 }, -/obj/structure/sign/directions/stairs_down{ - dir = 4; - pixel_x = -32; - pixel_y = -12 +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 }, /turf/simulated/floor/plating, /area/surface/station/hallway/primary/secondfloor/east) @@ -67534,8 +67540,8 @@ uwO uwO uwO uwO -uDG -iaD +aPW +rsz iaD jIo ifR diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index b68a79fcce2..39c134eae48 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -1194,6 +1194,24 @@ /obj/machinery/optable, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) +"boh" = ( +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) +"boo" = ( +/obj/structure/shuttle/falsewall_no_join{ + icon = 'icons/turf/wall_masks_tgmc.dmi'; + icon_state = "white2" + }, +/turf/simulated/floor/plating, +/area/shuttle/escape/centcom) "bos" = ( /obj/effect/floor_decal/techfloor{ dir = 10 diff --git a/maps/cynosure/cynosure-7.dmm b/maps/cynosure/cynosure-7.dmm index cd6a234836c..8900fc77e01 100644 --- a/maps/cynosure/cynosure-7.dmm +++ b/maps/cynosure/cynosure-7.dmm @@ -18,6 +18,16 @@ }, /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) +"dj" = ( +/obj/vehicle/boat/sifwood, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/wilderness/normal) +"dV" = ( +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) +"eZ" = ( +/turf/simulated/wall/sifwood, +/area/surface/wilderness/shack) "fy" = ( /obj/structure/cliff/automatic, /turf/simulated/floor/outdoors/mask, @@ -180,12 +190,10 @@ }, /turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/mountains) -"Cb" = ( -/obj/structure/cliff/automatic/corner{ - dir = 6 - }, -/turf/simulated/floor/outdoors/mask, -/area/surface/outside/wilderness/normal) +"CP" = ( +/obj/structure/table/bench/sifwooden, +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) "CR" = ( /turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/wilderness/mountains) @@ -2925,6 +2933,209 @@ oR oR oR oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +dV +dV +dV +dV +dV +dV +MS +dV +dV +dV +dV +dV +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +VU +GK +GK +bE +"} +(11,1,1) = {" +jq +pM +pM +pM +oR +oR +oR oR oR oR @@ -13722,206 +13933,15 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV MS MS -MS -MS -tM -tM -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Aq -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -VU -GK -bE -"} -(48,1,1) = {" -jq -pM -pM -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -uP -oR -oR -oR -oR -oR -uP -oR -oR -oR -uP -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR +dV +dV +dV +dV oR oR oR