From e8b2d472b3e6a7fc4da266624d5353bf10880d05 Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Thu, 18 May 2023 15:18:11 -0400 Subject: [PATCH] Fixes the ghost cafe's terrible shore erosion (#21245) the sand --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 349 ++++++++++-------- 1 file changed, 189 insertions(+), 160 deletions(-) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 5e47ead5d1a..c44ec8e0b93 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -1694,8 +1694,8 @@ /area/centcom/holding/cafe) "axY" = ( /obj/effect/overlay/palmtree_l, -/turf/open/misc/beach/sand{ - dir = 1 +/turf/open/misc/beach/coast/corner{ + dir = 4 }, /area/centcom/holding/cafepark) "ayd" = ( @@ -2555,7 +2555,7 @@ /area/centcom/holding/cafepark) "aGB" = ( /obj/structure/flora/bush/reed, -/turf/open/misc/beach/sand{ +/turf/open/misc/beach/coast{ dir = 5 }, /area/centcom/holding/cafepark) @@ -2676,8 +2676,8 @@ /area/centcom/holding/cafe) "aHD" = ( /obj/structure/flora/bush/reed, -/turf/open/misc/beach/sand{ - dir = 9 +/turf/open/misc/beach/coast/corner{ + dir = 4 }, /area/centcom/holding/cafepark) "aHJ" = ( @@ -3040,7 +3040,7 @@ /area/centcom/holding/cafedorms) "aMI" = ( /obj/machinery/vending/hydronutrients{ - products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 50, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 30, /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 30, /obj/item/cultivator = 10, /obj/item/shovel/spade = 10, /obj/item/plant_analyzer = 10) + products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez=50,/obj/item/reagent_containers/cup/bottle/nutrient/l4z=20,/obj/item/reagent_containers/cup/bottle/nutrient/rh=10,/obj/item/reagent_containers/spray/pestspray=30,/obj/item/reagent_containers/syringe=5,/obj/item/storage/bag/plants=30,/obj/item/cultivator=10,/obj/item/shovel/spade=10,/obj/item/plant_analyzer=10) }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" @@ -3173,13 +3173,13 @@ /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/exotic, /obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour = 90); + list_reagents = list(/datum/reagent/consumable/flour=90); name = "large flour sack"; possible_transfer_amounts = list(1,5,10,15,30,60,90); volume = 90 }, /obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour = 90); + list_reagents = list(/datum/reagent/consumable/flour=90); name = "large flour sack"; possible_transfer_amounts = list(1,5,10,15,30,60,90); volume = 90 @@ -3763,7 +3763,7 @@ /area/centcom/holding/cafepark) "aRL" = ( /obj/structure/flora/bush/reed, -/turf/open/misc/beach/sand{ +/turf/open/misc/beach/coast{ dir = 4 }, /area/centcom/holding/cafepark) @@ -5844,8 +5844,8 @@ /area/centcom/holding/cafedorms) "eks" = ( /obj/item/toy/beach_ball, -/turf/open/misc/beach/sand{ - dir = 8 +/turf/open/misc/beach/coast/corner{ + dir = 4 }, /area/centcom/holding/cafepark) "ekE" = ( @@ -6787,6 +6787,12 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron, /area/centcom/interlink) +"gUC" = ( +/obj/structure/spacevine, +/turf/open/misc/beach/coast{ + dir = 4 + }, +/area/centcom/holding/cafepark) "gWT" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck/cas/black, @@ -6811,12 +6817,12 @@ /obj/item/reagent_containers/condiment/soysauce, /obj/item/reagent_containers/condiment/sugar, /obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice = 90); + list_reagents = list(/datum/reagent/consumable/rice=90); name = "large rice sack"; possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90) }, /obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice = 90); + list_reagents = list(/datum/reagent/consumable/rice=90); name = "large rice sack"; possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90) }, @@ -7220,6 +7226,15 @@ }, /turf/open/floor/grass, /area/centcom/interlink) +"ifp" = ( +/obj/structure/spacevine{ + name = "thick vines"; + opacity = 1 + }, +/turf/open/misc/beach/coast{ + dir = 4 + }, +/area/centcom/holding/cafepark) "ifE" = ( /obj/machinery/vending/cigarette/syndicate, /obj/effect/turf_decal/bot_white, @@ -9045,6 +9060,12 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"mMx" = ( +/obj/structure/spacevine, +/turf/open/misc/beach/coast{ + dir = 9 + }, +/area/centcom/holding/cafepark) "mPR" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 4 @@ -9595,24 +9616,24 @@ /obj/item/storage/box/ingredients/american, /obj/item/storage/box/ingredients/exotic, /obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour = 90); + list_reagents = list(/datum/reagent/consumable/flour=90); name = "large flour sack"; possible_transfer_amounts = list(1,5,10,15,30,60,90); volume = 90 }, /obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour = 90); + list_reagents = list(/datum/reagent/consumable/flour=90); name = "large flour sack"; possible_transfer_amounts = list(1,5,10,15,30,60,90); volume = 90 }, /obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice = 90); + list_reagents = list(/datum/reagent/consumable/rice=90); name = "large rice sack"; possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90) }, /obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice = 90); + list_reagents = list(/datum/reagent/consumable/rice=90); name = "large rice sack"; possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90) }, @@ -9848,6 +9869,14 @@ /obj/effect/light_emitter/interlink, /turf/open/floor/grass, /area/centcom/interlink) +"pcp" = ( +/obj/structure/flora/biolumi/flower{ + random_light = null + }, +/turf/open/misc/beach/sand{ + dir = 4 + }, +/area/centcom/holding/cafepark) "pcH" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -49337,8 +49366,8 @@ ajj ajj ajj ajj -aWi -aWi +aSq +ofJ aWi aWi ajj @@ -49594,10 +49623,10 @@ aPf ajj aRe aUm +aHZ aWi -aWi -aOO -aUr +aVv +twL ajj aPf aPf @@ -49850,9 +49879,9 @@ ayI ayI aHX aUm -aUm -aWi -aWi +aSq +ofJ +aVv axY aWg ajj @@ -50107,9 +50136,9 @@ aPf aPf ajj axJ -apX -aWi +aHZ aWi +gjj axa aUm ajj @@ -50363,10 +50392,10 @@ ajj ajj ajj ajj +uxW +ofJ aWi -aWi -aWi -aWi +gjj axa aUm ajj @@ -50620,10 +50649,10 @@ aFP aMJ ajj ajj +bFi aWi -aWi -aWi -aWi +aVv +aRS axa aRe ajj @@ -50877,11 +50906,11 @@ aFP aFP anC ajj -aUr -aUr +aCv +twL eks aUr -aRS +aUr aUm ajj aPf @@ -64520,7 +64549,7 @@ aFP aFP aDa aUm -aSq +aUm apX aHZ aQf @@ -64778,8 +64807,8 @@ aUm aUm aUm aUm -aVv -aQf +aSq +ofJ aQf gjj axa @@ -65037,8 +65066,8 @@ sQX aqQ aHZ aQf -aQf -ofJ +aVv +aRS axa aUm aDa @@ -65290,13 +65319,13 @@ aFP aDa aUm aUm -aSq +aUm apX aHZ aQf gjj aOO -aRS +aUm aUm aUm aUm @@ -65546,13 +65575,13 @@ aeT aFP aUm aUm -aSq +aUm apX -aVv -aQf -aQf +aSq ofJ -axa +aVv +aRS +aUm aUm aUm aUm @@ -65804,12 +65833,12 @@ aFP aUm aUm aUm -aVv -aQf +aSq +ofJ aQf gjj aOO -aRS +aUm aUm aUm aUm @@ -66575,12 +66604,12 @@ aUm aUm aUm aUm -aLD -aQf +aCv +bFi aQf gjj aJh -aCv +aUm aUm aUm aUm @@ -66831,12 +66860,12 @@ aFB aUm aDa aUm -aKP +aUm aLQ aHZ aQf -aQf -bFi +aLD +aKP axa aUm aUm @@ -67347,12 +67376,12 @@ aUm aUm aUm aUm -aLD -aQf +aCv +bFi aQf gjj aJh -aCv +aUm sQX aUm aUm @@ -67603,13 +67632,13 @@ aFP aFP aUm aUm -aKP +aUm aLQ aHZ aQf -aQf -bFi -axa +aLD +aKP +aUm aUm aDa aUm @@ -68124,7 +68153,7 @@ aQf aQf gjj aJh -aCv +aUm aUm aUm aUm @@ -68379,9 +68408,9 @@ aUm aHZ aQf aQf -aQf -bFi -axa +aLD +aKP +aUm aUm aUm aUm @@ -68637,8 +68666,8 @@ aHZ aQf aQf aQf -ofJ -axa +gjj +aUm aUm vYR aUm @@ -68893,11 +68922,11 @@ aUm aHZ aQf aQf -gjj -aOO +aVv aRS aUm aUm +aUm cZJ aUm ajj @@ -69145,7 +69174,7 @@ aFP aUm aUm aUm -aSq +aUm apX aHZ aQf @@ -69403,12 +69432,12 @@ aUm aDa aUm aUm -aVv -aQf -aQf -twL +aSq ofJ -aGw +aQf +aVv +aRS +aqQ aUm nap aUm @@ -69662,10 +69691,10 @@ aUm aqQ aHZ aQf -gjj -aOO -aUr +aVv aRS +aUr +aUm sQX aUm aUm @@ -70428,12 +70457,12 @@ aFP aUm aUm aUm -aSq +aUm apX aHZ aQf aQf -ofJ +gjj axa aUm xFU @@ -70684,14 +70713,14 @@ aFP aUm aUm aUm -aSq +aUm apX +aSq +ofJ +aQf aVv -aQf -aQf -gjj aHD -aRS +aUm aUm xFU xFU @@ -70940,13 +70969,13 @@ aFP aUm aUm aRe -sQX +pcp aUm -aVv -aQf -aQf -aQf +aSq ofJ +aQf +aVv +aRS axa aUm aUm @@ -71195,16 +71224,16 @@ aLH aFP ajj aUm -aSq +axJ axJ axJ anQ aHZ aQf aQf -ofJ +gjj aOO -aRS +aUm aUm aUm xFU @@ -71451,17 +71480,17 @@ ahA aFP ajj ajj +axJ +axJ aSq -apX +uxW +uxW +ofJ +aQf aVv -uxW -uxW -aQf -aQf -gjj -aOO aRS aUm +aUm dIw aUm kPg @@ -71707,10 +71736,10 @@ aFP ajj ajj ajj +axJ +axJ aSq -apX -aVv -aQf +ofJ aQf aQf aQf @@ -71962,17 +71991,17 @@ aFP aFP ajj ajj -aSq axJ -apX +axJ +axJ +aSq +ofJ +aQf +aQf +aQf +aQf aVv -aQf -aQf -aQf -aQf -aQf -aQf -gjj +aRS axa rPh dOC @@ -72219,17 +72248,17 @@ ajj ajj ajj ajj -apX -aVv +aSq +uxW uxW -aQf -aQf -aQf -twL -twL -twL -twL ofJ +aQf +aVv +twL +twL +twL +aRS +aUm axa lCi vgx @@ -72464,30 +72493,30 @@ ajj aUm aUm aSq -axJ -axJ -axJ +uxW +uxW +uxW aRL -aCv +aKP aUm ajj ajj ajj ajj -fTV -lkn -aQf -aQf -aQf -aQf -aQf +ifp +gUC ofJ +aQf +aQf +aQf +aVv +aRS aOO aUr aUr aUr aUr -aRS +aUm aUm aUm aUm @@ -72720,26 +72749,26 @@ ajj asz aUm aSq -apX +ofJ aQf aQf aQf aQf aGB -axJ -axJ +uxW +uxW ajj lkn fTV fTV fTV lkn -aOO -aLQ -aLD -ofJ -aOO +aVv +twL +twL aRS +aOO +aUm eEg aUm nDE @@ -72976,7 +73005,7 @@ aNq aUm aUm aUm -aUm +aHZ aQf aQf aQf @@ -72989,13 +73018,13 @@ tEg aQf lkn fTV -lkn -aOO +mMx +twL aRS -aKP +aUm aAS aUr -aRS +aUm mzR eEg fRe @@ -73233,7 +73262,7 @@ aUm aUm aUm aUm -aUm +aHZ aQf aQf aQf @@ -73490,15 +73519,15 @@ axA axA aUm aUm -aKP -aUr -aLQ +aCv +twL +bFi aQf aQf aQf -aOO -aUr -aUr +aVv +twL +twL ajj ajj ajj @@ -73749,10 +73778,10 @@ aUm aUm aUm aUm -aKP -aUr -aUr -aUr +aCv +twL +twL +twL aRS aUm aUm