From a23ef0c9c241568e6d1bead490cf9b78bf9d3cb7 Mon Sep 17 00:00:00 2001 From: Leshana Date: Sun, 15 May 2016 16:04:40 -0400 Subject: [PATCH] Help Issue #23 by making the beach map loadable. --- maps/RandomZLevels/beach.dm | 2 +- maps/RandomZLevels/beach.dmm | 20 ++++++++++---------- vorestation.dme | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/maps/RandomZLevels/beach.dm b/maps/RandomZLevels/beach.dm index fc68e2b804..674c142b25 100644 --- a/maps/RandomZLevels/beach.dm +++ b/maps/RandomZLevels/beach.dm @@ -14,6 +14,6 @@ var/trash = pick(/obj/item/trash/raisins, /obj/item/trash/candy, /obj/item/trash/cheesie, /obj/item/trash/chips, /obj/item/trash/popcorn, /obj/item/trash/sosjerky, /obj/item/trash/syndi_cakes, /obj/item/trash/plate, /obj/item/trash/pistachios, /obj/item/trash/semki, /obj/item/trash/tray, /obj/item/trash/liquidfood, - /obj/item/trash/tastybread, /obj/item/trash/snack_bowl, /mob/living/simple_animal/crab/small) + /obj/item/trash/tastybread, /obj/item/trash/snack_bowl, /mob/living/simple_animal/crab) new trash(get_turf(src)) del(src) \ No newline at end of file diff --git a/maps/RandomZLevels/beach.dmm b/maps/RandomZLevels/beach.dmm index 6e3352df07..247296ab16 100644 --- a/maps/RandomZLevels/beach.dmm +++ b/maps/RandomZLevels/beach.dmm @@ -21,7 +21,7 @@ "au" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_y = 32},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "av" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum,/obj/structure/table/woodentable,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aw" = (/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"ax" = (/obj/machinery/door_control{id = "BaristoLoveShack"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/item/weapon/bedsheet/rainbow,/obj/structure/bed,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"ax" = (/obj/machinery/button/remote/airlock{id = "BaristoLoveShack"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/obj/item/weapon/bedsheet/rainbow,/obj/structure/bed,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "ay" = (/obj/structure/toilet{pixel_y = 8},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "az" = (/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aA" = (/turf/unsimulated/wall{tag = "icon-sandstone5"; icon_state = "sandstone5"},/area/awaymission/beach) @@ -30,9 +30,9 @@ "aD" = (/turf/unsimulated/wall{tag = "icon-sandstone4"; icon_state = "sandstone4"},/area/awaymission/beach) "aE" = (/turf/unsimulated/wall{tag = "icon-sandstone9"; icon_state = "sandstone9"},/area/awaymission/beach) "aF" = (/turf/unsimulated/wall{tag = "icon-sandstone1"; icon_state = "sandstone1"},/area/awaymission/beach) -"aG" = (/obj/structure/mineral_door/wood{icon_state = "wood"; name = "outhouse"; tag = "icon-wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"aH" = (/obj/machinery/door_control{id = "Changing1"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"aI" = (/obj/machinery/door_control{id = "Changing2"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aG" = (/obj/machinery/door/unpowered/shuttle{icon_state = "wood"; name = "outhouse"; tag = "icon-wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aH" = (/obj/machinery/button/remote/airlock{id = "Changing1"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aI" = (/obj/machinery/button/remote/airlock{id = "Changing2"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "0"; specialfunctions = 4},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aJ" = (/obj/machinery/door/airlock/sandstone{id_tag = "Changing1"; name = "Changing Room 1"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aK" = (/obj/machinery/door/airlock/sandstone{id_tag = "Changing2"; name = "Changing Room 2"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aL" = (/obj/structure/bedsheetbin{pixel_y = -6},/turf/unsimulated/floor{tag = "icon-asteroidfloor"; icon_state = "asteroidfloor"},/area/awaymission/beach) @@ -43,19 +43,19 @@ "aQ" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aR" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/barman_recipes,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aS" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"aT" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"aU" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aT" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aU" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aV" = (/obj/machinery/vending/boozeomat{emagged = 1; req_access_txt = "0"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aW" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aX" = (/obj/machinery/vending/cola,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "aY" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"aZ" = (/obj/structure/mineral_door/wood{tag = "icon-wood"; icon_state = "wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"aZ" = (/obj/machinery/door/unpowered/shuttle{tag = "icon-wood"; icon_state = "wood"},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "ba" = (/turf/unsimulated/wall{tag = "icon-sandstone0"; icon_state = "sandstone0"},/area/awaymission/beach) -"bb" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/cans/ale,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) +"bb" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "bc" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) "bd" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) -"be" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/obj/item/weapon/reagent_containers/food/drinks/cans/beer,/turf/unsimulated/beach/sand,/area/awaymission/beach) -"bf" = (/obj/structure/table,/obj/item/clothing/under/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/awaymission/beach) +"be" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/unsimulated/beach/sand,/area/awaymission/beach) +"bf" = (/obj/structure/table,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/awaymission/beach) "bg" = (/obj/item/weapon/stool,/turf/unsimulated/floor{tag = "icon-asteroidfloor"; icon_state = "asteroidfloor"},/area/awaymission/beach) "bh" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/awaymission/beach) "bi" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/awaymission/beach) diff --git a/vorestation.dme b/vorestation.dme index f80e79a8a8..5079bc42a5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1966,4 +1966,5 @@ #include "maps\virgo-3.dmm" #include "maps\virgo-4.dmm" #include "maps\virgo-5.dmm" +#include "maps\RandomZLevels\beach.dm" // END_INCLUDE