diff --git a/modular_chomp/code/game/objects/structures/flora.dm b/modular_chomp/code/game/objects/structures/flora.dm index 95d80ec10b..b359386af2 100644 --- a/modular_chomp/code/game/objects/structures/flora.dm +++ b/modular_chomp/code/game/objects/structures/flora.dm @@ -8,9 +8,12 @@ icon_state = "tree" base_state = "tree" product = /obj/item/stack/material/log - product_amount = 5 + product_amount = 15 health = 200 max_health = 200 + pixel_x = -32 + pixel_y = 0 + shake_animation_degrees = 2 /obj/structure/flora/tree/weepingcherry2 name = "Weeping Cherry" @@ -19,6 +22,9 @@ icon_state = "tree" base_state = "tree" product = /obj/item/stack/material/log - product_amount = 5 + product_amount = 25 health = 250 - max_health = 250 \ No newline at end of file + max_health = 250 + pixel_x = -48 + pixel_y = -12 + shake_animation_degrees = 2 \ No newline at end of file diff --git a/modular_chomp/icons/obj/flora/weepingcherry1.dmi b/modular_chomp/icons/obj/flora/weepingcherry1.dmi index de3f3e8daf..8e2ba90f79 100644 Binary files a/modular_chomp/icons/obj/flora/weepingcherry1.dmi and b/modular_chomp/icons/obj/flora/weepingcherry1.dmi differ diff --git a/modular_chomp/icons/obj/flora/weepingcherry2.dmi b/modular_chomp/icons/obj/flora/weepingcherry2.dmi index f513de9899..7d38ed2666 100644 Binary files a/modular_chomp/icons/obj/flora/weepingcherry2.dmi and b/modular_chomp/icons/obj/flora/weepingcherry2.dmi differ diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm index 6bf12cca77..39b61a4706 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm @@ -44,6 +44,23 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, /turf/simulated/floor/tiled, /area/security/Shuttlebay_Storage) +"aae" = ( +/obj/structure/sign/directions/security{ + pixel_y = 9; + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/science{ + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/command{ + pixel_y = -9; + dir = 1; + layer = 3.5 + }, +/turf/simulated/wall, +/area/hallway/Aft_2_Deck_Stairwell) "aaf" = ( /obj/structure/lattice, /turf/space, @@ -370,13 +387,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 8; - color = "#989898" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/rnd/Toxins_Viewing_Port) "aaG" = ( @@ -1048,6 +1064,36 @@ }, /turf/simulated/floor/tiled/dark, /area/security/Boardroom) +"abE" = ( +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/grille, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/sign/directions/cargo{ + pixel_y = 9; + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/engineering{ + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/medical{ + dir = 1; + pixel_y = -9; + layer = 3.5 + }, +/turf/simulated/floor/plating, +/area/hallway/Stairwell_Aft) "abF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1375,10 +1421,10 @@ /area/hallway/Aft_2_Deck_Stairwell) "aci" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "acj" = ( -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "ack" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1758,6 +1804,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -25 + }, /turf/simulated/floor/tiled/dark, /area/maintenance/Deck2_Civilian_StarCorridor1) "acU" = ( @@ -1860,9 +1910,6 @@ /obj/structure/disposalpipe/sortjunction/wildcard{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, /turf/simulated/wall, /area/maintenance/Deck2_Civilian_StarCorridor1) "adc" = ( @@ -2334,6 +2381,11 @@ c_tag = "D2-Com-Aft Stairwell1"; network = list("Commons") }, +/obj/structure/sign/directions/dock{ + pixel_y = 23; + layer = 3.5; + dir = 1 + }, /turf/simulated/open, /area/hallway/Stairwell_Aft) "adZ" = ( @@ -2436,6 +2488,10 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/sign/directions/dorms{ + pixel_y = 23; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/Stairwell_Aft) "aei" = ( @@ -3010,6 +3066,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/Deck2_AftStar_Corridor) +"afi" = ( +/obj/effect/catwalk_plated/techmaint, +/obj/random/trash, +/turf/simulated/floor/plating, +/area/hallway/Stairwell_Aft) "afj" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/hatch, @@ -3045,6 +3106,13 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor, /area/rnd/Toxins_Viewing_Port) +"afn" = ( +/obj/effect/catwalk_plated/techmaint, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/hallway/Stairwell_Aft) "afo" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -4018,6 +4086,10 @@ id = "sc-DBNstall2"; specialfunctions = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/Restroom) "agI" = ( @@ -4279,6 +4351,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, /turf/simulated/floor/tiled/kafel_full/green, /area/crew_quarters/Botanical_Shop) "ahg" = ( @@ -4606,6 +4684,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/grass, /area/crew_quarters/Public_Hydroponics) +"ahE" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/turf/simulated/floor/tiled/kafel_full/green, +/area/crew_quarters/Public_Hydroponics) "ahF" = ( /obj/structure/table/marble, /obj/machinery/cash_register/civilian{ @@ -4692,6 +4776,12 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled/hydro, /area/crew_quarters/Botanical_Shop) "ahP" = ( @@ -4951,6 +5041,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/Central_2_Deck_Hall) +"ail" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6, +/turf/simulated/floor/tiled, +/area/hallway/For_2_Deck_Stairwell) "aim" = ( /turf/simulated/wall, /area/engineering/Storage) @@ -5382,6 +5476,15 @@ "aiU" = ( /turf/simulated/open, /area/hallway/ForPort_2_Deck_Observatory) +"aiV" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/For_2_Deck_Stairwell) "aiW" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/industrial/hatch/blue, @@ -6456,6 +6559,20 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/directions/command{ + pixel_y = -9; + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/bar{ + pixel_y = 9; + layer = 3.5; + dir = 1 + }, +/obj/structure/sign/directions/cryo{ + dir = 1; + layer = 3.5 + }, /turf/simulated/floor/plating, /area/hallway/Central_2_Deck_Hall) "akE" = ( @@ -7109,6 +7226,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/For_2_Deck_Central_Corridor_1) +"alL" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/turf/simulated/floor/tiled/kafel_full/blue, +/area/security/Restroom) "alM" = ( /obj/structure/bed/chair/wood/wings{ color = "#004b9a"; @@ -9818,18 +9944,6 @@ }, /turf/simulated/floor/tiled, /area/security/Firing_Range) -"ato" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/Aft_2_Deck_Lobby) "atr" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28; @@ -12346,6 +12460,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/Port_Restroom) "aCj" = ( @@ -15277,6 +15394,11 @@ dir = 1; layer = 3.5 }, +/obj/structure/sign/directions/cryo{ + dir = 1; + layer = 3.5; + pixel_y = -9 + }, /turf/simulated/floor/plating, /area/hallway/For_2_Deck_Central_Corridor_1) "aMc" = ( @@ -24229,9 +24351,9 @@ dir = 1 }, /obj/effect/floor_decal/industrial/arrows/blue, -/obj/machinery/door/airlock/angled_bay/standard/color/security{ - req_access = null; - name = "Security Foyer" +/obj/machinery/door/airlock/angled_bay/standard/glass/security{ + name = "Security Foyer"; + req_access = null }, /turf/simulated/floor/tiled/techmaint, /area/security/Lobby) @@ -28540,6 +28662,10 @@ /obj/structure/window/basic{ dir = 4 }, +/obj/structure/sign/directions/gym{ + layer = 3.5; + dir = 4 + }, /turf/simulated/floor/plating, /area/crew_quarters/Gym) "bIy" = ( @@ -29422,15 +29548,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/Deck2_2_Corridor) "bMp" = ( @@ -31023,6 +31149,10 @@ pixel_y = -27; name = "1S-emergency suit storage" }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/Restroom) "bSC" = ( @@ -33016,6 +33146,10 @@ id = "sc-DBNstall3"; specialfunctions = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/Restroom) "bZW" = ( @@ -36844,6 +36978,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_2_Deck_Lobby) "cmy" = ( @@ -37351,8 +37491,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/For_2_Deck_Stairwell) @@ -40433,10 +40573,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ +/obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, /turf/simulated/floor/tiled, @@ -50463,7 +50600,8 @@ }, /obj/structure/sign/directions/bar{ pixel_y = 9; - layer = 3.5 + layer = 3.5; + dir = 1 }, /obj/structure/sign/directions/dorms{ layer = 3.5 @@ -51756,7 +51894,7 @@ /area/rnd/Testing_Chamber) "fhu" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "fhw" = ( /obj/structure/cable/green{ @@ -51902,6 +52040,9 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/security/Forensics_Office) "fiG" = ( @@ -52351,9 +52492,6 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/closet/emergsuit_wall{ pixel_y = 27; name = "1N-emergency suit storage" @@ -52371,6 +52509,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/Port_Restroom) "fpg" = ( @@ -54493,12 +54634,12 @@ "fPz" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/directions/science{ - dir = 4; + dir = 5; layer = 3.5; pixel_y = 9 }, /obj/structure/sign/directions/medical{ - dir = 4; + dir = 5; layer = 3.5 }, /obj/structure/sign/directions/command{ @@ -55602,8 +55743,8 @@ /turf/simulated/floor/plating, /area/maintenance/Deck2_Cargo_AftPortCorridor1) "gbs" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - color = "#989898" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rnd/Robotics_Lab) @@ -58544,6 +58685,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/security/Forensics_Office) "gNu" = ( @@ -60110,7 +60254,12 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals_central5, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_2_Deck_Central_Corridor_1) "hhO" = ( @@ -64900,7 +65049,7 @@ "iwp" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "iwR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -65309,9 +65458,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ - color = "#989898"; - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/bridge/HoP_Office) @@ -66455,6 +66606,9 @@ /turf/simulated/floor/plating, /area/hallway/AftPort_2_Deck_Observatory) "iRv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full/green, /area/crew_quarters/Public_Hydroponics) "iRy" = ( @@ -68236,8 +68390,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6; + pixel_x = -1 }, /turf/simulated/floor/tiled, /area/hallway/For_2_Deck_Stairwell) @@ -71292,8 +71450,8 @@ /turf/simulated/floor/tiled, /area/rnd/Testing_Lab) "kms" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hallway/Stairwell_For) @@ -72274,10 +72432,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/Cargo_Substation) -"kCO" = ( -/obj/structure/sign/directions/ladderwell, -/turf/simulated/wall, -/area/crew_quarters/Gallery) "kCQ" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -72529,6 +72683,11 @@ dir = 8; specialfunctions = 4 }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -27; + name = "1W-emergency suit storage" + }, /turf/simulated/floor/tiled/kafel_full, /area/security/Restroom) "kGz" = ( @@ -77931,10 +78090,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/red/bordercorner{ dir = 8 }, /turf/simulated/floor/tiled, @@ -78178,8 +78337,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 }, /turf/simulated/floor/tiled, /area/hallway/Stairwell_For) @@ -78549,6 +78708,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled/kafel_full/white, /area/crew_quarters/Gym) "mvK" = ( @@ -78968,6 +79133,21 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/sign/directions/security{ + pixel_y = -9; + dir = 1; + layer = 3.5 + }, +/obj/structure/sign/directions/kitchen{ + pixel_y = 9; + layer = 3.5; + dir = 1 + }, +/obj/structure/sign/directions/science/exploration{ + pixel_y = 0; + dir = 1; + layer = 3.5 + }, /turf/simulated/floor/plating, /area/hallway/Central_2_Deck_Hall) "mCd" = ( @@ -81822,6 +82002,10 @@ id = "sc-DBNstall1"; specialfunctions = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled/kafel_full, /area/security/Restroom) "nrr" = ( @@ -85550,6 +85734,9 @@ /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/Stairwell_For) "oxg" = ( @@ -91604,6 +91791,12 @@ pixel_x = 11; pixel_y = -27 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, /turf/simulated/floor/tiled/kafel_full/blue, /area/security/Restroom) "qgB" = ( @@ -92742,7 +92935,7 @@ /obj/effect/floor_decal/industrial/arrows/yellow{ dir = 1 }, -/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/Star_Restroom) "qxf" = ( @@ -94306,12 +94499,12 @@ /area/crew_quarters/Gym) "qTR" = ( /obj/structure/sign/directions/engineering{ - dir = 8; + dir = 9; layer = 3.5; pixel_y = 9 }, /obj/structure/sign/directions/cargo{ - dir = 8; + dir = 9; layer = 3.5 }, /obj/structure/sign/directions/security{ @@ -95493,10 +95686,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 1; - color = "#989898" - }, +/obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled/techfloor, /area/rnd/Mech_Bay) "rkJ" = ( @@ -96746,8 +96936,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - color = "#989898" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/Robotics_Lab) @@ -102738,9 +102928,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/Robotics_Lab) "tfO" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 1; - color = "#989898" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/Mech_Bay) @@ -103581,18 +103770,11 @@ /turf/simulated/floor/plating, /area/maintenance/Deck2_Civilian_ForPortChamber1) "tur" = ( -/obj/structure/sign/directions/dorms{ - pixel_y = -9; - dir = 4 - }, /obj/structure/sign/directions/kitchen{ pixel_y = 9; layer = 3.5; dir = 1 }, -/obj/structure/sign/directions/ladderwell{ - dir = 4 - }, /turf/simulated/wall, /area/maintenance/Domicile_Substation) "tut" = ( @@ -105006,6 +105188,10 @@ /turf/simulated/floor/carpet/brown, /area/hallway/Port_Transit_Foyer) "tPR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled/kafel_full, /area/crew_quarters/Gym) "tPU" = ( @@ -105173,9 +105359,12 @@ /turf/simulated/floor/tiled, /area/hallway/Port_2_Deck_Central_Corridor_2) "tRq" = ( -/obj/structure/flora/tree/jungle_small, /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/tree/weepingcherry2{ + icon_state = "tree2" + }, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "tRr" = ( /obj/structure/cable/green{ @@ -105959,7 +106148,7 @@ /area/medical/Chemistry) "uaB" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Aft_2_Deck_Stairwell) "uaD" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -106093,6 +106282,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/Processing_Room) "uda" = ( @@ -107544,13 +107739,12 @@ /turf/simulated/floor/tiled, /area/hallway/Aft_2_Deck_Central_Corridor_1) "uzF" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central2{ - dir = 8; - color = "#989898" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/rnd/Toxins_Viewing_Port) "uzV" = ( @@ -111809,6 +112003,7 @@ /turf/simulated/floor/plating, /area/maintenance/Deck2_Cargo_StarChamber1) "vSv" = ( +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/hallway/Stairwell_Aft) "vSz" = ( @@ -114851,9 +115046,6 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/closet/emergsuit_wall{ pixel_y = 27; name = "1N-emergency suit storage" @@ -147283,7 +147475,7 @@ bgp auy vDt jrP -iRv +ahE bRK vPf kwm @@ -148873,7 +149065,7 @@ rtL iRP wql wql -kCO +wql wql wql cFm @@ -148887,7 +149079,7 @@ xvF tur xvF xvF -abN +aae abN abN iKC @@ -149129,7 +149321,7 @@ dEu jJM ylD duN -ato +dEu cmx qhq xhy @@ -149661,7 +149853,7 @@ mZV mZV mZV mZV -mZV +abE cmu acO acJ @@ -150170,7 +150362,7 @@ ctK adR adE qXc -ady +afi fhX cmu acQ @@ -150686,7 +150878,7 @@ aMx adR adG qXc -ady +afn vSv cmu acQ @@ -150945,7 +151137,7 @@ adX adH qXc ady -ady +afi cmu acQ acQ @@ -151593,8 +151785,8 @@ bCu bCu bCu eIE -bCu -bCu +aiV +ail wJa cAf cUk @@ -151854,7 +152046,7 @@ jdc jdc jdc owE -bvU +afw sIr xJK bjn @@ -152620,11 +152812,11 @@ avf jdc xeH cxA -bVe +alL mfe -bVe +alL dXI -bVe +alL auB qgm jdc diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm index d85c0cbdf9..f8618c0bcc 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm @@ -235,24 +235,34 @@ /area/crew_quarters/Public_Garden) "aaz" = ( /obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/beige/bordercorner, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "aaA" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "aaB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "aaC" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "aaD" = ( @@ -756,6 +766,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/Deck3_Dorms_ForCorridor1) +"abI" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/grass, +/area/crew_quarters/Public_Garden) "abJ" = ( /obj/machinery/holoposter{ dir = 4; @@ -1107,7 +1124,7 @@ /area/crew_quarters/Office_Lounge) "acv" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "acw" = ( /obj/machinery/ai_status_display{ @@ -1823,11 +1840,43 @@ }, /turf/simulated/floor/plating, /area/bridge/Breakroom) +"adZ" = ( +/obj/item/toy/nanotrasenballoon, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/Public_Garden) "aea" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/purple/bordercorner, /turf/simulated/floor/tiled/dark, /area/hallway/Star_Breakroom) +"aeb" = ( +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/grille, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/Public_Garden) +"aec" = ( +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/grille, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/Public_Garden) +"aed" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/beige/bordercorner, +/turf/simulated/floor/tiled, +/area/crew_quarters/Dorm_Corridor_4) "aee" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/hatch, @@ -1845,6 +1894,25 @@ /obj/structure/transit_tube, /turf/simulated/floor/plating, /area/crew_quarters/Chomp_Lounge) +"aef" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/Aft_3_Deck_Stairwell) +"aeg" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/plating, +/area/maintenance/Dorms_Substation) "aeh" = ( /obj/structure/sink{ dir = 4; @@ -1860,6 +1928,9 @@ }, /turf/simulated/floor/tiled/kafel_full/white, /area/crew_quarters/sleep/Dormitory_03) +"aei" = ( +/turf/simulated/floor/grass2/turfpack/station, +/area/hallway/Central_3_Deck_Hall) "aej" = ( /obj/structure/transit_tube{ icon_state = "N-S-Pass" @@ -7638,21 +7709,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/airless, /area/engineering/Solar_Control_AftStar) -"coG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/beige/bordercorner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/Dorm_Corridor_4) "cpa" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14082,7 +14138,7 @@ /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "eBi" = ( /obj/machinery/door/firedoor/multi_tile/glass, @@ -15482,7 +15538,8 @@ /turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/sleep/Dormitory_09) "eUC" = ( -/turf/simulated/floor/grass, +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "eUH" = ( /obj/structure/cable/green{ @@ -17209,8 +17266,8 @@ /area/crew_quarters/sleep/Dormitory_12) "frG" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/tree/jungle, -/turf/simulated/floor/grass, +/obj/structure/flora/tree/weepingcherry2, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "frX" = ( /obj/effect/catwalk_plated/techfloor, @@ -21129,6 +21186,9 @@ /area/maintenance/Deck3_Medical_ForStarChamber1) "gGW" = ( /obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/tree/weepingcherry1{ + icon_state = "tree2" + }, /turf/simulated/floor/grass, /area/crew_quarters/Public_Garden) "gHy" = ( @@ -24188,23 +24248,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/Deck3_Dorms_AftPortChamber2) -"hOU" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/Observation_Lounge) "hPg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28396,7 +28439,7 @@ /area/engineering/Atmospherics_Chamber) "jmf" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "jmU" = ( /obj/structure/cable{ @@ -28473,7 +28516,7 @@ /area/maintenance/Deck3_Engineering_AftStarChamber1) "joM" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "joP" = ( /obj/structure/bed/chair/office/light, @@ -29790,7 +29833,7 @@ /area/hallway/Star_Breakroom) "jLi" = ( /obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "jLk" = ( /obj/random/junk, @@ -30438,6 +30481,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -3 + }, /turf/simulated/floor/wood/alt/tile, /area/crew_quarters/Public_Garden) "jYT" = ( @@ -30497,6 +30544,7 @@ /area/medical/Virology) "jZG" = ( /obj/item/squishhammer, +/obj/structure/girder, /turf/simulated/floor/plating, /area/medical/Restrooms) "jZH" = ( @@ -31316,10 +31364,6 @@ }, /turf/simulated/floor/plating, /area/medical/Virology) -"kpC" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/grass, -/area/hallway/Central_3_Deck_Hall) "kpE" = ( /obj/item/radio/intercom{ dir = 4; @@ -32642,6 +32686,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 3 + }, /turf/simulated/floor/wood/alt/tile, /area/crew_quarters/Public_Garden) "kNr" = ( @@ -32989,10 +33037,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/Office_Lounge) -"kTO" = ( -/obj/structure/flora/tree/jungle, -/turf/simulated/floor/grass, -/area/crew_quarters/Public_Garden) "kUj" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -37142,7 +37186,7 @@ "mhn" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass2/turfpack/station, /area/hallway/Central_3_Deck_Hall) "mhr" = ( /obj/machinery/door/firedoor/border_only, @@ -42599,7 +42643,9 @@ /turf/simulated/floor/plating, /area/engineering/Atmospherics_Chamber) "nWV" = ( -/obj/structure/flora/tree/jungle_small, +/obj/structure/flora/tree/weepingcherry1{ + pixel_y = 0 + }, /turf/simulated/floor/grass, /area/crew_quarters/Public_Garden) "nXC" = ( @@ -43904,9 +43950,6 @@ /obj/structure/window/basic{ dir = 1 }, -/obj/structure/window/basic{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/Public_Garden) "osd" = ( @@ -47043,6 +47086,7 @@ /area/maintenance/Deck3_Dorms_PortCorridor1) "pwe" = ( /obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/beige/border, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "pwg" = ( @@ -50638,15 +50682,15 @@ /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Central_Corridor_1) "qEY" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/firealarm{ pixel_y = 25 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/Aft_3_Deck_Stairwell) "qFl" = ( @@ -57619,6 +57663,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/beige/border, /turf/simulated/floor/tiled, /area/crew_quarters/Dorm_Corridor_4) "sYV" = ( @@ -102856,7 +102902,7 @@ wpU xEs pvJ wik -nWV +jOy jOy cbo fMf @@ -103374,7 +103420,7 @@ dmH uMG dJu aXN -aXN +abI ttw jhg byw @@ -103646,9 +103692,9 @@ dcX aVA ptq fHI -aVA -ptq -fHI +dcX +dcX +dcX dcX aVA ptq @@ -103824,7 +103870,7 @@ adb rdD jLi eBc -eUC +aei mhn mgv tJA @@ -104080,8 +104126,8 @@ adn hnK adb rdD -eUC -eUC +aei +aei frG eUC nkd @@ -104139,8 +104185,8 @@ bRU fyp aaC pwe -orR -smc +aeb +adZ smc smc smc @@ -104339,7 +104385,7 @@ hnK adb rdD jmf -kpC +eUC acv joM ppV @@ -104397,7 +104443,7 @@ eBl aaF aaC pwe -orR +aec smc smc smc @@ -104421,7 +104467,7 @@ cuw eMQ iEn uyo -hOU +uyo upi uyo cuw @@ -104642,7 +104688,7 @@ aaX aaX aaP lrZ -aaK +aeg kAz sfB bzQ @@ -104678,9 +104724,9 @@ dcX aVA ptq fHI -aVA -ptq -fHI +dcX +dcX +dcX dcX aVA ptq @@ -104911,7 +104957,7 @@ mEG mEG mEG mEG -aaC +aef aaA uxE cak @@ -105180,7 +105226,7 @@ dQi jOy jOy gGW -kTO +jOy mrI jhg xYo @@ -106201,8 +106247,8 @@ aRa fDW oYt kAk -coG -qzo +kxy +aed kDx dGD qXq