diff --git a/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm b/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm index b81405dd2b06..059597c36201 100644 --- a/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm @@ -66,18 +66,28 @@ }, /area/station/commons/lounge) "ci" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown, +/obj/structure/cable, /obj/structure/chair/stool/bar/directional/north{ pixel_y = 4 }, -/mob/living/carbon/human/species/monkey/punpun, -/turf/open/floor/pod, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, /area/station/commons/lounge) "cG" = ( -/obj/item/gps/computer, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 9; + pixel_y = 2 + }, /turf/open/floor/pod, /area/station/service/bar) "cR" = ( @@ -103,20 +113,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/pod, /area/station/commons/lounge) -"dX" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/chair/stool/bar/directional/east{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/pod, -/area/station/commons/lounge) "eM" = ( /obj/structure/ore_box, /turf/open/floor/iron{ @@ -126,11 +122,16 @@ }, /area/station/commons/lounge) "eR" = ( -/obj/structure/table/reinforced/rglass, /obj/structure/cable, -/obj/item/food/pie/cream, -/turf/open/floor/pod, -/area/station/service/bar) +/obj/structure/chair/stool/bar/directional/north{ + pixel_y = 4 + }, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, +/area/station/commons/lounge) "eV" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -182,10 +183,11 @@ }, /area/station/commons/lounge) "gc" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/siding/brown, +/obj/structure/table/reinforced/rglass, +/obj/effect/spawner/random/entertainment/gambling, /turf/open/floor/pod, /area/station/service/bar) "gz" = ( @@ -216,8 +218,9 @@ /obj/effect/turf_decal/siding/brown{ dir = 8 }, -/obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/table/reinforced/rglass, +/obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/pod, /area/station/service/bar) "hE" = ( @@ -231,15 +234,19 @@ }, /area/station/commons/lounge) "hN" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/desk_bell{ - pixel_x = 7 +/obj/structure/displaycase{ + alert = 0; + desc = "A display case containing an expensive forgery, probably."; + pixel_y = -4; + req_access = list("mining"); + start_showpiece_type = /obj/item/fakeartefact }, -/obj/structure/desk_bell{ - pixel_x = 7 +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" }, -/turf/open/floor/pod, -/area/station/service/bar) +/area/station/commons/lounge) "hS" = ( /obj/machinery/camera/directional/south{ c_tag = "Service Theater - Backstage" @@ -265,16 +272,6 @@ name = "false ash tile" }, /area/station/commons/lounge) -"il" = ( -/obj/effect/turf_decal/siding/brown/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 6 - }, -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/pod, -/area/station/commons/lounge) "jh" = ( /obj/effect/turf_decal/siding/brown{ dir = 4 @@ -347,10 +344,6 @@ name = "false ash tile" }, /area/station/commons/lounge) -"lo" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/wall/mineral/titanium/survival/pod, -/area/station/service/bar) "lq" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, @@ -364,16 +357,21 @@ }, /area/station/commons/lounge) "lw" = ( -/obj/effect/turf_decal/mining, -/turf/closed/wall/mineral/titanium/survival/pod, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, /area/station/commons/lounge) "lF" = ( /obj/effect/turf_decal/siding/brown{ dir = 10 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/entertainment/gambling, +/obj/structure/table/reinforced/rglass, /turf/open/floor/pod, /area/station/service/bar) "lW" = ( @@ -424,12 +422,17 @@ /turf/open/floor/pod, /area/station/service/bar/backroom) "nh" = ( -/obj/structure/table/reinforced/rglass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/entertainment/gambling, -/turf/open/floor/pod, -/area/station/service/bar) +/obj/structure/chair/stool/bar/directional/north{ + pixel_y = 4 + }, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, +/area/station/commons/lounge) "nq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -467,18 +470,16 @@ }, /area/station/commons/lounge) "qd" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, /obj/structure/chair/stool/bar/directional/west{ pixel_x = -1; pixel_y = 3 }, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, /obj/effect/landmark/start/hangover, -/turf/open/floor/pod, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, /area/station/commons/lounge) "qe" = ( /obj/effect/turf_decal/siding/brown/corner{ @@ -491,29 +492,7 @@ /obj/structure/cable, /turf/open/floor/pod, /area/station/service/bar/backroom) -"qB" = ( -/obj/machinery/jukebox{ - pixel_x = -1; - pixel_y = -2 - }, -/obj/effect/turf_decal/siding/brown/end{ - dir = 1 - }, -/turf/open/floor/pod, -/area/station/commons/lounge) "qS" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks{ - dir = 8; - pixel_x = 3 - }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/effect/turf_decal/siding/brown/end{ - dir = 8 - }, /turf/open/floor/pod, /area/station/service/bar) "qV" = ( @@ -550,29 +529,13 @@ "rR" = ( /turf/closed/wall/mineral/titanium/survival/pod, /area/station/service/bar) -"sf" = ( -/turf/closed/wall/mineral/titanium/survival, -/area/station/service/bar/backroom) "sK" = ( /obj/effect/turf_decal/siding/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/food/pie/cream, +/obj/structure/table/reinforced/rglass, /turf/open/floor/pod, /area/station/service/bar) -"tl" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, -/obj/structure/chair/stool/bar/directional/east{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/pod, -/area/station/commons/lounge) "tn" = ( /obj/machinery/computer/slot_machine{ pixel_x = 2 @@ -598,8 +561,13 @@ }, /area/station/commons/lounge) "us" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, /obj/structure/table/reinforced/rglass, -/obj/effect/spawner/random/entertainment/gambling, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, /turf/open/floor/pod, /area/station/service/bar) "uy" = ( @@ -615,14 +583,13 @@ /turf/open/floor/pod, /area/station/commons/lounge) "vu" = ( -/obj/structure/table/reinforced/rglass, /obj/machinery/light/directional/north, -/obj/structure/sign/picture_frame/portrait/bar{ - pixel_x = -8; - pixel_y = 32 +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" }, -/turf/open/floor/pod, -/area/station/service/bar) +/area/station/commons/lounge) "vL" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -641,9 +608,17 @@ }, /area/station/commons/lounge) "vY" = ( -/obj/structure/table/reinforced/rglass, -/turf/open/floor/pod, -/area/station/service/bar) +/obj/structure/cable, +/obj/structure/chair/stool/bar/directional/north{ + pixel_y = 4 + }, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, +/area/station/commons/lounge) "wC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -745,9 +720,7 @@ }, /area/station/commons/lounge) "Ae" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/pod, /area/station/service/bar) "Am" = ( @@ -794,8 +767,15 @@ /turf/open/floor/pod, /area/station/commons/lounge) "Bg" = ( -/obj/machinery/smartfridge/survival_pod/preloaded, /obj/machinery/firealarm/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks{ + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -8; + pixel_y = 4 + }, /turf/open/floor/pod, /area/station/service/bar) "Bq" = ( @@ -839,17 +819,15 @@ }, /area/station/commons/lounge) "Ci" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, /obj/structure/chair/stool/bar/directional/west{ pixel_x = -1; pixel_y = 3 }, -/obj/effect/turf_decal/siding/brown{ - dir = 4 +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" }, -/turf/open/floor/pod, /area/station/commons/lounge) "CQ" = ( /obj/structure/disposalpipe/segment, @@ -900,22 +878,10 @@ }, /area/station/commons/lounge) "Ea" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, /turf/open/floor/pod, /area/station/service/bar) -"Ec" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown, -/obj/structure/chair/stool/bar/directional/north{ - pixel_y = 4 - }, -/turf/open/floor/pod, -/area/station/commons/lounge) "EC" = ( /obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -952,7 +918,7 @@ }, /area/station/commons/lounge) "ET" = ( -/turf/closed/wall/mineral/titanium/survival/pod, +/turf/closed/wall, /area/station/commons/lounge) "Fk" = ( /obj/effect/turf_decal/siding/brown{ @@ -965,25 +931,18 @@ /turf/open/floor/pod, /area/station/service/bar/backroom) "Fr" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 4; - pixel_x = -5; - pixel_y = 7 - }, -/obj/effect/turf_decal/siding/brown/end{ +/obj/effect/landmark/start/bartender, +/turf/open/floor/pod, +/area/station/service/bar) +"Ft" = ( +/obj/effect/turf_decal/siding/brown{ dir = 4 }, -/obj/item/reagent_containers/cup/rag{ - pixel_x = 9; - pixel_y = 6 +/obj/machinery/vending/boozeomat{ + layer = 3.1 }, -/turf/open/floor/pod, +/turf/open/space/basic, /area/station/service/bar) -"Ft" = ( -/obj/effect/turf_decal/mining/survival, -/turf/closed/wall/mineral/titanium/survival, -/area/station/service/bar/backroom) "Gt" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/service/bar, @@ -1035,12 +994,15 @@ }, /area/station/commons/lounge) "It" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/desk_bell{ - pixel_x = -7 +/obj/structure/chair/stool/bar/directional/north{ + pixel_y = 4 }, -/turf/open/floor/pod, -/area/station/service/bar) +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, +/area/station/commons/lounge) "Jn" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron{ @@ -1050,8 +1012,7 @@ }, /area/station/commons/lounge) "Kh" = ( -/obj/effect/turf_decal/mining, -/turf/closed/wall/mineral/titanium/survival, +/turf/closed/wall, /area/station/maintenance/department/crew_quarters/bar) "KA" = ( /obj/structure/chair/stool/bar/directional/west{ @@ -1065,25 +1026,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/pod, /area/station/commons/lounge) -"KQ" = ( -/obj/effect/turf_decal/mining/survival{ - dir = 8 - }, -/turf/closed/wall/mineral/titanium/survival, -/area/station/service/bar/backroom) -"KR" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, -/obj/structure/chair/stool/bar/directional/east{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/pod, -/area/station/commons/lounge) "KT" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /obj/effect/turf_decal/siding/brown, @@ -1105,22 +1047,13 @@ }, /turf/open/floor/pod, /area/station/commons/lounge) -"KX" = ( -/obj/effect/turf_decal/mining/survival{ - dir = 4 - }, -/turf/closed/wall/mineral/titanium/survival/pod, -/area/station/commons/lounge) "Lw" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown, -/obj/structure/chair/stool/bar/directional/north{ - pixel_y = 4 - }, /obj/structure/cable, -/turf/open/floor/pod, +/turf/open/floor/iron{ + base_icon_state = "basalt0"; + icon_state = "basalt0"; + name = "false ash tile" + }, /area/station/commons/lounge) "LO" = ( /obj/effect/turf_decal/siding/brown{ @@ -1162,16 +1095,6 @@ name = "false ash tile" }, /area/station/commons/lounge) -"MW" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/structure/chair/stool/bar/directional/north{ - pixel_y = 4 - }, -/obj/effect/turf_decal/siding/brown, -/turf/open/floor/pod, -/area/station/commons/lounge) "ND" = ( /obj/structure/rack, /obj/structure/disposalpipe/segment{ @@ -1233,20 +1156,10 @@ /turf/open/floor/pod, /area/station/commons/lounge) "Rd" = ( -/obj/structure/fans, /obj/item/radio/intercom/directional/north, -/turf/open/floor/pod, +/obj/machinery/smartfridge/survival_pod/preloaded, +/turf/closed/wall/mineral/titanium/survival/pod, /area/station/service/bar) -"RS" = ( -/obj/effect/turf_decal/siding/brown/end{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Service Bar North"; - dir = 9 - }, -/turf/open/floor/pod, -/area/station/commons/lounge) "SB" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/machinery/light/directional/south, @@ -1270,13 +1183,7 @@ /turf/open/floor/pod, /area/station/service/bar/backroom) "Tg" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown/corner, +/obj/structure/cable, /turf/open/floor/pod, /area/station/service/bar) "Ti" = ( @@ -1289,7 +1196,7 @@ /turf/open/floor/pod, /area/station/commons/lounge) "TB" = ( -/turf/closed/wall/mineral/titanium/survival, +/turf/closed/wall, /area/station/maintenance/starboard/lesser) "Uo" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -1306,29 +1213,11 @@ /obj/structure/cable, /turf/open/floor/pod, /area/station/service/bar/backroom) -"Vp" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown, -/obj/structure/chair/stool/bar/directional/north{ - pixel_y = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/pod, -/area/station/commons/lounge) "VB" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Bar Interior" +/obj/machinery/door/airlock{ + name = "Bar" }, /obj/effect/mapping_helpers/airlock/access/all/service/bar, -/obj/effect/turf_decal/siding/brown/end{ - dir = 4 - }, -/obj/machinery/light/directional/north, /turf/open/floor/pod, /area/station/service/bar) "VG" = ( @@ -1350,27 +1239,16 @@ }, /area/station/commons/lounge) "WC" = ( -/obj/structure/table/reinforced, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/reagentgrinder{ - pixel_x = -6; - pixel_y = 4 - }, /obj/machinery/airalarm/directional/north, -/turf/open/floor/pod, +/turf/closed/wall/mineral/titanium/survival/pod, /area/station/service/bar) "WT" = ( /obj/effect/turf_decal/siding/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/bartender, -/turf/open/floor/pod, -/area/station/service/bar) -"Xk" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 9 +/obj/structure/desk_bell{ + pixel_x = -7 }, -/obj/structure/cable, +/obj/structure/table/reinforced/rglass, /turf/open/floor/pod, /area/station/service/bar) "Xv" = ( @@ -1390,22 +1268,6 @@ name = "false ash tile" }, /area/station/commons/lounge) -"XK" = ( -/obj/effect/turf_decal/siding/brown/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 10 - }, -/obj/structure/displaycase{ - alert = 0; - desc = "A display case containing an expensive forgery, probably."; - pixel_y = -4; - req_access = list("mining"); - start_showpiece_type = /obj/item/fakeartefact - }, -/turf/open/floor/pod, -/area/station/commons/lounge) "Yk" = ( /obj/machinery/door/window/survival_pod, /obj/effect/turf_decal/siding/brown, @@ -1424,6 +1286,7 @@ }, /area/station/commons/lounge) "YP" = ( +/obj/machinery/camera/directional/east, /turf/open/floor/iron{ base_icon_state = "basalt5"; icon_state = "basalt5"; @@ -1444,6 +1307,10 @@ /area/station/service/bar/backroom) "ZX" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/machinery/jukebox{ + pixel_x = -1; + pixel_y = -2 + }, /turf/open/floor/iron{ base_icon_state = "basalt0"; icon_state = "basalt0"; @@ -1499,7 +1366,7 @@ EK EK CU hS -KX +ET jN xc DX @@ -1522,12 +1389,12 @@ EK EK "} (6,1,1) = {" -lw -qB -KR -tl -dX -XK +wY +wY +wY +aH +wY +wY aH Ww OA @@ -1536,12 +1403,12 @@ EK EK "} (7,1,1) = {" -rR +wY vu -vY +It nh It -MW +wY fg Yy nq @@ -1551,7 +1418,7 @@ EK "} (8,1,1) = {" WC -Xk +VB hm lF eR @@ -1565,11 +1432,11 @@ EK "} (9,1,1) = {" Rd -Ae +qS qS WT -vY -Vp +ci +wY aH HS KA @@ -1583,7 +1450,7 @@ Ae Fr sK vY -ci +wY fs HS uy @@ -1596,8 +1463,8 @@ cG Tg Ea gc -vY -Vp +eR +wY hZ AP ND @@ -1606,12 +1473,12 @@ ak EK "} (12,1,1) = {" -lo +rR VB -vY +Ft us -hN -Ec +It +wY VG HS MM @@ -1621,11 +1488,11 @@ EK "} (13,1,1) = {" lw -RS +wY qd Ci Ci -il +wY wC EC mo @@ -1648,12 +1515,12 @@ eM EK "} (15,1,1) = {" -sf -KQ -sf -sf -KQ -sf +nF +nF +nF +nF +nF +nF tn BV OA @@ -1662,12 +1529,12 @@ rp EK "} (16,1,1) = {" -sf +nF Bq zn Xv mH -Ft +nF KU wT OA @@ -1698,7 +1565,7 @@ Db TB Gt TB -wY +hN TB TB EK