diff --git a/maps/groundbase/eastwilds/eastwilds1.dmm b/maps/groundbase/eastwilds/eastwilds1.dmm index 28b038004a4..fc499a60956 100644 --- a/maps/groundbase/eastwilds/eastwilds1.dmm +++ b/maps/groundbase/eastwilds/eastwilds1.dmm @@ -29,6 +29,12 @@ "r" = ( /turf/simulated/mineral/cave/virgo3c, /area/submap/groundbase/wilderness/east/cave) +"u" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/east) "w" = ( /obj/effect/map_effect/portal/master/side_a/gb_wilds/east_west{ dir = 8 @@ -38,6 +44,12 @@ "y" = ( /turf/simulated/mineral/ignore_cavegen, /area/submap/groundbase/wilderness/east) +"B" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/east) "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/east/unexplored) @@ -2383,7 +2395,7 @@ U U U U -U +u U U U @@ -2653,7 +2665,7 @@ U U U U -U +u U U U @@ -2972,7 +2984,7 @@ U U U U -U +u U U U @@ -3421,7 +3433,7 @@ U U U U -U +u U U U @@ -3513,7 +3525,7 @@ U U U U -U +u U U U @@ -4779,7 +4791,7 @@ Z U U U -U +u U U U @@ -4839,7 +4851,7 @@ Z Z Z U -U +u U U U @@ -5212,7 +5224,7 @@ U U U U -U +u U U U @@ -5245,7 +5257,7 @@ Z Z U U -U +u U U U @@ -5414,7 +5426,7 @@ U U U U -U +u Z Z Z @@ -6518,7 +6530,7 @@ F V V Z -Z +B Z Z Z @@ -6908,7 +6920,7 @@ Z Z Z Z -U +u U U U @@ -6971,7 +6983,7 @@ U U U U -U +u U U Z @@ -8192,7 +8204,7 @@ U U U U -U +u U U U @@ -8245,7 +8257,7 @@ U U U U -U +u U U U @@ -9461,7 +9473,7 @@ r r Z Z -Z +B Z U U @@ -10186,7 +10198,7 @@ U U U U -U +u U U Z @@ -10322,7 +10334,7 @@ U U U U -U +u U U U @@ -10374,7 +10386,7 @@ U U U U -U +u U U U @@ -11219,7 +11231,7 @@ Z U U U -U +u U U U @@ -11373,7 +11385,7 @@ U U U U -U +u U Z Z @@ -11476,7 +11488,7 @@ U U U U -U +u U U U @@ -12337,7 +12349,7 @@ U U U U -U +u U U U @@ -12456,7 +12468,7 @@ Z Z Z U -U +u U U U @@ -12778,7 +12790,7 @@ U U U U -U +u U U U @@ -13757,7 +13769,7 @@ Z Z U U -U +u U U U @@ -13767,7 +13779,7 @@ Z Z Z Z -Z +B Z Z Z @@ -15893,7 +15905,7 @@ V V V Z -Z +B Z Z Z diff --git a/maps/groundbase/eastwilds/eastwilds2.dmm b/maps/groundbase/eastwilds/eastwilds2.dmm index fdd0dfdc349..33a58e58c2b 100644 --- a/maps/groundbase/eastwilds/eastwilds2.dmm +++ b/maps/groundbase/eastwilds/eastwilds2.dmm @@ -37,6 +37,12 @@ }, /turf/simulated/floor/water/deep/virgo3c, /area/submap/groundbase/wilderness/east) +"B" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/east) "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/east/unexplored) @@ -46,6 +52,12 @@ }, /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/submap/groundbase/wilderness/east) +"I" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/east) "V" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/east{ dir = 4 @@ -949,7 +961,7 @@ Z Z Z t -t +B t t Z @@ -3082,7 +3094,7 @@ l l Z Z -Z +I t t t @@ -5071,7 +5083,7 @@ Z Z Z Z -Z +I n n F @@ -5917,7 +5929,7 @@ F n Z Z -Z +I Z Z Z @@ -6912,7 +6924,7 @@ t t t t -Z +I Z Z Z @@ -7225,7 +7237,7 @@ Z t t t -t +B t t t @@ -7515,7 +7527,7 @@ t t Z Z -Z +I Z n n @@ -8044,7 +8056,7 @@ Z Z Z Z -t +B t t t @@ -8128,7 +8140,7 @@ n n Z Z -Z +I Z Z Z @@ -8341,7 +8353,7 @@ t t t t -Z +I Z Z Z @@ -8695,7 +8707,7 @@ Z Z t t -t +B t t t @@ -8904,7 +8916,7 @@ t t Z Z -Z +I Z Z Z @@ -8992,7 +9004,7 @@ t t t t -t +B Z Z Z @@ -9067,7 +9079,7 @@ n n Z Z -Z +I t Z Z @@ -9412,7 +9424,7 @@ t t t t -t +B t t t @@ -9689,7 +9701,7 @@ n Z Z Z -Z +I t t t @@ -10688,7 +10700,7 @@ Z t t t -t +B t t t @@ -11336,7 +11348,7 @@ n n n Z -Z +I Z n n @@ -11513,7 +11525,7 @@ t t t t -t +B t t t @@ -11532,7 +11544,7 @@ Z Z t t -t +B t t t @@ -12521,7 +12533,7 @@ t t t t -t +B t t t @@ -12787,7 +12799,7 @@ t t t t -t +B t t t @@ -13531,7 +13543,7 @@ t t t t -t +B t Z Z @@ -13953,7 +13965,7 @@ t t t t -t +B t t t @@ -14303,7 +14315,7 @@ Z Z Z Z -Z +I Z Z Z @@ -14620,7 +14632,7 @@ n n Z Z -Z +I Z Z Z @@ -14644,6 +14656,7 @@ Z Z Z t +B t t t @@ -14655,8 +14668,7 @@ t t t t -t -t +B t t t @@ -16027,7 +16039,7 @@ Z Z Z Z -Z +I Z Z Z @@ -16081,6 +16093,7 @@ t t t t +B t t t @@ -16090,8 +16103,7 @@ t t t t -t -t +B t t t @@ -16352,7 +16364,7 @@ Z Z t t -t +B t t t @@ -16937,7 +16949,7 @@ t t t t -t +B t t t @@ -17085,7 +17097,7 @@ t t t t -t +B Z Z Z diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 10e7a0f4b77..dc9a91d3c3c 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -2033,6 +2033,8 @@ /obj/structure/sign/painting/library_secure{ pixel_y = -30 }, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/weapon/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/groundbase/civilian/cafe) "fk" = ( @@ -4302,6 +4304,11 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"kP" = ( +/obj/structure/table/glass, +/obj/random/paicard, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "kQ" = ( /obj/machinery/power/apc{ dir = 8; @@ -6658,8 +6665,8 @@ /obj/machinery/cell_charger{ pixel_y = 7 }, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/weapon/cell/super, +/obj/item/weapon/cell/super, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "qG" = ( @@ -13713,6 +13720,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/random/paicard, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) "Hw" = ( @@ -14170,6 +14178,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/random/paicard, /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) "Iy" = ( @@ -16174,6 +16183,8 @@ pixel_x = -3; pixel_y = 26 }, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/weapon/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "Nh" = ( @@ -17892,6 +17903,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) +"RB" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/groundbase/level1/eastspur) "RC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ @@ -25353,7 +25370,7 @@ ht ht KR GF -GF +kP oQ uF pj @@ -39104,7 +39121,7 @@ df uH uH eW -eW +RB eW uH uH @@ -39657,7 +39674,7 @@ eW eW eW eW -eW +RB eW eW eW @@ -39688,11 +39705,11 @@ eW eW eW eW +RB eW eW eW -eW -eW +RB eW eW eW @@ -39959,13 +39976,13 @@ eW eW eW eW +RB eW eW eW eW eW -eW -eW +RB eW eW eW @@ -40236,7 +40253,7 @@ uH uH uH eW -eW +RB eW eW eW diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 087f0a1eb55..dd5883fc8eb 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -673,6 +673,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/random/paicard, /turf/simulated/floor/wood, /area/groundbase/command/captainq) "bQ" = ( @@ -809,11 +810,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "cm" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/tiled/eris/cafe, @@ -869,7 +867,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ct" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1025,7 +1023,7 @@ "cU" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "cV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -2672,7 +2670,7 @@ "hL" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "hM" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2719,7 +2717,7 @@ /area/rnd/xenobiology) "hU" = ( /obj/machinery/button/remote/blast_door{ - id = "rndshutters"; + id = "robshutters"; name = "Privacy Shutter Control"; pixel_y = 30 }, @@ -2766,7 +2764,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "hZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2795,7 +2793,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ic" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -2870,7 +2868,7 @@ icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ir" = ( /obj/machinery/firealarm{ dir = 8 @@ -2958,7 +2956,7 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "iC" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/hop) @@ -3271,7 +3269,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "jv" = ( /obj/machinery/appliance/cooker/grill, /turf/simulated/floor/tiled/eris/cafe, @@ -3450,7 +3448,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "jU" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_research{ @@ -3780,7 +3778,7 @@ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "kY" = ( /obj/machinery/power/apc{ dir = 8 @@ -3946,7 +3944,7 @@ }, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "lv" = ( /obj/structure/closet/secure_closet/hydroponics{ req_access = list(77) @@ -4446,7 +4444,7 @@ }, /obj/random/coin/sometimes, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "mN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4953,7 +4951,9 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "oy" = ( -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 + }, /area/groundbase/level2/se) "oA" = ( /obj/machinery/door/blast/regular{ @@ -5491,6 +5491,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"qc" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/groundbase/civilian/bar) "qd" = ( /obj/structure/sign/nanotrasen{ pixel_x = 32; @@ -5768,10 +5777,18 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "qQ" = ( -/obj/structure/table/standard, -/obj/structure/noticeboard{ - pixel_y = -32 +/obj/structure/closet/chefcloset, +/obj/item/glass_jar, +/obj/item/device/retail_scanner/civilian, +/obj/item/weapon/soap/nanotrasen, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 }, +/obj/item/weapon/packageWrap, +/obj/item/weapon/packageWrap, +/obj/item/weapon/packageWrap, +/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "qS" = ( @@ -5909,7 +5926,7 @@ /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /turf/simulated/floor, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "rm" = ( /obj/machinery/light, /turf/simulated/floor/wood, @@ -6222,7 +6239,7 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "se" = ( /obj/item/device/aicard, /obj/structure/table/reinforced, @@ -6266,7 +6283,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "sn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ @@ -6405,7 +6422,7 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "sI" = ( /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; @@ -7556,7 +7573,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "we" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7663,7 +7680,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ww" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7907,7 +7924,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xo" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, @@ -8105,7 +8122,7 @@ }, /obj/machinery/alarm, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xN" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -8131,7 +8148,7 @@ /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "xU" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -8230,13 +8247,13 @@ }, /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yj" = ( /obj/structure/sign/directions/kitchen{ pixel_x = -32 @@ -8424,7 +8441,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "yJ" = ( /obj/structure/bed/chair{ dir = 4 @@ -9066,14 +9083,8 @@ "AK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "AL" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -9197,7 +9208,7 @@ }, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "AT" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/xenobot) @@ -9485,7 +9496,7 @@ icon_state = "4-8" }, /turf/simulated/floor/bmarble, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "BU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9627,7 +9638,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Cj" = ( /obj/structure/sign/directions/stairs_down{ pixel_y = 38 @@ -9737,7 +9748,7 @@ dir = 1 }, /turf/simulated/open, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "CE" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/room8) @@ -10044,7 +10055,7 @@ pixel_x = 25 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Du" = ( /turf/simulated/wall, /area/groundbase/medical/lobby) @@ -10067,7 +10078,7 @@ }, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Dy" = ( /obj/structure/table/reinforced, /obj/machinery/requests_console{ @@ -10243,7 +10254,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "DV" = ( /obj/structure/table/rack, /obj/item/weapon/tank/jetpack/oxygen, @@ -10305,13 +10316,13 @@ }, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ea" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Eb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -10828,7 +10839,7 @@ /area/groundbase/cargo/office) "FF" = ( /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "FI" = ( /obj/structure/fence/corner{ dir = 5 @@ -10894,7 +10905,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "FU" = ( /obj/structure/table/bench/standard, /obj/effect/landmark/start/rd, @@ -11024,7 +11035,7 @@ icon_state = "1-4" }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Gp" = ( /turf/simulated/wall, /area/groundbase/level2/nw) @@ -11130,6 +11141,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"Gz" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/groundbase/civilian/bar) "GA" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -11646,6 +11663,14 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/room7) +"HW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/freezer{ + name = "Kitchen"; + req_access = list(28) + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "HX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12250,7 +12275,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "JD" = ( /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/eris/cafe, @@ -13092,7 +13117,7 @@ "LS" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "LT" = ( /obj/machinery/light/small{ dir = 8 @@ -13113,7 +13138,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "LW" = ( /obj/structure/sign/xenobio{ plane = -34 @@ -13391,7 +13416,7 @@ icon_state = "1-2" }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "ME" = ( /turf/simulated/wall, /area/groundbase/civilian/chapel/office) @@ -13684,7 +13709,7 @@ /area/groundbase/level2/ne) "Ny" = ( /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Nz" = ( /obj/structure/bed/chair/sofa/pew/right{ dir = 1 @@ -14086,7 +14111,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "OD" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14521,7 +14546,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "PT" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -14547,7 +14572,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "PV" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/room2) @@ -15049,7 +15074,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Rn" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -15276,7 +15301,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "RV" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -15448,20 +15473,10 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Ss" = ( -/obj/structure/closet/chefcloset, -/obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tool/wrench, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) +/area/groundbase/level2/nw) "St" = ( /obj/structure/fence/corner{ dir = 8 @@ -15963,7 +15978,7 @@ /obj/machinery/light, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "TO" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start/cargo, @@ -15981,7 +15996,7 @@ dir = 4 }, /turf/simulated/floor/bmarble, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "TT" = ( /obj/structure/railing/grey{ dir = 8 @@ -16031,6 +16046,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"Uc" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level2/nw) "Ud" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) @@ -16072,6 +16091,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"Ui" = ( +/turf/simulated/open, +/area/groundbase/civilian/bar) "Uj" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv4"; @@ -16094,7 +16116,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Un" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -16158,14 +16180,14 @@ "Ux" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Uy" = ( /obj/machinery/light{ dir = 4 }, /obj/random/vendorall, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Uz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16749,7 +16771,7 @@ dir = 4 }, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Wd" = ( /obj/structure/railing/grey{ dir = 8 @@ -16801,7 +16823,7 @@ }, /obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Wj" = ( /turf/simulated/wall, /area/groundbase/cargo/office) @@ -16887,6 +16909,7 @@ dir = 4; pixel_x = -30 }, +/obj/random/paicard, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "Wz" = ( @@ -17110,7 +17133,7 @@ /obj/structure/table/bench/padded, /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Xl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -17202,7 +17225,7 @@ pixel_x = -25 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "XB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17417,7 +17440,7 @@ }, /obj/machinery/firealarm, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Yg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -17441,7 +17464,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ym" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -17473,7 +17496,7 @@ "Yr" = ( /obj/structure/sign/department/bar, /turf/simulated/wall, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "Ys" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -17612,7 +17635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/bar/upper) +/area/groundbase/civilian/bar) "YS" = ( /obj/machinery/biogenerator, /turf/simulated/floor/tiled, @@ -18466,7 +18489,7 @@ UH UH UH wS -Hn +Ss Kl Kl xE @@ -18608,7 +18631,7 @@ UH UH wS wS -Hn +Ss Kl Kl xE @@ -21477,11 +21500,11 @@ il il LA bY -Jc -Jc -Jc bY bY +Jc +Jc +Jc bY bY bY @@ -21617,12 +21640,12 @@ bY bY bY bY -bY -bY -bY -bY -bY -bY +Hn +Ja +Hn +Hn +Uc +Gp bY bY bY @@ -21761,7 +21784,7 @@ Vl Vl Vl Vl -Vl +HW Vl Vl JJ @@ -21903,7 +21926,7 @@ Oz Ej ep LD -Ss +Gc Wp JO JJ @@ -23452,7 +23475,7 @@ Bb Bb Iz yh -GS +qc CD FF bY @@ -23594,8 +23617,8 @@ Ny Ny Ny yh -YO -Gl +Gz +Ui rl bY sZ @@ -28289,7 +28312,7 @@ fp to to to -VR +fp fp fp fp diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index f8b3d9e6fa8..95d87ed2be7 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -19,6 +19,12 @@ }, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) +"aN" = ( +/obj/item/weapon/stool/padded{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "aQ" = ( /obj/structure/table/glass, /obj/item/weapon/folder/white_cmo, @@ -121,6 +127,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) +"cD" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "cE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -291,6 +303,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"fn" = ( +/obj/structure/table/steel, +/obj/random/paicard, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "fu" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/chemist, @@ -393,6 +410,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"gV" = ( +/obj/structure/railing, +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "gZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -418,6 +440,13 @@ }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +"hM" = ( +/obj/structure/railing, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "hN" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -697,6 +726,16 @@ }, /turf/simulated/wall/r_wall, /area/groundbase/level3/escapepad) +"mS" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +"mT" = ( +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "mU" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -712,6 +751,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) +"mY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "nb" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -720,6 +765,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/medical/cmo) +"nh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "nq" = ( /obj/structure/railing/grey{ dir = 1 @@ -766,8 +820,18 @@ dir = 1 }, /obj/machinery/light, +/obj/random/paicard, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) +"nD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "nN" = ( /obj/machinery/light, /obj/effect/landmark/start/explorer, @@ -824,6 +888,12 @@ /obj/effect/overmap/visitable/sector/virgo3c, /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) +"oI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "oK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -877,6 +947,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) +"pa" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "pd" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ @@ -945,6 +1019,12 @@ edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) +"pP" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "pY" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall, @@ -1025,6 +1105,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"rr" = ( +/obj/structure/railing, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "rD" = ( /obj/structure/bookcase, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -1051,6 +1138,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"sa" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "sb" = ( /obj/machinery/power/apc{ dir = 8 @@ -1141,6 +1235,12 @@ "tZ" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level3/se) +"ud" = ( +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "ui" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, @@ -1228,6 +1328,15 @@ /obj/structure/bed/chair/sofa/corp/left, /turf/simulated/floor/carpet/retro, /area/groundbase/dorms/bathroom) +"vJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "vV" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -1392,6 +1501,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"yu" = ( +/obj/machinery/light, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "yy" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -1529,6 +1642,9 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/bathroom) +"AZ" = ( +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Bd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1591,6 +1707,12 @@ "BH" = ( /turf/simulated/wall, /area/groundbase/medical/patient3) +"BM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) "Ck" = ( /obj/structure/table/woodentable, /obj/machinery/computer/security/telescreen/entertainment{ @@ -1598,6 +1720,12 @@ }, /turf/simulated/floor/carpet/retro, /area/groundbase/dorms/bathroom) +"Ct" = ( +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Cv" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -1722,6 +1850,15 @@ }, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"Em" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Es" = ( /obj/structure/closet/secure_closet/pathfinder{ req_access = list(62,43,67) @@ -1830,6 +1967,12 @@ "Fh" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/bathroom) +"Fr" = ( +/obj/item/weapon/stool/padded{ + dir = 1 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) "Fx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1862,6 +2005,9 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/pilot) +"FU" = ( +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "FV" = ( /obj/item/weapon/storage/backpack/parachute{ pixel_x = 4; @@ -1912,6 +2058,13 @@ /obj/machinery/light/bigfloorlamp, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level3/escapepad) +"Gk" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Gn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1942,6 +2095,9 @@ "GW" = ( /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level3/escapepad) +"Ha" = ( +/turf/simulated/wall, +/area/groundbase/civilian/kitchen) "Hm" = ( /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 @@ -2088,6 +2244,15 @@ "IS" = ( /turf/simulated/open/virgo3c, /area/groundbase/level3/ne/open) +"IW" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Jf" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/virgo3c, @@ -2179,6 +2344,10 @@ "KG" = ( /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +"KN" = ( +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "KZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2226,6 +2395,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient3) +"Ms" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Mz" = ( /obj/structure/railing{ dir = 4 @@ -2294,6 +2469,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"NR" = ( +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "NT" = ( /obj/machinery/alarm{ dir = 8 @@ -2408,6 +2589,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"Pq" = ( +/obj/structure/table/steel, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "Pr" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -2488,6 +2673,15 @@ "Qa" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level3/nw) +"Qb" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Qe" = ( /obj/structure/table/bench/marble, /obj/structure/cable/yellow{ @@ -2523,6 +2717,13 @@ outdoors = 0 }, /area/groundbase/level3/escapepad) +"Qs" = ( +/obj/structure/railing, +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "QC" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ id_tag = null; @@ -2582,6 +2783,12 @@ "Rq" = ( /turf/simulated/wall/r_wall, /area/groundbase/dorms/bathroom) +"RH" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "RM" = ( /obj/machinery/photocopier/faxmachine{ department = "Exploration" @@ -2876,6 +3083,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"Wh" = ( +/obj/structure/railing, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "Wm" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light{ @@ -2912,6 +3123,13 @@ "Xv" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/unexplored/outdoors) +"Xz" = ( +/obj/structure/railing, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) "XB" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -2952,6 +3170,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) +"YG" = ( +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/civilian/kitchen) "YJ" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -5979,7 +6202,7 @@ QD QD QD QD -Kr +ly Kr pf pf @@ -6121,7 +6344,7 @@ QD QD QD QD -Kr +ly Kr pf pf @@ -6263,7 +6486,7 @@ QD QD QD QD -Kr +ly Kr Kr Kr @@ -6401,6 +6624,7 @@ Kr Kr Kr Kr +Kr QO By By @@ -6410,7 +6634,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6543,6 +6766,7 @@ Kr Kr Kr Kr +Kr QO By By @@ -6552,7 +6776,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6685,8 +6908,9 @@ Kr Kr Kr Kr -QO -By +Kr +QD +BM By ly Kr @@ -6694,7 +6918,6 @@ Kr Kr Kr Kr -Kr pf pf pf @@ -6819,22 +7042,22 @@ nU Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG Kr Kr pf @@ -6961,22 +7184,22 @@ pe Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Ha +nh +Ms +Ms +Ms +Ms +Ms +Ms +Ms +AZ +AZ +Ms +sa +Ha +YG Kr Kr pf @@ -7103,22 +7326,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Em +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +rr +YG Kr Kr pf @@ -7245,22 +7468,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +nD +Ct +Ct +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +Ct +Ct +hM +YG Kr Kr pf @@ -7387,22 +7610,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +mS +KN +KN +mT +mT +mT +mT +mT +mT +mT +mT +KN +KN +gV +YG Kr Kr pf @@ -7529,22 +7752,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +IW +ud +ud +mT +mT +pP +aN +aN +pP +mT +mT +ud +ud +Qs +YG Kr Kr pf @@ -7671,22 +7894,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +yu +Ha +Pq +Pq +Ha +oI +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -7813,22 +8036,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -7955,22 +8178,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8097,22 +8320,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +pa +Pq +FU +FU +Pq +Fr +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8239,22 +8462,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +RH +AZ +AZ +mT +yu +Ha +NR +FU +Ha +oI +mT +AZ +AZ +Wh +YG Kr Kr pf @@ -8381,22 +8604,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +nD +Ct +Ct +mT +mT +mY +mT +mT +mY +mT +mT +Ct +Ct +hM +YG Kr Kr pf @@ -8523,22 +8746,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +mS +fn +KN +mT +mT +mT +mT +mT +mT +mT +mT +KN +KN +gV +YG Kr Kr pf @@ -8665,22 +8888,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +IW +ud +ud +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +ud +ud +Qs +YG Kr Kr pf @@ -8807,22 +9030,22 @@ BE Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +vJ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +AZ +Xz +YG Kr Kr pf @@ -8949,22 +9172,22 @@ pe Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +Ha +Qb +cD +cD +cD +cD +cD +cD +AZ +AZ +cD +cD +Gk +Ha +YG Kr Kr pf @@ -9091,22 +9314,22 @@ VR Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG Kr Kr pf @@ -14891,9 +15114,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15033,9 +15256,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15175,9 +15398,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS @@ -15317,9 +15540,9 @@ Lf Lf Lf Lf -Lf -Lf -Lf +IS +IS +IS IS IS IS diff --git a/maps/groundbase/southwilds/southwilds1.dmm b/maps/groundbase/southwilds/southwilds1.dmm index f8fe87f859b..f2c050a458e 100644 --- a/maps/groundbase/southwilds/southwilds1.dmm +++ b/maps/groundbase/southwilds/southwilds1.dmm @@ -10,6 +10,12 @@ edge_blending_priority = -1 }, /area/submap/groundbase/wilderness/south) +"o" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/deep/virgo3c, +/area/submap/groundbase/wilderness/south) "p" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/south) @@ -34,6 +40,12 @@ "H" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/submap/groundbase/wilderness/south/unexplored) +"I" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/south) "K" = ( /obj/effect/map_effect/portal/line/side_b, /turf/simulated/floor/outdoors/grass/forest/virgo3c, @@ -1243,7 +1255,7 @@ d d c c -F +o c c c @@ -4771,7 +4783,7 @@ H d d c -c +I c F F @@ -4917,7 +4929,7 @@ c c F F -F +o c c c @@ -6511,7 +6523,7 @@ d d c c -c +I c c c @@ -7085,7 +7097,7 @@ c c c c -F +o F c c @@ -10217,7 +10229,7 @@ d c c c -F +o c c c @@ -11761,7 +11773,7 @@ d c F F -c +I c d d @@ -12927,7 +12939,7 @@ d d c c -c +I c c c @@ -13156,7 +13168,7 @@ c c c c -c +I c c d @@ -13784,7 +13796,7 @@ d d c c -c +I c c c @@ -13931,7 +13943,7 @@ d c c c -F +o F F c @@ -14023,7 +14035,7 @@ F F F F -F +o F F F @@ -14878,7 +14890,7 @@ c c F F -F +o F c c @@ -15234,7 +15246,7 @@ d d c F -F +o c c c @@ -16689,7 +16701,7 @@ d c c F -F +o c c d @@ -17687,7 +17699,7 @@ H d c c -F +o c c d @@ -18497,7 +18509,7 @@ d c c F -F +o F F F @@ -18643,7 +18655,7 @@ F F F F -F +o F c c