diff --git a/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm b/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm index 2da3bca2e059..cc01052fe665 100644 --- a/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm +++ b/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm @@ -86,7 +86,7 @@ /area/station/service/kitchen) "de" = ( /obj/machinery/firealarm/directional/north, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "di" = ( /obj/machinery/elevator_control_panel/directional/north{ @@ -100,13 +100,6 @@ "dr" = ( /turf/closed/wall, /area/station/service/kitchen) -"ds" = ( -/obj/structure/flora/ocean/coral, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "dA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -126,7 +119,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "eF" = ( /turf/closed/wall, @@ -197,7 +190,7 @@ dir = 6 }, /obj/structure/cable, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "gG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -233,17 +226,6 @@ }, /turf/open/floor/fake_seafloor/ironsand, /area/station/service/bar) -"iD" = ( -/obj/structure/flora/ocean/coral, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "iE" = ( /obj/structure/chair/stool/bar, /obj/effect/landmark/start/assistant, @@ -261,12 +243,14 @@ "jH" = ( /obj/structure/chair/stool, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/fake_seafloor, /area/station/commons/lounge) "jT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "jZ" = ( /obj/structure/cable, @@ -308,7 +292,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/mail_sorting/service/theater, /obj/structure/disposalpipe/sorting/mail/flip, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "mm" = ( /obj/structure/table/reinforced/rglass, @@ -334,18 +318,13 @@ /obj/structure/dresser, /turf/open/floor/fake_seafloor/heavy, /area/station/service/theater) -"nG" = ( -/obj/structure/flora/ocean/glowweed, -/obj/effect/landmark/start/hangover, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "nL" = ( /obj/machinery/processor, /turf/open/floor/fake_seafloor/ironsand, /area/station/service/kitchen) "nM" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "nN" = ( /obj/structure/ladder, @@ -355,7 +334,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "om" = ( /obj/machinery/restaurant_portal/bar, @@ -365,7 +344,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "oL" = ( /obj/structure/table/reinforced/rglass, @@ -386,7 +365,7 @@ /area/station/commons/lounge) "qd" = ( /obj/item/radio/intercom/directional/east, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "qq" = ( /obj/effect/area_lighting_helper/max_alpha_blue, @@ -410,25 +389,14 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) -"qZ" = ( -/obj/structure/flora/ocean/glowweed, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "re" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "rk" = ( /obj/structure/chair/sofa/middle/brown{ @@ -436,10 +404,6 @@ }, /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) -"rY" = ( -/obj/structure/flora/ocean/seaweed, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "sh" = ( /obj/structure/table/reinforced/rglass, /obj/item/storage/fancy/cigarettes/cigars/havana, @@ -510,7 +474,7 @@ /area/station/service/kitchen) "wn" = ( /obj/machinery/camera/directional/east, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "wE" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/east_offset, @@ -530,11 +494,10 @@ /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) "wZ" = ( -/obj/structure/flora/ocean/glowweed, /obj/structure/disposalpipe/junction{ dir = 8 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "xd" = ( /obj/structure/disposalpipe/segment{ @@ -584,7 +547,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "yO" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, @@ -619,7 +582,10 @@ /area/station/commons/lounge) "zC" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, +/area/station/commons/lounge) +"AF" = ( +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "AI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -629,7 +595,7 @@ /area/station/service/bar) "AK" = ( /obj/item/radio/intercom/directional/south, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "AN" = ( /obj/machinery/restaurant_portal/restaurant, @@ -655,7 +621,6 @@ /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) "BO" = ( -/obj/structure/flora/ocean/longseaweed, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -667,7 +632,7 @@ /area/station/commons/lounge) "Cp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Cr" = ( /turf/open/floor/fake_seafloor/ironsand, @@ -681,20 +646,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Du" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/newscaster/directional/south, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "DE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Ee" = ( /obj/item/radio/intercom/directional/south, @@ -710,10 +675,6 @@ }, /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) -"Eu" = ( -/obj/structure/flora/ocean/longseaweed, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "EF" = ( /obj/structure/railing/corner{ dir = 4 @@ -765,7 +726,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Gx" = ( /obj/structure/chair/sofa/right/brown{ @@ -773,11 +734,6 @@ }, /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) -"Gz" = ( -/obj/structure/flora/rock/style_random, -/obj/structure/flora/ocean/longseaweed, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "GF" = ( /obj/effect/landmark/navigate_destination/bar, /obj/effect/area_lighting_helper/max_alpha_blue, @@ -801,7 +757,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Id" = ( /obj/machinery/power/apc/auto_name/directional/west, @@ -813,10 +769,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/fake_seafloor, /area/station/commons/lounge) -"Iz" = ( -/obj/structure/cable, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "IY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -839,11 +791,7 @@ /area/station/service/theater) "JI" = ( /obj/machinery/atm, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) -"JQ" = ( -/obj/structure/flora/ocean/coral, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Kh" = ( /obj/structure/table/reinforced/rglass, @@ -856,11 +804,6 @@ /obj/structure/cable, /turf/open/floor/fake_seafloor/ironsand, /area/station/service/kitchen) -"KB" = ( -/obj/structure/flora/rock/style_random, -/obj/structure/flora/ocean/seaweed, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "KM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -917,10 +860,6 @@ /obj/structure/chair/sofa/middle/brown, /turf/open/floor/fake_seafloor/medium, /area/station/commons/lounge) -"MT" = ( -/obj/structure/flora/ocean/glowweed, -/turf/open/floor/fake_seafloor, -/area/station/commons/lounge) "MX" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/door/firedoor, @@ -931,7 +870,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Nt" = ( /obj/structure/ladder, @@ -952,7 +891,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "NY" = ( /obj/structure/chair/sofa/middle/brown{ @@ -988,7 +927,7 @@ /area/station/service/bar) "PN" = ( /obj/machinery/airalarm/directional/south, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "QD" = ( /obj/machinery/grill, @@ -1015,19 +954,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Rp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Rt" = ( /obj/structure/table/reinforced/rglass, /obj/item/food/baguette, /turf/open/floor/fake_seafloor/heavy, /area/station/service/theater) +"RC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/fake_seafloor/spawning, +/area/station/commons/lounge) "SL" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/fake_seafloor/heavy, @@ -1086,7 +1035,7 @@ /area/station/commons/lounge) "UQ" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/east, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Wg" = ( /obj/effect/landmark/navigate_destination/kitchen, @@ -1094,7 +1043,7 @@ /area/station/service/kitchen) "Wq" = ( /obj/effect/area_lighting_helper/max_alpha_blue, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Wu" = ( /obj/effect/landmark/start/hangover, @@ -1149,7 +1098,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/fake_seafloor, +/turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Ys" = ( /obj/structure/table/reinforced/rglass, @@ -1165,6 +1114,12 @@ }, /turf/open/floor/fake_seafloor, /area/station/commons/lounge) +"YG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/fake_seafloor/spawning, +/area/station/commons/lounge) "Zc" = ( /obj/structure/table/reinforced/rglass, /obj/effect/spawner/random/entertainment/toy, @@ -1200,13 +1155,13 @@ aw Le aw -aw +AF pR jg mG aq pR -aw +AF Fn pR jg @@ -1227,13 +1182,13 @@ lL Le xu Le -aw +AF pR MN fE NY pR -aw +AF aw pR MN @@ -1251,16 +1206,16 @@ lL lL "} (3,1,1) = {" -aw +AF Le aw -aw +AF pR tV mG za pR -aw +AF aw pR tV @@ -1278,17 +1233,17 @@ lL lL "} (4,1,1) = {" -aw +AF kP aw +AF +aw aw -MT aw aw aw aw aw -Eu aw aw aw @@ -1308,20 +1263,20 @@ lL Le XD Le -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -MT -aw -aw +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF aw Gm BJ @@ -1332,24 +1287,24 @@ lL lL "} (6,1,1) = {" -aw +AF Le -aw -aw -aw +AF +AF +AF Ir -aw -aw -aw -aw -aw -aw +AF +AF +AF +AF +AF +AF Ir -aw +AF Cp jT Rp -aw +AF pR pR pR @@ -1359,37 +1314,37 @@ lL lL "} (7,1,1) = {" -aw -aw -aw -Gz -aw -aw -aw -MT -aw -JQ -aw +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF +AF nM -aw -aw -aw +AF +AF +AF jT -rY -aw -aw -aw -aw +AF +AF +AF +AF +AF lL lL lL lL "} (8,1,1) = {" -aw +AF Le Le -aw +AF yC zC zC @@ -1431,7 +1386,7 @@ LK LK LK om -aw +AF DE Wu Um @@ -1470,7 +1425,7 @@ Um di Le Le -aw +AF xd Fb XN @@ -1487,17 +1442,17 @@ pG ae Px DE -EI -aw -aw +YG +AF +AF AK Um "} (12,1,1) = {" pR -aw -aw -aw +AF +AF +AF xd MX PH @@ -1514,17 +1469,17 @@ ML ae Px DE -EI -aw -aw -MT +YG +AF +AF +AF it "} (13,1,1) = {" pR pR -KB -aw +AF +AF xd ta cS @@ -1569,8 +1524,8 @@ zl Nq Nq Nq -aw -aw +AF +AF PN Um "} @@ -1595,8 +1550,8 @@ nN ae JI Ir -ds -aw +Nq +AF Wq Jl Um @@ -1621,18 +1576,18 @@ dr dr dr de -aw +AF Nq -aw -aw -Eu +AF +AF +AF it "} (17,1,1) = {" pR pR -aw -aw +AF +AF NJ dr sr @@ -1647,7 +1602,7 @@ lZ qO yO gy -aw +AF gE Dh Dh @@ -1657,9 +1612,9 @@ IY "} (18,1,1) = {" pR -aw -aw -nG +AF +AF +Ir NJ dr Kt @@ -1674,19 +1629,19 @@ nL lZ lZ cW -aw +AF Ib -aw -aw -aw -KB +AF +AF +AF +AF Um "} (19,1,1) = {" aw Le Le -aw +AF vp dr QJ @@ -1701,11 +1656,11 @@ lZ lZ lZ cW -aw +AF Ib -aw -aw -aw +AF +AF +AF xM Um "} @@ -1728,9 +1683,9 @@ cW gZ cW KW -aw +AF Ib -aw +AF Um lL lL @@ -1755,46 +1710,46 @@ LK LK LK LK -aw +AF Ib -Gz +AF Um lL lL lL "} (22,1,1) = {" -aw +AF Le kP -aw -iD -aw -aw -aw +AF +RC +AF +AF +AF Ir -aw -aw -aw -aw -aw -aw -aw -aw +AF +AF +AF +AF +AF +AF +AF +AF Gq -aw +AF Ib -aw +AF Um lL lL lL "} (23,1,1) = {" -aw -aw -aw -aw +AF +AF +AF +AF dQ re re @@ -1818,27 +1773,27 @@ lL lL "} (24,1,1) = {" -aw +AF Le aw -aw -aw -aw -aw -aw -aw -aw -aw -NJ -rY -aw -aw -JQ -aw +AF +AF +AF +AF +AF +AF +AF +AF +RC +AF +AF +AF +AF +AF nS -aw -aw -aw +AF +AF +AF Um lL lL @@ -1848,25 +1803,25 @@ lL Le Zc Le -aw -aw -aw -rY -aw -aw -aw -aw -NJ -aw -aw -aw -aw +AF +AF +AF +AF +AF +AF +AF +AF +RC +AF +AF +AF +AF Ir -aw -aw -MT -aw -aw +AF +AF +AF +AF +AF pR pR pR @@ -1875,24 +1830,24 @@ pR aw Le aw -aw +AF wn -aw +AF UQ -aw -aw -aw +AF +AF +AF qd -qZ -aw -aw -Eu -aw -aw -aw -aw -aw -aw +RC +AF +AF +AF +AF +AF +AF +AF +AF +AF aw wM wK @@ -1910,16 +1865,16 @@ eF eF eF eF -NJ -aw -aw -aw -aw -aw -aw -aw -aw -aw +RC +AF +AF +AF +AF +AF +AF +AF +AF +AF aw mG mG @@ -1938,10 +1893,10 @@ ZJ QI eF NJ -Iz +EI jH -Iz -Iz +EI +EI pR jg mG @@ -1968,7 +1923,7 @@ xn Le XD Le -Iz +EI pR MN Kh diff --git a/monkestation/code/modules/random_rooms/bars/tram_bar_modules.dm b/monkestation/code/modules/random_rooms/bars/tram_bar_modules.dm index e6b387551c04..8e735aaa2f97 100644 --- a/monkestation/code/modules/random_rooms/bars/tram_bar_modules.dm +++ b/monkestation/code/modules/random_rooms/bars/tram_bar_modules.dm @@ -36,6 +36,16 @@ icon_state = "ironsand1" base_icon_state = "ironsand" +/turf/open/floor/fake_seafloor/spawning/Initialize(mapload) + . = ..() + if(prob(10)) + var/to_spawn = pick(list(/obj/structure/flora/ocean/glowweed, + /obj/structure/flora/ocean/longseaweed, + /obj/structure/flora/ocean/seaweed, + /obj/structure/flora/ocean/coral, + /obj/structure/flora/rock/style_random)) + new to_spawn(src) + /turf/closed/mineral/random/fake_ocean baseturfs = /turf/open/floor/fake_seafloor turf_type = /turf/open/floor/fake_seafloor