diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm index ce54b8f6134..fc51359f07f 100644 --- a/_maps/map_files/RandomZLevels/beach.dmm +++ b/_maps/map_files/RandomZLevels/beach.dmm @@ -1,73 +1,121 @@ -"a" = (/turf/unsimulated/beach/sand{density = 1; opacity = 1},/area/awaymission/beach) -"b" = (/turf/unsimulated/beach/sand,/area/awaymission/beach) -"c" = (/obj/machinery/gateway{dir = 9},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"d" = (/obj/machinery/gateway{dir = 1},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"e" = (/obj/machinery/gateway{dir = 5},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"f" = (/obj/effect/overlay/palmtree_r,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"g" = (/obj/machinery/gateway{dir = 8},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"h" = (/obj/machinery/gateway/centeraway,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"i" = (/obj/machinery/gateway{dir = 4},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"j" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"k" = (/obj/machinery/gateway{dir = 10},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"l" = (/obj/machinery/gateway,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"m" = (/obj/machinery/gateway{dir = 6},/turf/unsimulated/beach/sand,/area/awaymission/beach) -"n" = (/turf/unsimulated/wall{tag = "icon-sandstone6"; icon_state = "sandstone6"},/area/awaymission/beach) -"o" = (/turf/unsimulated/wall{tag = "icon-sandstone12"; icon_state = "sandstone12"},/area/awaymission/beach) -"p" = (/turf/unsimulated/wall{tag = "icon-sandstone10"; icon_state = "sandstone10"},/area/awaymission/beach) -"q" = (/obj/structure/closet/athletic_mixed,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"r" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"s" = (/turf/unsimulated/wall{tag = "icon-sandstone3"; icon_state = "sandstone3"},/area/awaymission/beach) -"t" = (/obj/structure/closet/gmcloset{icon_closed = "black"; icon_state = "black"; name = "formal wardrobe"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"u" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"v" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/barman_recipes,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"w" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"x" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"y" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/sunglasses,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"z" = (/obj/machinery/vending/boozeomat{emagged = 1},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"A" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"B" = (/obj/machinery/vending/cola,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"C" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"D" = (/turf/unsimulated/wall{tag = "icon-sandstone1"; icon_state = "sandstone1"},/area/awaymission/beach) -"E" = (/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"F" = (/obj/structure/mineral_door/wood{tag = "icon-wood"; icon_state = "wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"G" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"H" = (/turf/unsimulated/wall{tag = "icon-sandstone0"; icon_state = "sandstone0"},/area/awaymission/beach) -"I" = (/obj/structure/table/woodentable,/obj/machinery/chem_dispenser/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"J" = (/obj/item/weapon/beach_ball,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"K" = (/obj/structure/stool,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"L" = (/mob/living/simple_animal/crab,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"M" = (/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"N" = (/mob/living/simple_animal/crab/Coffee,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"O" = (/obj/structure/stool/bed/chair,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"P" = (/turf/unsimulated/beach/coastline,/area/awaymission/beach) -"Q" = (/turf/unsimulated/beach/coastline{density = 1; opacity = 1},/area/awaymission/beach) -"R" = (/turf/unsimulated/beach/water,/area/awaymission/beach) -"S" = (/turf/unsimulated/beach/water{density = 1; opacity = 1},/area/awaymission/beach) +"aa" = (/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ab" = (/obj/structure/flora/grass/brown,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ac" = (/obj/structure/flora/ausbushes/leafybush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ad" = (/obj/structure/flora/ausbushes/genericbush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ae" = (/obj/effect/overlay/palmtree_r,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"af" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ag" = (/obj/structure/flora/ausbushes/sunnybush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ah" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ai" = (/obj/effect/overlay/palmtree_r,/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aj" = (/obj/structure/flora/bush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ak" = (/obj/structure/flora/ausbushes/reedbush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"al" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"am" = (/obj/effect/decal/snow/sand/edge{name = "sand"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"an" = (/obj/effect/overlay/palmtree_r,/obj/effect/decal/snow/sand/edge{name = "sand"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ao" = (/obj/effect/decal/snow/sand/edge,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ap" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (SOUTHEAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 6},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aq" = (/turf/unsimulated/floor/chasm,/area/awaymission/beach) +"ar" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (SOUTHWEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 10},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"as" = (/obj/structure/flora/ausbushes/grassybush,/obj/effect/decal/snow/sand/edge{name = "sand"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"at" = (/obj/structure/flora/ausbushes/leafybush,/obj/effect/decal/snow/sand/edge{name = "sand"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"au" = (/obj/structure/flora/ausbushes/reedbush,/obj/effect/decal/snow/sand/edge{name = "sand"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"av" = (/obj/structure/flora/grass/green,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aw" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (EAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 4},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ax" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (WEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 8},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"ay" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (NORTHWEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 9},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"az" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (NORTH)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 1},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aA" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (NORTH)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 1},/obj/structure/sign/terrain,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aB" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (NORTHEAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 5},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aC" = (/obj/structure/flora/ausbushes/ppflowers,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aD" = (/obj/machinery/gateway{dir = 9},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aE" = (/obj/machinery/gateway{dir = 1},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aF" = (/obj/machinery/gateway{dir = 5},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aG" = (/obj/effect/overlay/palmtree_r,/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (WEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 8},/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aH" = (/obj/structure/flora/ausbushes/grassybush,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aI" = (/obj/machinery/gateway{dir = 8},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aJ" = (/obj/machinery/gateway/centeraway,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aK" = (/obj/machinery/gateway{dir = 4},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aL" = (/obj/effect/overlay/palmtree_l,/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (EAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 4},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aM" = (/obj/machinery/gateway{dir = 10},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aN" = (/obj/machinery/gateway,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aO" = (/obj/machinery/gateway{dir = 6},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aP" = (/turf/unsimulated/wall{tag = "icon-sandstone6"; icon_state = "sandstone6"},/area/awaymission/beach) +"aQ" = (/turf/unsimulated/wall{tag = "icon-sandstone12"; icon_state = "sandstone12"},/area/awaymission/beach) +"aR" = (/turf/unsimulated/wall{tag = "icon-sandstone10"; icon_state = "sandstone10"},/area/awaymission/beach) +"aS" = (/obj/structure/closet/athletic_mixed,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aT" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aU" = (/obj/effect/overlay/palmtree_r,/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (WEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 8},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"aV" = (/turf/unsimulated/wall{tag = "icon-sandstone3"; icon_state = "sandstone3"},/area/awaymission/beach) +"aW" = (/obj/structure/closet/gmcloset{icon_closed = "black"; icon_state = "black"; name = "formal wardrobe"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aX" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aY" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/barman_recipes,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aZ" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"ba" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bb" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/sunglasses,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bc" = (/obj/machinery/vending/boozeomat{emagged = 1},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bd" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"be" = (/obj/machinery/vending/cola,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bf" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bg" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (WEST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 8},/obj/structure/sign/terrain,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bh" = (/turf/unsimulated/wall{tag = "icon-sandstone1"; icon_state = "sandstone1"},/area/awaymission/beach) +"bi" = (/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bj" = (/obj/structure/mineral_door/wood{tag = "icon-wood"; icon_state = "wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bk" = (/turf/unsimulated/wall{tag = "icon-sandstone0"; icon_state = "sandstone0"},/area/awaymission/beach) +"bl" = (/obj/structure/table/woodentable,/obj/machinery/chem_dispenser/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bm" = (/obj/item/weapon/beach_ball,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bn" = (/obj/structure/stool,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bo" = (/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (EAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 4},/obj/structure/sign/terrain,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bp" = (/mob/living/simple_animal/crab,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bq" = (/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"br" = (/mob/living/simple_animal/crab/Coffee,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bs" = (/obj/structure/flora/ausbushes/grassybush,/obj/effect/decal/snow/sand/edge{tag = "icon-gravsnow_corner (EAST)"; name = "sand"; icon_state = "gravsnow_corner"; dir = 4},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bt" = (/obj/structure/stool/bed/chair,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bu" = (/obj/effect/decal/snow/sand/edge{dir = 4; icon_state = "gravsnow_corner"; layer = 3; name = "sand"; tag = "icon-gravsnow_corner (EAST)"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bv" = (/turf/unsimulated/floor/chasm{layer = 2.1},/area/awaymission/beach) +"bw" = (/obj/effect/decal/snow/sand/edge{dir = 8; icon_state = "gravsnow_corner"; layer = 3; name = "sand"; tag = "icon-gravsnow_corner (WEST)"},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bx" = (/turf/unsimulated/beach/coastline,/area/awaymission/beach) +"by" = (/obj/effect/waterfall{dir = 1},/turf/unsimulated/beach/coastline{density = 1},/area/awaymission/beach) +"bz" = (/turf/unsimulated/beach/water,/area/awaymission/beach) +"bA" = (/turf/unsimulated/beach/water{density = 1},/area/awaymission/beach) (1,1,1) = {" -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -bcdebbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbfba -bghibbbbjbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba -bklmbbbbbbbbnoooooooooopbbqrqrqrqrqrqrqa -bbbbbbbbbbbbstuvwxyzABCsbbbbbbbbbbbbbbba -bbbbbbbbbbbbDEEEEEEEEEEsbbbbbbbbbbbbbbba -bbbbbbbbbbbbFEEEEEEEEEEsbbbbbbbbbGbbbbba -bbfbbbbbbbbbHxIxxxxxxxxDbbbGbbJbbbbbbbba -bbbbbbbbbbbbbKKKKKKKKKKbbbbbbbbbbbbbbbba -bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba -bbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbfbbbbbbba -bbbbbbGMbbbbbbbbbbbbbbGbbbbbNbbbMbbbbbfa -bbbJbbbbbbLbbObObObObObObbbbbbbbbbObObba -bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba -PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPQ -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS -RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS +aaaaaaabacaaaaaaaaaaaaadacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaeaaaaafaaaeaeaeaeaaaaaaadaaaeaeaaaaaaaeaeaaaaaeaeaaaeaaaaaeaaaaaeaaabaaaaaeagaaaaaaaeaaaaaeaaaaaaaaaeaaaa +aeaeahaaaaaiaaaeaeaaajaeaeaiahaaaaajaeaeaaaaaeaaajaaaaaeaeahaaahaaaaaaaeagaiaaaaaaaeaeaaaaaeaaaaaaaeaaakaaaa +afaeaaaiaeajaeaaahaeaaaeaeafaaahaeaaaaaiahaaahaeaaaeaaalaaaaajaaaaaiaeajaaadaaaeagaaaaaeaeaaaaaeaiaeaaaaaeaa +akaaaiaaaiaaacafaeaeaiaaaaajaeahaeaaafaaahahalaiaaamaeaaalaeaaaiahagaaaeaaagaeaaaaaeaiaeaaaeaaagajaaaeaaabaa +aaaeaaalaaaeamamamamamanaoaoaoaoanamamamamamamamapaqaramamamasamamamamamatamamamatamamamauamamamaaagaaaaaaaa +aeaaaeaiavawaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaqaxagaeakaaaa +aaaeaeaaaaawaqaqayazazazazazazazazazazazazaAazazazazaBaqaqaqaqayazazazazazazazaAazazazazazaBaqaqaxaaalaaaeaa +aeaCaaaeaeapaqayaDaEaFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazazazazaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaBaqaGaaaaaaaeaa +aaaaaaaHawaqaqaxaIaJaKaaaaaaaaalaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawaqaraeaeaaajaa +avaeaiaaaLaqaqaxaMaNaOaaaaaaaaaaaaaaaaaPaQaQaQaQaQaQaQaQaQaQaRaaaaaSaTaSaTaSaTaSaTaSaTaSaTaSawaqaqaUabaaaaaa +aaakaaaeaaaBaqaxaaaaaaaaaaaaaaaaaaaaaaaVaWaXaYaZbabbbcbdbebfaVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawaqayaHalaeahaa +ahaaacacaeawaqbgaaaaaaaaaaaaaaaaaaaaaabhbibibibibibibibibibiaVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawaqaxaaagaeakae +aeaeaHahaeawaqaraaaaaaaaaaaaaaaaaaaaaabjbibibibibibibibibibiaVaaaaaaaaaaaaaaaaaaahaaaaaaaaaaawaqaUaeaaaeaaaa +avaaabaaaaawaqaqaxaeaaaaaaaaaaaaaaaaaabkbablbababababababababhaaaaaaahaaaabmaaaaaaaaaaaaaaaaawaqaxaaaeaaaaav +akaaaealaeawaqaqaxaaaaaaaaaaaaaaaaaaaaaabnbnbnbnbnbnbnbnbnbnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawaqaUakaaaiaeaa +aaahaeaaaaawaqaqaxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaqaxaaabaaagae +aeaiaaaeaeawaqaqaxaabpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaawaqaUalaeaiaaaa +aaaaaiaaaaawaqayaaaaaaaaaaahbqaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaaaaaaaaaabraaaaaabqaaaaaaaaaaaeawaqaxajavaaaeab +ahajahaeaabsaqaxaaaabmaaaaaaaaaaaabpaaaabtaabtaabtaabtaabtaabtaaaaaaaaaaaaaaaaaaaabtaabtaaaaawaqaxaaaeaaahaa +aaaaaaaaaabubvbwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabubvbwaaaaaaaaaa +bxbxbxbxbxbxbybxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbxbybxbxbxbxbxbx +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbAbzbzbzbzbzbz +bzbzbzbzbzbzbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbAbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz +bzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbzbz "} diff --git a/code/controllers/Processes/timer.dm b/code/controllers/Processes/timer.dm index 8cea3c60514..0da9ba4fd98 100644 --- a/code/controllers/Processes/timer.dm +++ b/code/controllers/Processes/timer.dm @@ -1,4 +1,4 @@ -var/global/datum/controller/process/timer/PStimer +var/global/datum/controller/process/timer/timer_controller /datum/controller/process/timer var/list/processing_timers = list() @@ -7,7 +7,7 @@ var/global/datum/controller/process/timer/PStimer /datum/controller/process/timer/setup() name = "timer" schedule_interval = 5 //every 0.5 seconds - PStimer = src + timer_controller = src /datum/controller/process/timer/statProcess() ..() @@ -44,17 +44,17 @@ var/global/datum/controller/process/timer/PStimer nextid++ /datum/timedevent/Destroy() - PStimer.processing_timers -= src - PStimer.hashes -= hash + timer_controller.processing_timers -= src + timer_controller.hashes -= hash return QDEL_HINT_IWILLGC /proc/addtimer(thingToCall, procToCall, wait, unique = FALSE, ...) - if(!PStimer) //can't run timers before the mc has been created + if(!timer_controller) //can't run timers before the mc has been created return if(!thingToCall || !procToCall || wait <= 0) return - if(PStimer.disabled) - PStimer.disabled = 0 + if(timer_controller.disabled) + timer_controller.disabled = 0 var/datum/timedevent/event = new() event.thingToCall = thingToCall @@ -66,15 +66,15 @@ var/global/datum/controller/process/timer/PStimer // Check for dupes if unique = 1. if(unique) - if(event.hash in PStimer.hashes) + if(event.hash in timer_controller.hashes) return // If we are unique (or we're not checking that), add the timer and return the id. - PStimer.processing_timers += event - PStimer.hashes += event.hash + timer_controller.processing_timers += event + timer_controller.hashes += event.hash return event.id /proc/deltimer(id) - for(var/datum/timedevent/event in PStimer.processing_timers) + for(var/datum/timedevent/event in timer_controller.processing_timers) if(event.id == id) qdel(event) return 1 diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index cf5acebeede..70cb8bf9b38 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -13,4 +13,18 @@ /turf/unsimulated/floor/snow name = "snow" icon = 'icons/turf/snow.dmi' - icon_state = "snow" \ No newline at end of file + icon_state = "snow" + +/turf/unsimulated/floor/chasm + name = "sinkhole" + desc = "It's difficult to see the bottom." + density = 1 + icon = 'icons/turf/floors/Chasms.dmi' + icon_state = "Fill" + smooth = SMOOTH_TRUE + canSmoothWith = null + +/turf/unsimulated/floor/chasm/New() + spawn(1) + smooth_icon(src) + smooth_icon_neighbors(src) \ No newline at end of file diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm new file mode 100644 index 00000000000..697da1e9c6f --- /dev/null +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -0,0 +1,37 @@ +/obj/effect/waterfall + name = "waterfall effect" + icon = 'icons/effects/effects.dmi' + icon_state = "extinguish" + opacity = 0 + mouse_opacity = 0 + density = 0 + anchored = 1 + invisibility = 101 + + var/water_frequency = 15 + var/water_timer = 0 + +/obj/effect/waterfall/New() + water_timer = addtimer(src, "drip", water_frequency) + +/obj/effect/waterfall/Destroy() + if(water_timer) + deltimer(water_timer) + water_timer = null + +/obj/effect/waterfall/proc/drip() + var/obj/effect/effect/water/W = new(loc) + W.dir = dir + spawn(1) + W.loc = get_step(W, dir) + water_timer = addtimer(src, "drip", water_frequency) + +/obj/structure/sign/terrain + name = "warning sign" + desc = "Watch your step! Unstable terrain." + density = 1 + icon = 'icons/obj/stationobjs.dmi' + icon_state = "signpost" + +/obj/structure/sign/terrain/attack_hand(mob/user) + examine(user) \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index b313ca1ab5f..c30ca7e5c0f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1023,6 +1023,7 @@ #include "code\modules\awaymissions\maploader\swapmaps.dm" #include "code\modules\awaymissions\maploader\writer.dm" #include "code\modules\awaymissions\mission_code\academy.dm" +#include "code\modules\awaymissions\mission_code\beach.dm" #include "code\modules\awaymissions\mission_code\blackmarketpackers.dm" #include "code\modules\awaymissions\mission_code\centcomAway.dm" #include "code\modules\awaymissions\mission_code\challenge.dm"