From b3a71ec8439f66678a42974a5331ad6e1f92ff84 Mon Sep 17 00:00:00 2001 From: KaileyCtrg Date: Wed, 10 Jun 2026 21:49:35 +1000 Subject: [PATCH 1/4] various map fixes --- .../Vampire/special_fran/residential.dmm | 40 +- .../special_fran/special_fran_umbra.dmm | 12 +- .../special_fran/special_francisco.dmm | 2296 ++++++++--------- 3 files changed, 1142 insertions(+), 1206 deletions(-) diff --git a/_maps/map_files/Vampire/special_fran/residential.dmm b/_maps/map_files/Vampire/special_fran/residential.dmm index 90c188ade672..5a7d3115bcd2 100644 --- a/_maps/map_files/Vampire/special_fran/residential.dmm +++ b/_maps/map_files/Vampire/special_fran/residential.dmm @@ -1965,6 +1965,10 @@ }, /turf/open/floor/carpet/darkpack, /area/vtm/interior/apartment) +"pD" = ( +/obj/effect/spawner/random/structure/billboard/darkpack, +/turf/open/misc/grass, +/area/vtm/outside/fishermanswharf) "pG" = ( /obj/effect/turf_decal/asphaltline/alt{ dir = 8 @@ -5029,6 +5033,10 @@ /obj/structure/platform/lowwall/junk/window, /turf/open/floor/plating/rough, /area/vtm/interior/shop/gummaguts) +"Nt" = ( +/obj/structure/chair/plastic/darkpack, +/turf/open/misc/beach/vamp, +/area/vtm/outside/northbeach) "Nu" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -6546,16 +6554,6 @@ /obj/structure/bookcase/random/reference, /turf/open/floor/carpet/darkpack/blackgold, /area/vtm/interior/ghetto) -"Zs" = ( -/obj/effect/turf_decal/asphaltline/alt{ - dir = 8 - }, -/obj/effect/turf_decal/asphaltline/alt{ - dir = 8 - }, -/obj/structure/retail/gummaguts_menu, -/turf/open/floor/plating/asphalt, -/area/vtm/outside/fishermanswharf/ghetto) "Zv" = ( /obj/structure/chair/plastic/darkpack{ dir = 8 @@ -9696,7 +9694,7 @@ iw vE Sh Sh -mo +Nt Sh Xf Sh @@ -11018,10 +11016,10 @@ OY OY rk xb -MY -MY -MY -MY +jy +WZ +WZ +jy MY WZ WZ @@ -11125,10 +11123,10 @@ OY OY rk xb +pD MY -jy -jy WZ +MY WZ WZ pP @@ -11233,9 +11231,9 @@ OY rk xb MY -jy -WZ -pP +MY +MY +MY WZ WZ WZ @@ -14388,7 +14386,7 @@ jk bA jk Ll -Zs +jk Ll hk xX diff --git a/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm b/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm index 9238a6469626..5b2c134df19d 100644 --- a/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm +++ b/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm @@ -6,6 +6,10 @@ }, /turf/open/floor/plating/sidewalk/poor, /area/vtm/outside/penumbra) +"aj" = ( +/obj/effect/landmark/teleport_mark/gaia, +/turf/open/misc/dirt, +/area/vtm/outside/penumbra) "ap" = ( /obj/structure/chair/comfy/darkpack{ dir = 8 @@ -533,10 +537,6 @@ /obj/structure/bed/medical/anchored, /turf/open/floor/city/plating_stone, /area/vtm/outside/penumbra) -"uc" = ( -/obj/effect/landmark/teleport_mark/wyld, -/turf/open/misc/dirt, -/area/vtm/outside/penumbra) "uq" = ( /turf/closed/wall/vampwall/rich, /area/vtm/outside/penumbra) @@ -4491,7 +4491,7 @@ gr gr Oa Jr -uc +Jr dd dd dd @@ -4598,7 +4598,7 @@ gr gr Jr Jr -Jr +aj Jr dd dd diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index e028d0ae1067..2723830a51c9 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -25,10 +25,7 @@ /area/vtm/voivodate) "abs" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 14; - pixel_x = -2 - }, +/obj/machinery/microwave, /turf/open/floor/wood/smooth/old, /area/vtm/interior/ghetto) "aby" = ( @@ -79,9 +76,7 @@ /area/vtm) "acN" = ( /obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_y = 13 - }, +/obj/machinery/microwave, /obj/item/reagent_containers/cup/glass/dry_ramen{ pixel_x = -1; pixel_y = 27 @@ -331,6 +326,10 @@ /obj/item/pen/fourcolor, /turf/open/floor/wood/smooth, /area/vtm/interior/endron_facility/restricted) +"alB" = ( +/obj/item/toy/basketball, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/unionsquare) "alD" = ( /obj/structure/closet/crate, /obj/effect/decal/pallet, @@ -838,7 +837,7 @@ "aBp" = ( /obj/machinery/light/directional/west, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/interior/shop/bacotell) "aBC" = ( /obj/effect/turf_decal/siding/white, /obj/structure/vampdoor/simple, @@ -913,7 +912,7 @@ dir = 4 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "aDK" = ( /obj/structure/chair/sofa/corp, /obj/effect/landmark/start/darkpack/ocean/ganger, @@ -1075,7 +1074,7 @@ pixel_y = 8 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "aHb" = ( /obj/structure/table/wood, /obj/item/flashlight/flare/candle/infinite{ @@ -1159,7 +1158,7 @@ }, /obj/structure/hydrant, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "aJQ" = ( /obj/effect/turf_decal/bordur{ dir = 1 @@ -1217,7 +1216,7 @@ dir = 8 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "aKw" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/structure/vampdoor/simple, @@ -1272,7 +1271,7 @@ "aMe" = ( /obj/structure/hydrant, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "aMG" = ( /obj/structure/flora/rock/darkpack, /turf/open/misc/beach/vamp, @@ -1502,7 +1501,7 @@ }, /obj/structure/closet/cardboard, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "aUC" = ( /obj/item/rag{ pixel_x = -6; @@ -1552,10 +1551,6 @@ }, /turf/open/floor/fakebasalt, /area/vtm/interior/voivodate/cave) -"aVJ" = ( -/obj/structure/retail/antique, -/turf/open/space/basic, -/area/space) "aVK" = ( /obj/structure/table, /obj/effect/decal/wallpaper/paper/darkred/low, @@ -2180,7 +2175,7 @@ "bqu" = ( /obj/effect/turf_decal/bordur/inverse, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "bqx" = ( /obj/effect/decal/wallpaper/light, /turf/closed/wall/vampwall/old, @@ -2240,7 +2235,7 @@ "brl" = ( /obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "brm" = ( /obj/structure/chair/wood/darkpack{ dir = 1 @@ -2295,15 +2290,12 @@ /turf/open/floor/plating/rough, /area/vtm/interior/sewer) "buR" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/landmark/npcwall, /obj/structure/sign/city/store/bacotell/directional/north{ pixel_y = 39 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "bva" = ( /turf/open/floor/carpet/darkpack/cyan, /area/vtm/interior/clinic) @@ -2430,6 +2422,12 @@ /obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, +/obj/item/stack/medical/bone_gel, +/obj/item/stack/medical/wrap/sticky_tape/surgical, +/obj/item/stack/medical/wrap/gauze/twelve, +/obj/item/storage/medkit/darkpack/standard, +/obj/item/clothing/gloves/vampire/latex, +/obj/item/clothing/suit/apron/surgical, /turf/open/floor/iron/showroomfloor, /area/vtm/interior/clinic) "byO" = ( @@ -2512,7 +2510,7 @@ "bBZ" = ( /obj/effect/spawner/random/stray_animal, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "bCd" = ( /obj/effect/turf_decal/darkpack/cave, /turf/open/floor/fakebasalt, @@ -2597,10 +2595,6 @@ /obj/machinery/light/prince/directional/east, /turf/open/floor/plating/sidewalk/old, /area/vtm/interior/voivodate/sanctum) -"bDH" = ( -/obj/effect/landmark/latejoin, -/turf/open/floor/plating/asphalt, -/area/vtm) "bEb" = ( /obj/structure/bookcase/random/kindred, /turf/open/floor/wood/smooth/old, @@ -2936,7 +2930,7 @@ /obj/effect/decal/cleanable/trash, /obj/item/cigbutt, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "bLR" = ( /obj/structure/vampdoor/simple, /obj/effect/mapping_helpers/door/access/npc, @@ -2952,8 +2946,7 @@ /turf/open/floor/carpet/darkpack/redsilver, /area/vtm/interior/voivodate) "bMa" = ( -/obj/structure/table, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "bMb" = ( @@ -3009,7 +3002,7 @@ }, /mob/living/carbon/human/npc/walkby, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "bPg" = ( /obj/structure/vampfence/corner/rich{ dir = 8; @@ -3019,7 +3012,7 @@ }, /obj/effect/turf_decal/bordur, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "bPl" = ( /turf/open/openspace, /area/vtm/outside/chinatown) @@ -3147,12 +3140,6 @@ "bTa" = ( /turf/closed/wall/vampwall/rich, /area/vtm/interior/millennium_tower/f4) -"bTi" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 4 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "bTk" = ( /obj/effect/turf_decal/siding/white, /obj/structure/vampdoor, @@ -3202,7 +3189,7 @@ /obj/effect/decal/cleanable/trash, /obj/effect/decal/cleanable/cardboard, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "bUU" = ( /obj/structure/chair/plastic/darkpack, /turf/open/floor/plating/sidewalk/old, @@ -3352,7 +3339,8 @@ pixel_y = 38 }, /obj/machinery/chem_dispenser/drinks{ - pixel_y = 11 + pixel_y = 0; + pixel_x = 0 }, /turf/open/floor/city/bacotell, /area/vtm/interior/shop/bacotell) @@ -3615,7 +3603,7 @@ /area/vtm/interior/voivodate) "cfr" = ( /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "cfB" = ( /obj/structure/railing{ dir = 8 @@ -3930,7 +3918,7 @@ "coe" = ( /obj/effect/decal/cleanable/vomit, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "coS" = ( /obj/structure/roofstuff/vent/autotiling, /obj/structure/roofstuff/vent/autotiling, @@ -4092,7 +4080,7 @@ "ctA" = ( /obj/structure/barrels/rand, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "ctB" = ( /obj/structure/rack/food/rand, /turf/open/floor/plating/concrete, @@ -4116,6 +4104,10 @@ /obj/item/gas_can/full, /turf/open/floor/city/toilet/large, /area/vtm/interior/sewer) +"cuo" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "cuw" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4145,7 +4137,7 @@ pixel_y = -21 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "cvb" = ( /obj/structure/chair/sofa/corp{ color = "#CD5C5C" @@ -4212,7 +4204,7 @@ pixel_y = 11 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "cwA" = ( /obj/structure/table/glass, /obj/structure/fluff/tv{ @@ -4238,7 +4230,7 @@ /obj/effect/decal/cleanable/cardboard, /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "cxn" = ( /obj/structure/rack/clothing_hanger, /turf/open/floor/city/plating, @@ -4301,10 +4293,6 @@ }, /turf/open/floor/plating/concrete, /area/vtm/outside/park) -"czf" = ( -/obj/effect/decal/cleanable/trash, -/turf/open/floor/plating/sidewalk, -/area/vtm) "czt" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -4488,7 +4476,7 @@ pixel_y = 8 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "cEQ" = ( /obj/machinery/light/dim/directional/east, /turf/open/floor/plating/rough, @@ -4656,7 +4644,7 @@ /obj/effect/turf_decal/bordur, /obj/effect/landmark/npcwall, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "cIN" = ( /obj/structure/table/countertop/bubway, /obj/item/storage/fancy/cigarettes/cigpack_xeno{ @@ -4759,7 +4747,7 @@ /obj/effect/turf_decal/darkpack/dirt, /obj/effect/decal/cleanable/trash, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "cLd" = ( /obj/item/guts, /turf/open/floor/plating/rough/cave{ @@ -4781,7 +4769,7 @@ }, /obj/structure/barrels/rand, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "cLF" = ( /obj/effect/turf_decal/darkpack/cave{ dir = 1 @@ -4827,6 +4815,10 @@ /obj/underplate/stuff{ pixel_y = 8 }, +/obj/item/knife/kitchen{ + pixel_x = 10; + pixel_y = 7 + }, /turf/open/floor/city/bacotell, /area/vtm/interior/shop/bubway) "cMA" = ( @@ -4941,7 +4933,7 @@ /obj/structure/closet/crate/dumpster, /obj/effect/spawner/random/occult/artifact, /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "cQF" = ( /obj/structure/chair/office/darkpack/green, /obj/effect/landmark/start/darkpack/hospital/doctor, @@ -5138,7 +5130,7 @@ "cVz" = ( /obj/structure/closet/cardboard, /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "cVU" = ( /obj/effect/decal/wallpaper/lightpadded, /turf/closed/wall/vampwall/old, @@ -5312,14 +5304,6 @@ }, /turf/open/floor/plating/concrete, /area/vtm/interior/clinic) -"daq" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 7; - pixel_x = -2 - }, -/turf/open/floor/wood/smooth/old, -/area/vtm/interior/ghetto) "dat" = ( /obj/structure/table/glass, /obj/item/storage/ashtray{ @@ -5596,7 +5580,7 @@ /obj/effect/landmark/npcability, /obj/effect/landmark/npcactivity, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "dmo" = ( /obj/effect/turf_decal/bordur{ dir = 8 @@ -5803,9 +5787,6 @@ /turf/open/floor/plating/rough/cave, /area/vtm/interior/voivodate/cave) "dtM" = ( -/obj/effect/turf_decal/bordur{ - dir = 8 - }, /obj/machinery/light/directional/north, /obj/structure/platform/lowwall/market, /turf/open/floor/plating/rough, @@ -6000,10 +5981,6 @@ /obj/effect/decal/shadow, /turf/open/floor/plating/rough, /area/vtm/interior/sewer) -"dyR" = ( -/obj/item/kirbyplants/darkpack/random, -/turf/open/floor/city/bacotell, -/area/vtm/interior/shop/bubway) "dyX" = ( /turf/closed/indestructible/the_matrix, /area/vtm/interior/sewer) @@ -6084,7 +6061,9 @@ "dCA" = ( /obj/structure/table/countertop/bubway, /obj/structure/sink/directional/north{ - icon_state = "basin" + icon_state = "basin"; + pixel_x = 0; + pixel_y = -9 }, /obj/item/reagent_containers/cup/glass/mug{ pixel_x = -20; @@ -6145,7 +6124,7 @@ dir = 8 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "dDM" = ( /obj/structure/vampdoor/simple{ dir = 4 @@ -6242,10 +6221,6 @@ icon_state = "basin" }, /obj/structure/platform/lowwall/painted, -/obj/item/clothing/gloves/vampire/latex{ - pixel_x = 9; - pixel_y = 30 - }, /obj/item/storage/box/masks{ pixel_y = 24; pixel_x = -8 @@ -6358,7 +6333,7 @@ "dJw" = ( /obj/effect/turf_decal/darkpack/dirt, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "dJy" = ( /obj/structure/table, /obj/vampire_computer{ @@ -6530,8 +6505,9 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/laundromat) "dPG" = ( -/obj/machinery/vending/cola{ - pixel_y = 20; +/obj/machinery/vending/cola/starkist{ + pixel_x = 0; + pixel_y = 22; density = 0 }, /turf/open/floor/city/toilet/large, @@ -6684,7 +6660,7 @@ dir = 4 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "dUw" = ( /obj/structure/table/wood, /obj/item/kirbyplants/darkpack/plant4{ @@ -6908,11 +6884,7 @@ /area/vtm/interior/museum) "ebL" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, +/obj/machinery/microwave, /turf/open/floor/city/toilet/large, /area/vtm/interior/ghetto) "ebR" = ( @@ -7031,6 +7003,14 @@ }, /turf/open/floor/city/plating_stone, /area/vtm/interior/apartment) +"eea" = ( +/obj/machinery/vending/cola/starkist{ + density = 0; + pixel_x = 2; + pixel_y = 22 + }, +/turf/open/floor/wood/smooth/old, +/area/vtm/interior/gang) "ees" = ( /obj/structure/curtain/cloth/fancy/mechanical/luxurious{ id = "endron_iaa_curtains"; @@ -7294,7 +7274,7 @@ "elV" = ( /obj/effect/decal/cleanable/trash, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "eml" = ( /obj/effect/turf_decal/bordur/corner, /turf/open/floor/plating/sidewalk/old, @@ -7410,7 +7390,7 @@ /obj/effect/decal/cleanable/trash, /mob/living/carbon/human/npc/hobo, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "eqA" = ( /obj/machinery/light/prince/directional/north, /turf/open/floor/wood/smooth/old, @@ -7660,10 +7640,7 @@ /area/vtm/interior/wyrm_corrupted) "exk" = ( /obj/structure/coclock, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/structure/table, /turf/open/floor/city/clinic, /area/vtm/interior/millennium_tower) @@ -7883,7 +7860,7 @@ /obj/item/reagent_containers/cup/bottle/nutrient/ez, /obj/item/reagent_containers/cup/bottle/nutrient/ez, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "eGC" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -7940,7 +7917,7 @@ dir = 4 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "eJc" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -7969,7 +7946,7 @@ dir = 1 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "eJG" = ( /obj/structure/sink/directional/south, /obj/structure/mirror{ @@ -8287,9 +8264,7 @@ /area/vtm/interior/ghetto) "eSG" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 8 - }, +/obj/machinery/microwave, /obj/item/reagent_containers/cup/glass/dry_ramen{ pixel_x = -1; pixel_y = 21 @@ -8456,7 +8431,7 @@ }, /obj/effect/turf_decal/darkpack/rough, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "eWh" = ( /obj/structure/vampdoor/oldwood, /obj/effect/mapping_helpers/door/access/voivodate, @@ -8602,16 +8577,18 @@ /turf/open/floor/carpet/royalblack, /area/vtm/interior/apartment) "faU" = ( -/obj/machinery/vending/cola{ - pixel_y = 20 - }, /obj/machinery/light/directional/north, +/obj/machinery/vending/cola/shamblers{ + pixel_x = 0; + pixel_y = 22; + density = 0 + }, /turf/open/floor/plating/concrete, /area/vtm/interior/police) "faZ" = ( /obj/machinery/light/directional/north, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "fbd" = ( /obj/machinery/light/directional/south, /obj/structure/table/countertop/yellow, @@ -8691,7 +8668,7 @@ }, /obj/structure/roadsign/parking, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "feD" = ( /obj/effect/turf_decal/trimline/red/warning{ dir = 1 @@ -8862,7 +8839,7 @@ pixel_y = 8 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fju" = ( /obj/effect/landmark/npcwall, /obj/effect/landmark/navigate_destination, @@ -8932,7 +8909,7 @@ dir = 5 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fkD" = ( /obj/structure/chair/comfy/darkpack{ color = "#FFECD5"; @@ -9049,7 +9026,7 @@ /obj/structure/table, /obj/effect/food_cart_stand, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "flG" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -9063,12 +9040,6 @@ /obj/item/smartphone/emergency, /turf/open/floor/wood/smooth/old, /area/vtm/interior/police) -"fmn" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 6 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "fmw" = ( /obj/structure/table/wood, /obj/vampire_computer, @@ -9112,12 +9083,6 @@ }, /turf/open/misc/grass, /area/vtm/interior/voivodate/sanctum) -"fnM" = ( -/obj/effect/turf_decal/crosswalk, -/obj/effect/landmark/npcability, -/obj/effect/turf_decal/bordur/inverse, -/turf/open/floor/plating/asphalt, -/area/vtm) "fnW" = ( /obj/effect/turf_decal/bordur{ dir = 8 @@ -9362,11 +9327,7 @@ /area/vtm/outside/financialdistrict) "fui" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, +/obj/machinery/microwave, /turf/open/floor/city/plating_mono, /area/vtm/interior/endron_facility/restricted) "fuH" = ( @@ -9380,6 +9341,12 @@ /obj/machinery/light/small/red/directional/south, /turf/open/floor/city/circled/large, /area/vtm/interior/endron_facility/restricted) +"fuU" = ( +/obj/effect/turf_decal/bordur/corner{ + dir = 4 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "fuX" = ( /turf/open/floor/iron/stairs, /area/vtm/interior/clinic) @@ -9439,9 +9406,7 @@ /area/vtm/interior/millennium_tower) "fwv" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/effect/decal/wallpaper/stone/low, /obj/structure/platform/lowwall/rich, /turf/open/floor/plating/rough, @@ -9604,7 +9569,7 @@ "fAg" = ( /obj/effect/decal/cleanable/trash, /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fAz" = ( /obj/structure/table, /obj/structure/retail/costume_store{ @@ -9731,7 +9696,7 @@ dir = 1 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fFo" = ( /obj/structure/chair/wood/darkpack/red{ dir = 8 @@ -9891,7 +9856,7 @@ dir = 8 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fJN" = ( /obj/structure/hedge{ density = 0 @@ -10000,9 +9965,12 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/ghetto) "fMI" = ( -/obj/effect/spawner/random/structure/billboard/roadsigns, +/obj/structure/billboard/darkpack/king{ + pixel_x = 0; + pixel_y = 9 + }, /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "fMK" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/trimline/red/warning{ @@ -10139,12 +10107,18 @@ alpha = 1 }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "fSq" = ( /mob/living/carbon/human/npc/illegal, /obj/structure/chair/darkpack, /turf/open/floor/plating/rough, /area/vtm/interior/supply) +"fSt" = ( +/obj/effect/turf_decal/bordur{ + dir = 4 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "fSI" = ( /obj/machinery/light/small/directional/east, /obj/structure/bed, @@ -10202,11 +10176,14 @@ desc = "An old stool. Seems a bit unstable." }, /obj/structure/rack/tall/wood_shelf{ - pixel_y = 24 + pixel_y = 12; + pixel_x = 0; + density = 0 }, /obj/item/toy/mecha/ripley{ - pixel_y = 54; - anchored = 1 + pixel_y = 34; + anchored = 1; + pixel_x = 0 }, /turf/open/floor/wood/smooth/old, /area/vtm/interior/mallarcade) @@ -10226,9 +10203,8 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/voivodate) "fUT" = ( -/obj/structure/table, /obj/machinery/computer/cargo/express, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "fUX" = ( @@ -10400,7 +10376,7 @@ pixel_y = 7 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "gai" = ( /obj/structure/table/wood{ pixel_y = -1 @@ -10461,7 +10437,7 @@ pixel_y = 15 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "gcO" = ( /obj/item/toy/plush/snakeplushie, /mob/living/basic/pet/cat/jerry, @@ -11020,7 +10996,9 @@ /obj/structure/chair/office/darkpack/green{ dir = 1 }, -/mob/living/carbon/human/npc/endronsecurity, +/mob/living/carbon/human/npc/endronsecurity{ + dir = 1 + }, /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) "gsy" = ( @@ -11028,7 +11006,7 @@ dir = 4 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "gsI" = ( /obj/structure/table, /obj/vampire_computer, @@ -11206,10 +11184,7 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 15 - }, +/obj/machinery/microwave, /obj/structure/table, /obj/machinery/light/directional/north, /turf/open/floor/city/bacotell, @@ -11553,13 +11528,13 @@ dir = 10 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "gHB" = ( /obj/effect/turf_decal/darkpack/rough/corner{ dir = 1 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "gHF" = ( /obj/effect/turf_decal/siding/brown{ dir = 4; @@ -11860,6 +11835,12 @@ /obj/machinery/light/prince/directional/west, /turf/open/floor/carpet/darkpack/blacksilver, /area/vtm/interior/bianchiBank) +"gPv" = ( +/obj/effect/turf_decal/bordur{ + dir = 4 + }, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "gPy" = ( /obj/effect/decal/cleanable/cardboard, /turf/open/floor/plating/sidewalk/poor, @@ -12011,7 +11992,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "gSF" = ( /obj/effect/turf_decal/siding/wood{ color = "#4a3925"; @@ -12103,6 +12084,11 @@ "gUU" = ( /turf/open/water/beach/vamp, /area/vtm/interior/voivodate/cave) +"gUY" = ( +/obj/machinery/light/directional/north, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/city/plating_mono, +/area/vtm/interior/endron_facility/restricted) "gVo" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/wood/old, @@ -12268,10 +12254,7 @@ /area/vtm/interior/police) "gZI" = ( /obj/structure/table/countertop/bubway, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 13 - }, +/obj/machinery/microwave, /turf/open/floor/wood/smooth/old, /area/vtm/interior/hotel) "gZJ" = ( @@ -12354,7 +12337,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "hbW" = ( /turf/open/floor/carpet/black, /area/vtm/interior/laundromat) @@ -12558,7 +12541,9 @@ /turf/open/floor/plating/sidewalk/old, /area/vtm/voivodate) "hiB" = ( -/mob/living/carbon/human/npc/endronsecurity, +/mob/living/carbon/human/npc/endronsecurity{ + dir = 4 + }, /turf/open/floor/city/plating, /area/vtm/interior/endron_facility) "hiW" = ( @@ -12671,7 +12656,7 @@ /obj/effect/turf_decal/darkpack/dirt, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "hoh" = ( /obj/structure/table/wood, /obj/item/stack/cable_coil/five, @@ -12939,7 +12924,7 @@ }, /obj/effect/turf_decal/bordur/corner, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "hxY" = ( /obj/structure/sign/city/chinese/alt/directional/west, /turf/open/floor/plating/sidewalkalt, @@ -13355,7 +13340,7 @@ /obj/machinery/light/directional/north, /obj/structure/city_map, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "hJF" = ( /obj/structure/table, /obj/item/vamp/keys/hack{ @@ -13755,6 +13740,8 @@ }, /obj/item/gas_can/full, /obj/item/melee/vamp/tire, +/obj/item/storage/medkit/darkpack/standard, +/obj/item/storage/medkit/darkpack/standard, /turf/open/floor/plating/concrete, /area/vtm/interior/clinic) "hUy" = ( @@ -13835,7 +13822,7 @@ dir = 4 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "hWt" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -13908,9 +13895,6 @@ /obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/plating/sidewalk/poor, /area/vtm/interior/ghetto) -"hYA" = ( -/turf/open/floor/plating/asphalt, -/area/vtm) "hYE" = ( /obj/machinery/light/directional/east, /turf/open/floor/plating/concrete, @@ -13929,7 +13913,7 @@ "hZs" = ( /obj/darkpack_car/rand, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "hZv" = ( /obj/underplate, /obj/structure/table/countertop/bubway, @@ -14079,7 +14063,7 @@ }, /obj/item/kirbyplants/darkpack/random{ pixel_x = 3; - pixel_y = 24 + pixel_y = 21 }, /turf/open/floor/plating/concrete, /area/vtm/interior/supply) @@ -14349,12 +14333,11 @@ /turf/open/floor/plating/sidewalk/poor, /area/vtm/outside/unionsquare) "ikL" = ( -/obj/structure/table, /obj/item/melee/vamp/tire{ pixel_x = 5; pixel_y = 1 }, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "ikM" = ( @@ -14492,7 +14475,6 @@ "ioR" = ( /obj/effect/decal/cleanable/trash, /obj/machinery/light/directional/west, -/obj/machinery/vending/cola, /turf/open/floor/wood/smooth/old, /area/vtm/interior/gang) "ioV" = ( @@ -14619,7 +14601,7 @@ "isg" = ( /obj/effect/turf_decal/darkpack/dirt/corner, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "isk" = ( /obj/structure/bookcase/random/lupine, /turf/open/floor/wood/smooth/old, @@ -14873,7 +14855,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "iAs" = ( /obj/structure/closet/crate/coffin{ pixel_y = 6 @@ -14981,10 +14963,6 @@ /obj/structure/pole, /turf/open/floor/carpet/darkpack/greengold, /area/vtm/interior/endron_facility/restricted) -"iDE" = ( -/obj/structure/platform/lowwall/market/window, -/turf/open/floor/plating/rough, -/area/vtm) "iDY" = ( /obj/structure/table, /obj/effect/turf_decal/siding, @@ -15001,14 +14979,17 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/shop/pawnshop) "iEU" = ( -/obj/item/pizzabox/meat{ - pixel_y = 7 - }, -/obj/item/pizzabox/mushroom{ - pixel_y = 10 - }, /obj/item/knife/plastic, /obj/structure/table, +/obj/item/pizzabox{ + pixel_x = 0; + pixel_y = 13 + }, +/obj/item/pizzabox{ + pixel_x = 0; + pixel_y = 16; + layer = 3.1 + }, /turf/open/floor/city/bacotell, /area/vtm/interior/police) "iFe" = ( @@ -15059,9 +15040,7 @@ /area/vtm/interior/police) "iHN" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/structure/platform/lowwall/rich, /turf/open/floor/plating/rough, /area/vtm/interior/apartment) @@ -15395,10 +15374,7 @@ /area/vtm/interior/clinic) "iTG" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/structure/platform/lowwall/brick, /turf/open/floor/plating/rough, /area/vtm/interior/ghetto) @@ -15703,7 +15679,7 @@ }, /obj/effect/turf_decal/darkpack/rough, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "jbS" = ( /turf/open/floor/wood/smooth/old, /area/vtm/interior/hotel) @@ -15717,6 +15693,12 @@ /obj/effect/landmark/start/darkpack/pentex/sec, /turf/open/floor/wood/smooth, /area/vtm/interior/endron_facility/restricted) +"jcr" = ( +/obj/effect/turf_decal/bordur{ + dir = 8 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "jcC" = ( /obj/effect/turf_decal/bordur, /turf/open/floor/plating/roofwalk, @@ -15762,7 +15744,7 @@ icon_state = "police4" }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "jeA" = ( /obj/structure/mop_bucket, /obj/item/mop, @@ -15895,10 +15877,6 @@ }, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) -"jin" = ( -/obj/structure/lamppost/sidewalk, -/turf/open/floor/plating/sidewalkalt, -/area/vtm) "jiN" = ( /obj/structure/sign/city/hotel/directional/west, /turf/open/floor/plating/sidewalk/old, @@ -15978,7 +15956,8 @@ /area/vtm/interior/sewer) "jkG" = ( /mob/living/carbon/human/npc/shop{ - resistant_to_disciplines = 1 + resistant_to_disciplines = 1; + dir = 1 }, /turf/open/floor/city/circled/large, /area/vtm/interior/shop/newspaper) @@ -16219,7 +16198,7 @@ dir = 4 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "jrM" = ( /obj/effect/turf_decal/bordur{ dir = 4 @@ -16272,6 +16251,12 @@ }, /turf/open/floor/wood/old, /area/vtm/interior/chantry) +"jtK" = ( +/obj/effect/turf_decal/bordur{ + dir = 9 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "jtP" = ( /obj/effect/landmark/navigate_destination, /turf/open/floor/plating/sidewalk/old, @@ -16360,7 +16345,7 @@ }, /obj/effect/landmark/npcwall, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "jwU" = ( /obj/effect/decal/wallpaper/gold/alt, /turf/closed/wall/vampwall/old, @@ -16803,7 +16788,7 @@ pixel_y = 8 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "jKP" = ( /obj/structure/platform/lowwall/brick/window, /turf/open/floor/plating/rough, @@ -16833,7 +16818,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "jLY" = ( /obj/structure/table/wood, /obj/structure/retail/costume_store{ @@ -16962,7 +16947,7 @@ }, /obj/structure/bricks, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "jPc" = ( /obj/structure/hedge{ pixel_y = 6 @@ -17127,7 +17112,7 @@ "jTH" = ( /mob/living/carbon/human/npc/hobo, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "jTN" = ( /obj/structure/railing{ dir = 1 @@ -17260,7 +17245,7 @@ icon_state = "rock5" }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "jWX" = ( /turf/open/floor/city/toilet/large, /area/vtm/interior/millennium_tower/f4) @@ -17347,7 +17332,7 @@ /obj/effect/decal/cleanable/trash, /obj/effect/decal/cleanable/trash, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "jZQ" = ( /obj/effect/turf_decal/bordur{ dir = 6 @@ -17648,7 +17633,7 @@ dir = 4 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "kin" = ( /obj/structure/curtain, /obj/machinery/shower/directional/south, @@ -17692,7 +17677,7 @@ "kiU" = ( /obj/structure/sign/city/police_department/directional/north, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "kjb" = ( /obj/effect/turf_decal/bordur{ dir = 8 @@ -17863,12 +17848,6 @@ /obj/structure/vampdoor/old, /turf/open/floor/plating/canal, /area/vtm/interior/mallunderground) -"koa" = ( -/obj/effect/turf_decal/bordur/corner/inverse{ - dir = 4 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "kop" = ( /obj/effect/turf_decal/bordur/corner{ dir = 4 @@ -17919,7 +17898,7 @@ "kpl" = ( /obj/effect/decal/cleanable/cardboard, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "kpn" = ( /obj/structure/vampfence/corner/rich{ dir = 1; @@ -17929,7 +17908,7 @@ dir = 10 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "kpv" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -18141,7 +18120,7 @@ "kwV" = ( /obj/structure/closet/crate/dumpster, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "kxx" = ( /obj/structure/lamppost/one{ dir = 1 @@ -18373,7 +18352,7 @@ "kDs" = ( /obj/structure/ladder/manhole/down, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "kDH" = ( /obj/structure/table, /obj/vampire_computer{ @@ -18411,6 +18390,12 @@ }, /turf/open/floor/carpet/darkpack/old, /area/vtm/interior/shop/ishu) +"kEZ" = ( +/obj/effect/turf_decal/bordur{ + dir = 6 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "kFs" = ( /obj/machinery/button/door{ id = "endron_cell_2_doors"; @@ -18532,7 +18517,7 @@ }, /obj/effect/turf_decal/bordur, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "kKw" = ( /obj/structure/dresser, /obj/machinery/light/prince/directional/east, @@ -18592,7 +18577,7 @@ dir = 8 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "kMY" = ( /obj/effect/turf_decal/siding/white{ dir = 6 @@ -18628,7 +18613,7 @@ pixel_x = 10 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "kNL" = ( /obj/structure/vampfence/corner/rich{ dir = 4; @@ -18778,12 +18763,6 @@ }, /turf/open/floor/plating/sidewalk/old, /area/vtm/voivodate) -"kSu" = ( -/obj/effect/turf_decal/asphaltline/alt{ - dir = 8 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "kSv" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -18893,10 +18872,6 @@ }, /turf/open/indestructible/necropolis/air, /area/vtm/interior/wyrm_corrupted) -"kVM" = ( -/obj/effect/turf_decal/crosswalk, -/turf/open/floor/plating/asphalt, -/area/vtm) "kWc" = ( /obj/machinery/light/prince/directional/west, /obj/structure/sink/directional/south, @@ -19045,7 +19020,7 @@ }, /obj/effect/spawner/random/occult/artifact, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "lbu" = ( /obj/structure/fire_barrel, /turf/open/floor/plating/canal, @@ -19286,21 +19261,12 @@ /turf/open/openspace, /area/vtm/interior/clinic) "liN" = ( -/obj/item/gun/ballistic/automatic/darkpack/aug{ - desc = "A specialty Steyr AUG, a holdover from your days in the SWAT unit. For when the freaks come out to riot, you'll be ready."; - name = "SFPD Captain's AUG" - }, /obj/structure/closet/cabinet, /obj/item/ammo_box/darkpack/c556, /obj/item/gun/ballistic/revolver/darkpack/magnum, /obj/item/ammo_box/darkpack/c44, /obj/item/storage/box/teargas, /obj/item/melee/baton/telescopic, -/obj/item/storage/fancy/hardcase, -/obj/item/ammo_box/magazine/darkpackaug, -/obj/item/ammo_box/magazine/darkpackaug, -/obj/item/ammo_box/magazine/darkpackaug, -/obj/item/ammo_box/magazine/darkpackaug, /obj/item/megaphone, /turf/open/floor/wood/ornate, /area/vtm/interior/police) @@ -19318,10 +19284,7 @@ /area/vtm/interior/laundromat) "ljm" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 10 - }, +/obj/machinery/microwave, /turf/open/floor/city/toilet/large, /area/vtm/interior/shop/bubway) "ljD" = ( @@ -19395,7 +19358,7 @@ dir = 10 }, /turf/open/misc/beach/vamp, -/area/vtm) +/area/vtm/outside/financialdistrict) "lnp" = ( /obj/structure/hedge{ pixel_y = 6 @@ -19714,6 +19677,12 @@ }, /turf/open/floor/plating/sidewalk/poor, /area/vtm/interior/radio) +"lvB" = ( +/obj/effect/turf_decal/bordur/corner{ + dir = 8 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "lvL" = ( /obj/structure/table, /obj/vampire_computer{ @@ -19765,9 +19734,7 @@ /area/vtm/interior/vet) "lxQ" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 8 - }, +/obj/machinery/microwave, /obj/item/reagent_containers/cup/glass/mug/tea{ pixel_x = 7; pixel_y = 18 @@ -19802,7 +19769,13 @@ icon_state = "police2" }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) +"lyB" = ( +/obj/effect/turf_decal/bordur{ + dir = 6 + }, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "lyK" = ( /obj/structure/vampipe{ icon_state = "piping35" @@ -19968,7 +19941,7 @@ /obj/effect/decal/cleanable/cardboard, /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "lEY" = ( /obj/machinery/light/directional/east, /obj/structure/closet/crate/bin{ @@ -20139,7 +20112,7 @@ "lKx" = ( /obj/effect/turf_decal/darkpack/rough/corner, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "lKT" = ( /obj/structure/table/wood, /obj/item/newspaper, @@ -20184,7 +20157,7 @@ icon_state = "police3" }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "lMR" = ( /obj/effect/turf_decal/siding{ dir = 1 @@ -20246,7 +20219,7 @@ pixel_x = -10; pixel_y = 8 }, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "lNZ" = ( @@ -20269,7 +20242,7 @@ "lPm" = ( /obj/darkpack_car/track/volkswagen, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "lPv" = ( /obj/effect/turf_decal/darkpack/cave/corner{ dir = 4 @@ -20387,7 +20360,7 @@ "lRL" = ( /obj/machinery/hydroponics/soil, /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "lRW" = ( /obj/structure/roofstuff/vent/autotiling, /turf/open/floor/plating/sidewalk/poor, @@ -20839,7 +20812,7 @@ icon_state = "rock5" }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "mgt" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/siding/thinplating/dark, @@ -21018,12 +20991,10 @@ dir = 1 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "mmn" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/structure/platform/lowwall/old, /turf/open/floor/plating/rough, /area/vtm/interior/voivodate) @@ -21121,7 +21092,7 @@ "mpy" = ( /obj/effect/turf_decal/bordur, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "mqe" = ( /obj/structure/railing{ dir = 4 @@ -21138,7 +21109,7 @@ "mqi" = ( /obj/darkpack_car/police, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "mqm" = ( /turf/open/floor/wood/smooth/old, /area/vtm/interior/mallarcade) @@ -21346,7 +21317,7 @@ /obj/effect/turf_decal/bordur, /obj/structure/fuelstation, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "mvJ" = ( /obj/effect/turf_decal/bordur{ dir = 8 @@ -21393,7 +21364,7 @@ "mxw" = ( /obj/structure/bricks, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "mxH" = ( /obj/structure/chair/office/darkpack/green{ dir = 1 @@ -21408,7 +21379,6 @@ /area/vtm/interior/millennium_tower) "mym" = ( /obj/structure/bed/medical/emergency, -/obj/item/storage/medkit/darkpack/standard, /turf/open/floor/plating/concrete, /area/vtm/interior/clinic) "myr" = ( @@ -21648,6 +21618,10 @@ icon_state = "stone8" }, /area/vtm/interior/voivodate/sanctum) +"mEQ" = ( +/obj/effect/landmark/npcwall, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "mEV" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -21785,6 +21759,15 @@ /obj/item/storage/fancy/hardcase/mag_556, /obj/item/storage/fancy/hardcase/mag_556, /obj/item/storage/fancy/hardcase/mag_556, +/obj/item/storage/fancy/hardcase, +/obj/item/gun/ballistic/automatic/darkpack/aug{ + desc = "A specialty Steyr AUG, a holdover from your days in the SWAT unit. For when the freaks come out to riot, you'll be ready."; + name = "SFPD Captain's AUG" + }, +/obj/item/ammo_box/magazine/darkpackaug, +/obj/item/ammo_box/magazine/darkpackaug, +/obj/item/ammo_box/magazine/darkpackaug, +/obj/item/ammo_box/magazine/darkpackaug, /turf/open/floor/city/toilet/large, /area/vtm/interior/police) "mII" = ( @@ -22135,7 +22118,7 @@ dir = 1 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "mQU" = ( /obj/structure/chair/comfy/darkpack{ color = "#FFECD5"; @@ -22159,7 +22142,9 @@ "mSi" = ( /obj/structure/table/reinforced, /obj/structure/sink/directional/east{ - icon_state = "basin" + icon_state = "basin"; + pixel_x = -5; + pixel_y = 0 }, /turf/open/floor/plating/canal, /area/vtm/interior/sewer) @@ -22345,12 +22330,6 @@ /obj/item/ammo_box/magazine/m44, /turf/open/floor/plating/rough, /area/vtm/interior/sewer) -"mWS" = ( -/obj/effect/turf_decal/bordur/corner/inverse{ - dir = 1 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "mXa" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -22496,6 +22475,10 @@ /obj/effect/decal/pallet, /turf/open/misc/dirt, /area/vtm/outside/pacificheights) +"nbz" = ( +/obj/effect/turf_decal/bordur, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "nbE" = ( /turf/open/openspace, /area/vtm/interior/hotel) @@ -22766,7 +22749,7 @@ dir = 4 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "nls" = ( /turf/open/floor/carpet/darkpack, /area/vtm/interior/millennium_tower/f4) @@ -22977,13 +22960,6 @@ /obj/item/storage/medkit/darkpack/standard, /turf/open/floor/city/toilet/large, /area/vtm/interior/police) -"nqt" = ( -/obj/structure/table/countertop/bubway, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow." - }, -/turf/open/floor/wood/smooth/old, -/area/vtm/interior/hotel) "nqv" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -23102,19 +23078,25 @@ /area/vtm/interior/ghetto) "nvn" = ( /obj/structure/rack/tall/wood_shelf{ - pixel_y = 24 + pixel_y = 12; + pixel_x = 0; + density = 0 }, /obj/item/toy/plush/moth{ - pixel_y = 50; + pixel_y = 36; anchored = 1; - name = "Cloth Eatron" + name = "Cloth Eatron"; + pixel_x = 0 }, /obj/item/toy/mecha/firefighter{ - pixel_y = 27 + pixel_y = 17; + pixel_x = 0; + anchored = 1 }, /obj/item/clothing/head/costume/kitty{ - pixel_y = 34; - anchored = 1 + pixel_y = 23; + anchored = 1; + pixel_x = 0 }, /turf/open/floor/wood/smooth/old, /area/vtm/interior/mallarcade) @@ -23237,7 +23219,7 @@ resistant_to_disciplines = 1 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "nyf" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -23278,7 +23260,7 @@ /obj/effect/decal/cleanable/cardboard, /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "nzu" = ( /obj/effect/turf_decal/bordur{ dir = 1 @@ -23291,12 +23273,6 @@ "nzB" = ( /turf/closed/wall/vampwall/market, /area/vtm/interior/sewer) -"nzJ" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 9 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "nzX" = ( /obj/machinery/light/red/directional/east, /turf/open/floor/city/toilet/large, @@ -23327,10 +23303,6 @@ icon_state = "stone4" }, /area/vtm/interior/voivodate/sanctum) -"nBI" = ( -/obj/effect/decal/cleanable/cardboard, -/turf/open/floor/plating/sidewalk, -/area/vtm) "nBY" = ( /obj/structure/rack, /turf/open/floor/plating/rough, @@ -23344,7 +23316,7 @@ dir = 1 }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "nCx" = ( /turf/open/floor/city/plating, /area/vtm/interior/endron_facility) @@ -23438,12 +23410,12 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "nGX" = ( /obj/structure/closet/cardboard, /obj/effect/decal/pallet, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "nHg" = ( /obj/effect/turf_decal/trimline/red/warning{ dir = 1 @@ -23645,7 +23617,7 @@ "nMG" = ( /obj/effect/landmark/npcability, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "nMJ" = ( /obj/structure/table/wood/fancy/red, /obj/structure/retail/library{ @@ -23796,9 +23768,6 @@ /turf/open/floor/city/plating_mono, /area/vtm/interior/endron_facility/restricted) "nRn" = ( -/obj/effect/turf_decal/bordur{ - dir = 8 - }, /obj/structure/platform/lowwall/market, /turf/open/floor/plating/rough, /area/vtm/interior/police) @@ -24330,7 +24299,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "ohW" = ( /obj/machinery/light/small/directional/east, /obj/item/instrument/eguitar/vamp{ @@ -24369,7 +24338,7 @@ pixel_y = 18 }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "oig" = ( /obj/structure/retail/black_market{ dir = 8 @@ -24469,7 +24438,7 @@ /area/vtm/outside/chinatown) "okl" = ( /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "okq" = ( /obj/structure/table/greyscale{ name = "metal table" @@ -24514,7 +24483,7 @@ dir = 10 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "okT" = ( /obj/machinery/griddle, /obj/structure/table, @@ -24682,7 +24651,7 @@ dir = 1 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "opE" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -24820,6 +24789,18 @@ }, /turf/open/floor/plating/asphalt, /area/vtm/outside/financialdistrict) +"otl" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1; + color = "#570090" + }, +/obj/machinery/vending/cola/pwr_game{ + pixel_x = 0; + pixel_y = 22; + density = 0 + }, +/turf/open/floor/city/plating_mono, +/area/vtm/interior/strip) "otm" = ( /obj/effect/spawner/random/occult/artifact, /obj/structure/rack, @@ -25442,6 +25423,9 @@ }, /turf/open/floor/city/plating, /area/vtm/interior/mallunderground) +"oJB" = ( +/turf/closed/wall/vampwall/market, +/area/vtm/outside/financialdistrict) "oJY" = ( /obj/item/storage/box/masks{ pixel_y = 10 @@ -25592,7 +25576,7 @@ "oPS" = ( /obj/effect/landmark/npcwall, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "oPT" = ( /obj/structure/chair/wood/darkpack{ dir = 8 @@ -25633,7 +25617,7 @@ /area/vtm/interior/chantry) "oQC" = ( /turf/open/misc/dirt, -/area/vtm) +/area/vtm/outside/financialdistrict) "oQG" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -25665,7 +25649,7 @@ "oRS" = ( /obj/structure/lamppost/four, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "oSa" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -25686,20 +25670,23 @@ /area/vtm/interior/mallarcade) "oSs" = ( /obj/structure/rack/tall/wood_shelf{ - pixel_y = 24 + pixel_y = 12; + pixel_x = 0; + density = 0 }, /obj/item/toy/katana{ - pixel_x = 2; - pixel_y = 35; + pixel_x = 1; + pixel_y = 16; anchored = 1 }, /obj/item/toy/plush/human{ - pixel_y = 52; + pixel_y = 40; anchored = 1; - name = "Runescape Matthews" + name = "Runescape Matthews"; + pixel_x = 0 }, /obj/item/toy/figure/ian{ - pixel_y = 27; + pixel_y = 16; pixel_x = 8; anchored = 1; name = "\improper Clifford action figure"; @@ -25874,6 +25861,14 @@ /obj/effect/mapping_helpers/door/lock, /turf/open/floor/city/plating_mono, /area/vtm/interior/endron_facility/restricted) +"oWp" = ( +/obj/machinery/vending/cola/shamblers{ + density = 0; + pixel_x = 0; + pixel_y = 22 + }, +/turf/open/floor/city/plating_mono, +/area/vtm/interior/endron_facility/restricted) "oWx" = ( /obj/structure/closet/crate/freezer/blood, /obj/item/reagent_containers/blood, @@ -25937,7 +25932,7 @@ "oYa" = ( /obj/item/cigbutt, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "oYC" = ( /obj/structure/platform/lowwall/market/window, /turf/open/floor/plating/rough, @@ -26113,7 +26108,7 @@ dir = 1 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "pdI" = ( /obj/structure/table/wood, /obj/vampire_computer, @@ -26236,7 +26231,7 @@ /obj/structure/closet/crate/dumpster, /obj/item/cigbutt, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "pjf" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/bed/maint{ @@ -26509,7 +26504,7 @@ pixel_y = 12 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "ppv" = ( /turf/open/floor/city/plating, /area/vtm/interior/strip) @@ -26856,7 +26851,7 @@ dir = 8 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "pzW" = ( /obj/structure/vampdoor/old, /obj/effect/mapping_helpers/door/access/church, @@ -26873,10 +26868,6 @@ /obj/item/vamp/keys/veterinarian, /turf/open/floor/wood/smooth, /area/vtm/interior/vet) -"pAW" = ( -/obj/effect/turf_decal/bordur, -/turf/open/floor/plating/sidewalkalt, -/area/vtm) "pBc" = ( /obj/effect/turf_decal/siding/red{ dir = 1 @@ -26924,10 +26915,7 @@ /area/vtm/interior/anarch/basement) "pCz" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/machinery/light/small/directional/north, /obj/structure/platform/lowwall/bar, /turf/open/floor/plating/rough, @@ -27271,7 +27259,7 @@ "pNo" = ( /obj/effect/decal/graffiti, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "pNF" = ( /obj/machinery/light/cold/directional/east, /turf/open/floor/city/toilet/large, @@ -27544,12 +27532,6 @@ }, /turf/open/floor/city/plating_stone, /area/vtm/interior/apartment) -"pWy" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 8 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "pWE" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -27925,7 +27907,7 @@ dir = 1 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "qhn" = ( /turf/open/floor/city/plating_mono, /area/vtm/voivodate) @@ -27975,7 +27957,7 @@ id = "umb_police" }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "qiZ" = ( /obj/effect/turf_decal/bordur{ dir = 6 @@ -28012,12 +27994,6 @@ /obj/structure/coclock, /turf/open/floor/city/plating_mono, /area/vtm/interior/endron_facility/restricted) -"qka" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 1 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "qke" = ( /obj/structure/closet/cabinet, /obj/item/clothing/head/costume/bearpelt{ @@ -28148,6 +28124,12 @@ /obj/effect/landmark/start/darkpack/chantry/regent, /turf/open/floor/carpet/lone, /area/vtm/interior/chantry) +"qmF" = ( +/obj/effect/turf_decal/bordur{ + dir = 5 + }, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "qmU" = ( /obj/item/flashlight/lantern{ light_on = 1; @@ -28899,10 +28881,7 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 15 - }, +/obj/machinery/microwave, /obj/structure/table, /obj/item/storage/box/donkpockets{ pixel_y = -4 @@ -28932,7 +28911,7 @@ "qKe" = ( /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "qKl" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north, @@ -29155,6 +29134,9 @@ /obj/item/reagent_containers/cup/glass/bottle/champagne, /turf/open/floor/wood/smooth, /area/vtm/interior/millennium_tower/f4) +"qOy" = ( +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "qOA" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -29958,7 +29940,7 @@ /obj/effect/decal/cleanable/trash, /obj/effect/decal/cleanable/cardboard, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "rjV" = ( /turf/open/floor/iron/stairs/black/right, /area/vtm/interior/voivodate/sanctum) @@ -30049,12 +30031,6 @@ /area/vtm/interior/sewer) "rmh" = ( /obj/structure/table, -/obj/item/storage/medkit/darkpack/standard{ - pixel_y = 11 - }, -/obj/item/stack/medical/wrap/gauze/twelve, -/obj/item/stack/medical/wrap/sticky_tape/surgical, -/obj/item/stack/medical/bone_gel, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, @@ -30264,15 +30240,6 @@ }, /turf/open/floor/city/toilet/large, /area/vtm/interior/police/fed) -"rsx" = ( -/obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/city/bacotell, -/area/vtm/interior/ghetto) "rsK" = ( /obj/structure/fluff/tv/order/three{ pixel_x = -15; @@ -30299,10 +30266,6 @@ }, /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) -"rtn" = ( -/obj/effect/landmark/npc_spawn_point, -/turf/open/floor/plating/asphalt, -/area/vtm) "rto" = ( /obj/structure/chair/sofa/corp/left, /obj/effect/turf_decal/siding/white{ @@ -30589,7 +30552,7 @@ dir = 8 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "rzW" = ( /obj/structure/lamppost/sidewalk, /turf/open/floor/plating/sidewalkalt, @@ -30600,10 +30563,6 @@ }, /turf/open/misc/dirt, /area/vtm/interior) -"rAs" = ( -/obj/structure/platform/lowwall/brick, -/turf/open/floor/plating/rough, -/area/vtm/interior/supply) "rAM" = ( /obj/effect/turf_decal/siding/white{ dir = 5 @@ -31392,9 +31351,6 @@ }, /turf/open/floor/plating/granite, /area/vtm/interior/endron_facility/restricted) -"rYQ" = ( -/turf/open/floor/plating/sidewalkalt, -/area/vtm) "rZd" = ( /obj/effect/turf_decal/bordur, /obj/effect/turf_decal/stripes/line{ @@ -31726,10 +31682,10 @@ /turf/open/floor/plating/rough, /area/vtm/interior/mallbank) "smZ" = ( -/obj/machinery/vending/cola{ - pixel_x = -6; - pixel_y = 22; - density = 0 +/obj/machinery/vending/cola/shamblers{ + density = 0; + pixel_x = 0; + pixel_y = 22 }, /turf/open/floor/wood/smooth/old, /area/vtm/interior) @@ -31762,6 +31718,10 @@ /obj/machinery/light/prince/directional/west, /turf/open/floor/carpet/darkpack/blacksilver, /area/vtm/interior/millennium_tower/f2) +"snq" = ( +/obj/effect/turf_decal/bordur, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "snz" = ( /obj/structure/sign/poster/city_large/blade/old, /obj/effect/decal/wallpaper/grey, @@ -31838,6 +31798,12 @@ /obj/warehouse_generator, /turf/open/floor/plating/sidewalk/poor, /area/vtm/interior/supply) +"sqm" = ( +/obj/effect/turf_decal/bordur{ + dir = 8 + }, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "sqw" = ( /obj/effect/turf_decal/bordur/inverse{ dir = 4 @@ -31867,12 +31833,6 @@ }, /turf/open/floor/iron/grimy, /area/vtm/interior/millennium_tower/f4) -"sqX" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/closed/wall/vampwall/brick, -/area/vtm) "srx" = ( /obj/machinery/light/directional/east, /obj/effect/decal/rugs, @@ -31913,7 +31873,7 @@ /obj/structure/lamppost/sidewalk, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "ssE" = ( /obj/structure/flora/bush/lavendergrass/style_random{ pixel_y = 12; @@ -32111,7 +32071,6 @@ /turf/open/floor/plating/canal, /area/vtm/interior/sewer) "swO" = ( -/obj/structure/table, /obj/vampire_computer{ owner = "Supply Technician" }, @@ -32131,7 +32090,7 @@ pixel_y = 25; pixel_x = -4 }, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "sxc" = ( @@ -32458,9 +32417,7 @@ /area/vtm/interior/bianchiBank) "sFV" = ( /obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_y = 10 - }, +/obj/machinery/microwave, /turf/open/floor/city/plating_stone, /area/vtm/interior/apartment) "sGd" = ( @@ -32861,8 +32818,11 @@ /area/vtm/voivodate) "sRt" = ( /obj/effect/landmark/npcwall, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "sRy" = ( /turf/closed/wall/vampwall/brick, /area/vtm/interior/coffee) @@ -33091,9 +33051,7 @@ /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) "sYd" = ( -/obj/machinery/microwave{ - pixel_y = 10 - }, +/obj/machinery/microwave, /obj/structure/table, /turf/open/floor/city/plating_stone, /area/vtm/interior/voivodate) @@ -33586,7 +33544,7 @@ dir = 4 }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "tpK" = ( /obj/effect/decal/pallet{ pixel_x = 3; @@ -34104,7 +34062,7 @@ "tCc" = ( /mob/living/carbon/human/npc/walkby, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "tCd" = ( /turf/open/floor/city/plating_stone, /area/vtm/interior) @@ -34173,10 +34131,6 @@ }, /turf/open/floor/plating/rough, /area/vtm/interior/gangbasement) -"tEv" = ( -/obj/effect/turf_decal/bordur/inverse, -/turf/open/floor/plating/asphalt, -/area/vtm) "tEy" = ( /obj/structure/rack, /obj/item/clothing/mask/gas/vampire, @@ -34492,7 +34446,7 @@ /obj/effect/decal/pallet, /obj/structure/fire_barrel, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "tMF" = ( /obj/effect/turf_decal/siding/white{ color = "#434343" @@ -34574,10 +34528,6 @@ }, /obj/machinery/light/directional/west, /obj/structure/platform/lowwall/painted, -/obj/item/clothing/suit/apron/surgical{ - pixel_y = 6; - pixel_x = 9 - }, /turf/open/floor/plating/rough, /area/vtm/interior/clinic) "tOI" = ( @@ -34611,7 +34561,7 @@ }, /obj/effect/turf_decal/bordur, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "tPJ" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/white{ @@ -34898,6 +34848,14 @@ /obj/item/toy/snappop, /turf/open/floor/plating/rough, /area/vtm/interior/sewer) +"tWe" = ( +/obj/machinery/vending/cola/shamblers{ + pixel_x = 0; + pixel_y = 22; + density = 0 + }, +/turf/open/floor/city/plating, +/area/vtm/interior/mallunderground) "tWy" = ( /obj/structure/stairs/north, /obj/structure/railing{ @@ -35021,7 +34979,7 @@ /obj/effect/decal/cleanable/trash, /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "uaw" = ( /obj/effect/turf_decal/trimline/red/warning{ dir = 8 @@ -35040,7 +34998,7 @@ "uaV" = ( /obj/effect/turf_decal/bordur/corner, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "uaZ" = ( /obj/effect/turf_decal/siding/brown{ dir = 8; @@ -35210,7 +35168,7 @@ /obj/machinery/chem_dispenser/drinks{ dir = 1; pixel_x = -1; - pixel_y = 10 + pixel_y = 0 }, /obj/structure/table/countertop/purple, /turf/open/floor/city/plating, @@ -35275,9 +35233,10 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/bianchiBank) "ujt" = ( -/obj/machinery/vending/cola{ - density = 0; - pixel_y = 22 +/obj/machinery/vending/cola/pwr_game{ + pixel_x = 0; + pixel_y = 22; + density = 0 }, /turf/open/floor/eighties, /area/vtm/interior/mallarcade) @@ -35351,7 +35310,7 @@ pixel_y = 30 }, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "ulA" = ( /obj/effect/decal/kopatich{ pixel_x = -17; @@ -35384,9 +35343,7 @@ /area/vtm/outside/pacificheights) "una" = ( /obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 9 - }, +/obj/machinery/microwave, /turf/open/floor/plating/concrete, /area/vtm/interior/radio) "unj" = ( @@ -35498,7 +35455,7 @@ /obj/effect/turf_decal/bordur, /obj/effect/landmark/npcwall, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "urW" = ( /obj/structure/railing{ dir = 8 @@ -35812,7 +35769,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "uzE" = ( /obj/structure/toilet{ dir = 8 @@ -35969,9 +35926,7 @@ /area/vtm/interior/voivodate) "uCZ" = ( /obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -1; - pixel_y = 6 + desc = "Cooks and boils stuff, somehow." }, /obj/machinery/light/directional/west, /obj/structure/table, @@ -36240,11 +36195,6 @@ /obj/effect/turf_decal/asphaltline, /turf/open/floor/plating/asphalt, /area/vtm/interior) -"uKR" = ( -/obj/effect/decal/wallpaper/paper/darkred, -/obj/effect/decal/wallpaper/paper/stripe, -/turf/closed/wall/vampwall/rich, -/area/vtm/interior/apartment) "uKV" = ( /obj/effect/decal/wallpaper/paper/green, /turf/closed/wall/vampwall/junk, @@ -36765,7 +36715,7 @@ }, /obj/effect/decal/cleanable/trash, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "vbw" = ( /obj/structure/curtain/bounty/start_closed, /turf/open/floor/city/toilet/large, @@ -36972,6 +36922,13 @@ }, /turf/open/floor/plating/sidewalk/poor, /area/vtm/outside/pacificheights) +"viC" = ( +/obj/effect/turf_decal/bordur{ + dir = 1 + }, +/obj/effect/turf_decal/bordur, +/turf/open/floor/plating/sidewalk/poor, +/area/vtm/outside/financialdistrict) "viI" = ( /obj/structure/table, /obj/item/papercutter, @@ -37079,7 +37036,7 @@ "vmo" = ( /obj/effect/turf_decal/asphaltline/alt, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "vna" = ( /obj/effect/decal/cleanable/litter, /obj/structure/table/countertop/bubway, @@ -37125,11 +37082,6 @@ /area/vtm/interior/ghetto) "vnA" = ( /obj/machinery/light/directional/south, -/obj/structure/table/wood, -/obj/item/knife/kitchen{ - pixel_x = 10; - pixel_y = 7 - }, /turf/open/floor/city/bacotell, /area/vtm/interior/shop/bubway) "vnZ" = ( @@ -37340,7 +37292,7 @@ /obj/effect/landmark/npc_spawn_point, /obj/effect/turf_decal/bordur/inverse, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "vtI" = ( /obj/structure/vampdoor/reinf, /obj/effect/mapping_helpers/door/access/cleaning, @@ -37475,7 +37427,7 @@ dir = 9 }, /turf/open/floor/plating/asphalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "vwd" = ( /obj/effect/decal/wallpaper/paper/darkred, /turf/closed/wall/vampwall/old, @@ -37511,7 +37463,7 @@ /obj/effect/decal/cleanable/cardboard, /obj/structure/closet/cardboard, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "vxl" = ( /obj/effect/decal/carpet{ pixel_x = 16; @@ -37949,7 +37901,7 @@ }, /obj/structure/lamppost/one, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "vOC" = ( /obj/structure/vampdoor/simple{ dir = 4 @@ -38061,9 +38013,8 @@ /turf/open/floor/plating/sidewalk/old, /area/vtm/outside/chinatown) "vRO" = ( -/obj/structure/table, /obj/machinery/light/directional/north, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "vRV" = ( @@ -38372,7 +38323,7 @@ }, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "wbR" = ( /obj/structure/vampipe{ icon_state = "piping35" @@ -38418,7 +38369,7 @@ /obj/effect/decal/pallet, /obj/structure/closet/crate/wooden/communitygardens/seeds, /turf/open/floor/plating/sidewalkalt, -/area/vtm) +/area/vtm/outside/financialdistrict) "wcx" = ( /obj/structure/chair/sofa/corner/brown{ dir = 4 @@ -38502,7 +38453,7 @@ }, /obj/effect/decal/cleanable/cardboard, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "weU" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -38561,7 +38512,8 @@ }, /obj/structure/table/countertop/red, /obj/machinery/chem_dispenser/drinks{ - pixel_y = 11 + pixel_y = 0; + pixel_x = 0 }, /turf/open/floor/city/bacotell, /area/vtm/interior/pizza) @@ -38925,7 +38877,8 @@ /area/vtm/interior/chantry) "wsQ" = ( /mob/living/carbon/human/npc/shop{ - resistant_to_disciplines = 1 + resistant_to_disciplines = 1; + dir = 8 }, /turf/open/floor/carpet/darkpack/old, /area/vtm/interior/shop/ishu) @@ -38933,12 +38886,11 @@ /turf/open/floor/iron/stairs, /area/vtm/interior/voivodate) "wsY" = ( -/obj/structure/table, /obj/item/paper_bin{ pixel_y = 6 }, /obj/item/pen, -/obj/structure/platform/lowwall/brick, +/obj/structure/table/countertop/bubway, /turf/open/floor/plating/rough, /area/vtm/interior/supply) "wtr" = ( @@ -39110,7 +39062,6 @@ /obj/effect/decal/wallpaper/stone/low, /obj/machinery/microwave{ icon_state = "mwb"; - pixel_y = 10; broken = 1 }, /obj/structure/platform/lowwall/rich, @@ -39227,12 +39178,6 @@ }, /turf/open/floor/wood/smooth/old, /area/vtm/interior/coffee) -"wBS" = ( -/obj/effect/turf_decal/bordur/inverse{ - dir = 5 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "wCa" = ( /obj/structure/vampdoor/wood, /obj/effect/mapping_helpers/door/access/npc, @@ -39681,6 +39626,10 @@ "wPX" = ( /turf/open/floor/wood/old, /area/vtm/interior/apartment) +"wPY" = ( +/obj/effect/turf_decal/bordur/corner, +/turf/open/floor/plating/sidewalk, +/area/vtm/outside/financialdistrict) "wQb" = ( /turf/closed/wall/vampwall/metal/reinforced{ density = 0; @@ -39699,7 +39648,7 @@ /obj/effect/turf_decal/darkpack/dirt, /obj/effect/spawner/random/flora/grass, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "wQA" = ( /obj/effect/decal/coastline/corner{ dir = 1 @@ -39865,6 +39814,16 @@ }, /turf/open/floor/plating/sidewalk/poor, /area/vtm/outside/pacificheights) +"wVV" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/red/warning{ + dir = 8 + }, +/turf/open/floor/wood/smooth/old, +/area/vtm/interior/gang) "wVY" = ( /obj/effect/decal/wallpaper/paper/darkred/low, /obj/structure/curtain/cloth/fancy/mechanical/luxurious{ @@ -39915,11 +39874,6 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/wood/smooth/old, /area/vtm/interior) -"wXT" = ( -/obj/effect/decal/cleanable/trash, -/obj/effect/decal/cleanable/cardboard, -/turf/open/floor/plating/sidewalk, -/area/vtm) "wYh" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -39944,7 +39898,7 @@ }, /obj/structure/lamppost/sidewalk, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "wYB" = ( /obj/structure/table/wood/fancy/royalblack, /obj/machinery/button/curtain{ @@ -39967,7 +39921,7 @@ icon_state = "rock5" }, /turf/open/misc/grass/nosmooth, -/area/vtm) +/area/vtm/outside/financialdistrict) "wZb" = ( /obj/effect/turf_decal/siding/wood{ color = "#4a3925" @@ -39983,12 +39937,6 @@ /obj/structure/platform/lowwall/old, /turf/open/floor/plating/rough, /area/vtm/interior/radio) -"wZy" = ( -/obj/effect/turf_decal/bordur{ - dir = 8 - }, -/turf/open/floor/plating/sidewalkalt, -/area/vtm) "wZH" = ( /obj/fusebox, /turf/open/floor/plating/concrete, @@ -40247,10 +40195,7 @@ /area/vtm/outside/financialdistrict) "xhv" = ( /obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 10 - }, +/obj/machinery/microwave, /turf/open/floor/city/bacotell, /area/vtm/interior/ghetto) "xhx" = ( @@ -40360,10 +40305,6 @@ "xjm" = ( /turf/open/floor/plating/concrete, /area/vtm/interior/vjanitor) -"xjx" = ( -/obj/effect/landmark/npcwall, -/turf/open/floor/plating/asphalt, -/area/vtm) "xkJ" = ( /turf/open/openspace, /area/vtm/voivodate) @@ -40378,13 +40319,13 @@ dir = 4 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "xmf" = ( /obj/effect/turf_decal/bordur/corner/inverse{ dir = 1 }, /turf/open/floor/plating/rough, -/area/vtm) +/area/vtm/outside/financialdistrict) "xmC" = ( /obj/structure/lamppost/four, /turf/open/floor/plating/sidewalk, @@ -40392,11 +40333,11 @@ "xmH" = ( /obj/structure/lamppost/one, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "xmP" = ( /obj/effect/landmark/npcactivity, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "xnj" = ( /obj/structure/chair/comfy/darkpack/dark{ dir = 8 @@ -40642,19 +40583,14 @@ /obj/effect/decal/wallpaper, /turf/closed/wall/vampwall/market, /area/vtm/interior/shop/bacotell) -"xut" = ( -/obj/effect/turf_decal/crosswalk{ - dir = 4 - }, -/turf/open/floor/plating/asphalt, -/area/vtm) "xvj" = ( /obj/structure/vampfence/rich, /obj/effect/turf_decal/bordur/corner, /turf/open/misc/grass, /area/vtm/outside/financialdistrict) "xvN" = ( -/obj/machinery/vending/cola{ +/obj/machinery/vending/cola/pwr_game{ + pixel_x = 0; pixel_y = 22; density = 0 }, @@ -40905,7 +40841,7 @@ /obj/machinery/light/directional/north, /obj/effect/landmark/npcwall, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "xEu" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -40976,7 +40912,7 @@ /obj/machinery/chem_dispenser/drinks/beer{ dir = 1; pixel_x = 3; - pixel_y = 10 + pixel_y = 0 }, /obj/structure/table/countertop/purple, /turf/open/floor/city/plating, @@ -40987,7 +40923,7 @@ density = 0 }, /turf/open/floor/plating/sidewalk, -/area/vtm) +/area/vtm/outside/financialdistrict) "xHk" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 1 @@ -41072,9 +41008,10 @@ "xJt" = ( /obj/effect/decal/wallpaper/blue, /obj/item/toy/plush/horse{ - pixel_y = -5; + pixel_y = -18; anchored = 1; - name = "Petah" + name = "Petah"; + pixel_x = 1 }, /turf/closed/wall/vampwall/brick, /area/vtm/interior/shop/bubway) @@ -41410,13 +41347,14 @@ /turf/open/floor/wood/smooth, /area/vtm/interior/endron_facility/restricted) "xPX" = ( -/obj/machinery/vending/cola{ - pixel_y = 22; - density = 0 - }, /obj/effect/turf_decal/siding/white{ dir = 4 }, +/obj/machinery/vending/cola/shamblers{ + pixel_x = 0; + pixel_y = 22; + density = 0 + }, /turf/open/floor/city/bacotell, /area/vtm/interior/police) "xQi" = ( @@ -41478,7 +41416,7 @@ /obj/effect/decal/wallpaper/blue, /obj/item/reagent_containers/cup/glass/baggie/meth/cocaine{ pixel_x = -8; - pixel_y = 2; + pixel_y = -11; name = "sherbert packet" }, /turf/closed/wall/vampwall/brick, @@ -41919,7 +41857,7 @@ dir = 1 }, /turf/open/floor/plating/sidewalk/poor, -/area/vtm) +/area/vtm/outside/financialdistrict) "yiF" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/machinery/door/poddoor{ @@ -46142,7 +46080,7 @@ hUM hUM hUM urj -gtt +otl bYN nPd jfS @@ -46497,7 +46435,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -46604,7 +46542,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -46711,7 +46649,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -46818,7 +46756,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -46925,7 +46863,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -47032,7 +46970,7 @@ lFH qTM kzb hxj -jpJ +hUM hUM hUM hUM @@ -47139,7 +47077,7 @@ aaP lFH kzb hxj -jpJ +hUM hUM hUM hUM @@ -47161,7 +47099,7 @@ euo qcO "} (49,1,1) = {" -mpg +wrk mpg mpg mpg @@ -47246,7 +47184,7 @@ aaP lFH kzb hxj -jpJ +hUM hUM hUM hUM @@ -47268,12 +47206,12 @@ aSg qcO "} (50,1,1) = {" +wrk ame oPI eMX dJr vKJ -dyR mpg cKM bTS @@ -47353,7 +47291,7 @@ aaP lFH kzb uGT -jpJ +hUM hUM hUM hUM @@ -47375,11 +47313,11 @@ rzd qcO "} (51,1,1) = {" +wrk ame tMU psP psP -psP tMU aBC bgN @@ -47482,12 +47420,12 @@ wwe wwe "} (52,1,1) = {" +wrk ame hRz tMU tMU tMU -tMU mpg enV bgN @@ -47589,10 +47527,10 @@ rDC wwe "} (53,1,1) = {" +wrk ame qVx hLL -tMU cMy vnA mpg @@ -47696,12 +47634,12 @@ eLw wwe "} (54,1,1) = {" +wrk ame tsP rew -tMU -mpg mpg +wnq mpg mpg mpg @@ -47803,12 +47741,12 @@ wwe wwe "} (55,1,1) = {" +wrk oGv ooO wnq wnq wnq -wnq rbM dad kfS @@ -47910,14 +47848,14 @@ ybx wwe "} (56,1,1) = {" +wrk oGv wnq wnq wnq wnq wnq -wnq -sqX +dad iOU njq mll @@ -48017,12 +47955,12 @@ ybx wwe "} (57,1,1) = {" +wrk oGv poF qmy wnq wnq -wnq mpg dad iOU @@ -48124,12 +48062,12 @@ ybx wwe "} (58,1,1) = {" +wrk oGv nsc cdi wnq wnq -wnq vUF edr uiY @@ -48231,12 +48169,12 @@ ybx wwe "} (59,1,1) = {" +wrk oGv oPT wqq wnq wnq -wnq mfG cDO cDO @@ -48338,11 +48276,11 @@ ybx wwe "} (60,1,1) = {" +wrk oGv vLq wnq wnq -wnq cDo vUF oeb @@ -48387,7 +48325,7 @@ aIk hdl hdl hdl -rsx +xhv xyH pmL lea @@ -48445,11 +48383,11 @@ ybx wwe "} (61,1,1) = {" +wrk oGv lRK lUj wnq -wnq pGD vUF oeb @@ -48466,7 +48404,7 @@ bZM keg bZM bZM -smE +tWe tWb nbL dfQ @@ -48552,11 +48490,11 @@ kIX wwe "} (62,1,1) = {" +wrk oGv rny rny wnq -wnq hbl vUF mzi @@ -48659,7 +48597,7 @@ wwe wwe "} (63,1,1) = {" -mpg +wrk mpg mpg mpg @@ -48768,10 +48706,10 @@ wwe (64,1,1) = {" wrk hUM +hUM mpg fGA bgN -bgN mpg aJU wgN @@ -48875,10 +48813,10 @@ wwe (65,1,1) = {" wrk hUM +hUM mpg lEu lfL -bgN mpg wgU wgU @@ -48982,7 +48920,7 @@ wwe (66,1,1) = {" wrk hUM -mpg +hUM mpg mpg mpg @@ -53385,7 +53323,7 @@ wrk wrk jBE vtD -rtn +dXP dXP tyg wdp @@ -53491,8 +53429,8 @@ jBE jBE jBE jBE -tEv -bDH +fLi +muU muU aSP wdp @@ -53590,16 +53528,16 @@ pth xLf lxo sWP -rgY -rgY -rgY -rgY -rgY -kSM -qmj -qmj -tEv -bDH +qOy +qOy +qOy +qOy +qOy +hxE +aVS +aVS +fLi +muU muU aSP wdp @@ -53698,15 +53636,15 @@ pth pth sWP oPS -mHR -mHR -mHR -mHR -vkQ +gPv +gPv +gPv +gPv +byb xmH -qmj -tEv -bDH +aVS +fLi +muU muU aSP wdp @@ -53810,10 +53748,10 @@ kMu okl kMu eJB -tBG -jrM -tEv -hYA +kEZ +fSt +fLi +vao vao aSP wdp @@ -53875,7 +53813,7 @@ dIU dIU dIU hpw -dIU +alB dIU dIU dIU @@ -53917,10 +53855,10 @@ kMu lPm kMu eJB -vqi +fuU okl fEZ -hYA +vao vao aSP wdp @@ -54027,7 +53965,7 @@ okl brl vwa lKx -hYA +vao vao aSP wdp @@ -54124,8 +54062,8 @@ pth pth pth rRR -dTQ -mHR +lyB +gPv bqu jbK okl @@ -54134,7 +54072,7 @@ okl okl fkx gHB -hYA +vao vao aSP wdp @@ -54231,7 +54169,7 @@ pth pth pth rRR -yeV +snq brl okl okl @@ -54241,7 +54179,7 @@ okl gHe okl fEZ -hYA +vao vao aSP wdp @@ -54307,7 +54245,7 @@ lUl xnJ alS jLk -nqt +gZI qBx lUl uoe @@ -54338,7 +54276,7 @@ pth pth pth rRR -yeV +snq okl okl okl @@ -54346,9 +54284,9 @@ hxS okl okl okl -fBn -tEv -hYA +lvB +fLi +vao vao aSP wdp @@ -54445,17 +54383,17 @@ eMF qFg vge svg -yeV +snq vmo okl okl -qkY +oJB faZ okl -fBn -mmD -tEv -hYA +lvB +jtK +fLi +vao vao aSP wdp @@ -54552,17 +54490,17 @@ bGn jCw lxo svg -yeV +snq eVW okl okl mvB okl okl -kSM -qmj -tEv -hYA +hxE +aVS +fLi +vao vao aSP wdp @@ -54663,13 +54601,13 @@ hJE mme okl okl -ayi +viC okl okl -kSM -qmj -tEv -hYA +hxE +aVS +fLi +vao vao aSP wdp @@ -54770,13 +54708,13 @@ urv vmo okl okl -qkY +oJB okl okl aJG xmP -fnM -kVM +hMr +qny qny stx evz @@ -54877,13 +54815,13 @@ urv hZs okl okl -ayi +viC okl okl -kSM +hxE nMG -tEv -hYA +fLi +vao vao aSP nrz @@ -54987,10 +54925,10 @@ okl mvB okl okl -kSM -qmj -tEv -hYA +hxE +aVS +fLi +vao vao aSP wdp @@ -55091,13 +55029,13 @@ yip vmo okl okl -qkY +oJB faZ okl -vkQ -fDU -tEv -hYA +byb +qmF +fLi +vao vao aSP wdp @@ -55202,9 +55140,9 @@ xlP okl okl okl -vkQ -tEv -hYA +byb +fLi +vao vao aSP wdp @@ -55295,7 +55233,7 @@ qkY "} (20,1,2) = {" oFp -aVJ +oFp wrk jBE coe @@ -55311,7 +55249,7 @@ gHe okl fkx gHB -hYA +vao vao aSP wdp @@ -55409,7 +55347,7 @@ dUu dJw oQC qhi -cmh +sqm bqu aDu jrH @@ -55418,7 +55356,7 @@ okl okl okl fEZ -hYA +vao vao aSP wdp @@ -55516,7 +55454,7 @@ ctA aUB vbu isg -rgY +qOy bqu jbK okl @@ -55525,7 +55463,7 @@ okl okl okl fEZ -hYA +vao vao aSP wdp @@ -55621,18 +55559,18 @@ wrk jBE jPb ppr -rgY -rgY -rgY +qOy +qOy +qOy xmf pzI pzI pzI gsy -tjB +wPY okl fEZ -hYA +vao vao aSP evz @@ -55729,17 +55667,17 @@ jBE kwV elV elV -rgY -rgY -rgY -rgY -rgY -rgY -kSM +qOy +qOy +qOy +qOy +qOy +qOy +hxE vOa -xSX -tEv -hYA +jcr +fLi +vao vao lWv mcR @@ -55834,19 +55772,19 @@ wrk wrk jBE kwV -rgY -rgY +qOy +qOy elV -rgY -rgY -rgY -rgY -rgY +qOy +qOy +qOy +qOy +qOy bPc -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao vao mVa @@ -55942,18 +55880,18 @@ jBE jBE fZO elV -rgY +qOy elV elV nGX nGX -rgY +qOy kNz -kSM -qmj -qmj -tEv -hYA +hxE +aVS +aVS +fLi +vao vao vao mVa @@ -56047,9 +55985,9 @@ oFp wrk jBE vwW -rgY -rgY -rgY +qOy +qOy +qOy sRy sRy sRy @@ -56057,10 +55995,10 @@ sRy sRy sRy sRy -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao vao mVa @@ -56154,7 +56092,7 @@ oFp wrk jBE kpl -rgY +qOy kpl mxw oHU @@ -56164,10 +56102,10 @@ igg igg vlM sRy -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao uPM toD @@ -56260,8 +56198,8 @@ bMb wrk wrk jBE -rgY -rgY +qOy +qOy mxw sRy oHU @@ -56271,10 +56209,10 @@ nMB jIU vlM sjB -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP evz @@ -56379,9 +56317,9 @@ oYL vlM sjB aMe -qmj -tEv -hYA +aVS +fLi +vao vao aSP nrz @@ -56485,10 +56423,10 @@ vlM vlM vlM sjB -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -56592,10 +56530,10 @@ sIU vlM vlM sRy -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -56699,10 +56637,10 @@ vlM vlM vJI oPH -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -56806,10 +56744,10 @@ uzn lGF vlM wnP -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -56914,9 +56852,9 @@ vlM vlM sjB xmH -qmj -tEv -hYA +aVS +fLi +vao vao aSP wdp @@ -57020,10 +56958,10 @@ tVC fpp lGF sjB -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -57127,10 +57065,10 @@ sRy sRy sRy sRy -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -57223,21 +57161,21 @@ qUw tKb wrk dad -wZy -wZy -wZy -wZy -wZy -wZy -wZy +tDy +tDy +tDy +tDy +tDy +tDy +tDy wcs cEN -qmj +aVS flC -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -57330,21 +57268,21 @@ qUw tKb wrk dad -rYQ +hmb wYz wYV wYV uaV -rYQ -rYQ -jin +hmb +hmb +kCZ fjo nxO pdu -qmj -qmj -tEv -hYA +aVS +aVS +fLi +vao vao aSP wdp @@ -57437,21 +57375,21 @@ sli tKb wrk dad -rYQ +hmb jWS cfr oie mpy -rYQ -rYQ +hmb +hmb eFX fjo -qmj -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -57544,21 +57482,21 @@ wrk tKb wrk dad -rYQ +hmb jWS cfr cfr mpy -rYQ -rYQ -rYQ +hmb +hmb +hmb kpn aGW -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -57651,21 +57589,21 @@ wrk tKb wrk dad -rYQ +hmb nCp mfY mfY tpv -rYQ -rYQ -rYQ -rYQ -pAW -qmj -qmj -qmj -tEv -hYA +hmb +hmb +hmb +hmb +rWB +aVS +aVS +aVS +fLi +vao vao lWv kaU @@ -57759,20 +57697,20 @@ tKb wrk dad ulu -rYQ -rYQ -rYQ -rYQ -rYQ -rYQ -rYQ -rYQ -pAW -qmj -qmj -qmj -tEv -hYA +hmb +hmb +hmb +hmb +hmb +hmb +hmb +hmb +rWB +aVS +aVS +aVS +fLi +vao vao uPM eNb @@ -57875,11 +57813,11 @@ wbI wbI hbH bPg -qmj +aVS xmH -qmj -tEv -hYA +aVS +fLi +vao vao aSP wdp @@ -57982,11 +57920,11 @@ lRL oQC gSz kKm -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -58090,10 +58028,10 @@ lRL gSz kKm aMe -qmj +aVS nMG -tEv -hYA +fLi +vao vao aSP wdp @@ -58196,11 +58134,11 @@ uzu uzu ssC kKm -qmj -qmj +aVS +aVS xmP -fnM -kVM +hMr +qny qny stx pol @@ -58300,14 +58238,14 @@ mHq mHq mOd mOd -qkY +mHq gcL jKK -qmj -qmj +aVS +aVS nMG -tEv -hYA +fLi +vao vao aSP nrz @@ -58360,7 +58298,7 @@ pgP oBT oBT oBT -qdl +wVV hFq hFq hFq @@ -58409,12 +58347,12 @@ clD clD aBp tCc -qmj -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -58514,14 +58452,14 @@ aoR mHq clD clD -qmj -qmj -qmj -qmj -qmj -qmj -tEv -hYA +clD +aVS +aVS +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -58621,14 +58559,14 @@ ygK mHq clD fnd -qkY +mHq xGZ -qmj -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -58726,16 +58664,16 @@ aoR aoR aoR enT -clD -clD -aBp -qmj -qmj -qmj -qmj -qmj -tEv -hYA +aVS +aVS +cuo +aVS +aVS +aVS +aVS +aVS +fLi +vao vao aSP rPX @@ -58833,16 +58771,16 @@ aoR aoR aoR mHq -clD -clD -qmj -qmj -qmj -qmj +aVS +aVS +aVS +aVS +aVS +aVS xmH -qmj -tEv -hYA +aVS +fLi +vao vao aSP wdp @@ -58939,17 +58877,17 @@ aoR aoR aoR aoR -qkY +mHq buR -sRt +mEQ sRt jwQ -qmj -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59046,17 +58984,17 @@ qmq aoR ofs ixg -qkY -rdj -rdj -rdj -rdj +mHq +rOC +rOC +rOC +rOC opv -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59153,17 +59091,17 @@ vpi aoR ofs ixg -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59260,17 +59198,17 @@ qEq aoR wUS tmx -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59321,7 +59259,7 @@ wzz nFG vFP kSa -eEa +eea hFq hFq hFq @@ -59367,17 +59305,17 @@ aoR aoR wUS voW -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj +aVS +aVS nMG -tEv -hYA +fLi +vao vao aSP nrz @@ -59474,17 +59412,17 @@ aoR aoR aoR aoR -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj +aVS +aVS xmP -fnM -kVM +hMr +qny qny stx evz @@ -59581,17 +59519,17 @@ qmq aoR wUS wMe -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj +aVS +aVS nMG -tEv -hYA +fLi +vao vao aSP nrz @@ -59688,17 +59626,17 @@ wMe aoR wUS clL -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj +aVS aMe -qmj -tEv -hYA +aVS +fLi +vao vao aSP wdp @@ -59770,7 +59708,7 @@ xdw qfK xdw aSa -igS +gdF xnW gdF gdF @@ -59795,17 +59733,17 @@ qEq uVQ aoR aoR -iDE -rdj -rdj -rdj -rdj +ctI +rOC +rOC +rOC +rOC opv -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59877,7 +59815,7 @@ xdw qfK xdw aSa -igS +gdF hzE gdF gdF @@ -59902,17 +59840,17 @@ mHq mHq iQB mHq -qkY -rdj -rdj -rdj -rdj +mHq +rOC +rOC +rOC +rOC opv -qmj -qmj -qmj -tEv -hYA +aVS +aVS +aVS +fLi +vao vao aSP wdp @@ -59984,7 +59922,7 @@ xdw pkn xdw aSa -igS +gdF gdF gdF gdF @@ -60004,22 +59942,22 @@ bVY (64,1,2) = {" wrk jBE -qmj -qmj -qmj -qmj -qmj -qmj +aVS +aVS +aVS +aVS +aVS +aVS rzS rzS rzS rzS -qmj -qmj +aVS +aVS oRS nMG -tEv -hYA +fLi +vao vao aSP wdp @@ -60091,7 +60029,7 @@ xdw qfK nRZ aSa -igS +gdF nbx gdF gdF @@ -60112,21 +60050,21 @@ bVY wrk jBE jBE -sRt -qmj -qmj -qmj -qmj -qmj -qmj +mEQ +aVS +aVS +aVS +aVS +aVS +aVS dlX nMG -qmj -qmj +aVS +aVS nMG xmP -tEv -hYA +fLi +vao vao aSP qqQ @@ -60198,7 +60136,7 @@ jsq jsq xdw nYB -igS +gdF gdF gdF gdF @@ -60220,20 +60158,20 @@ wrk jBE ooK eIM -bTi -bTi -bTi -bTi -bTi -bTi +kaU +kaU +kaU +kaU +kaU +kaU kil -bTi -bTi -bTi -bTi -bTi -nzJ -hYA +kaU +kaU +kaU +kaU +kaU +rCm +vao vao aSP wdp @@ -60305,7 +60243,7 @@ oay jsq xdw nYB -igS +gdF hzE gdF gdF @@ -60326,21 +60264,21 @@ bVY wrk jBE wQG -xjx -hYA -hYA -hYA -hYA -hYA -hYA -xut -hYA -hYA -hYA -hYA -hYA -hYA -hYA +osI +vao +vao +vao +vao +vao +vao +mVa +vao +vao +vao +vao +vao +vao +vao vao aSP wdp @@ -60412,7 +60350,7 @@ oay jsq xdw aSa -igS +iqf xnW gdF iqf @@ -60433,21 +60371,21 @@ bVY wrk jBE ewR -xjx -hYA -hYA -hYA -hYA -hYA -hYA -xut -hYA -hYA -hYA -hYA -hYA -hYA -hYA +osI +vao +vao +vao +vao +vao +vao +mVa +vao +vao +vao +vao +vao +vao +vao vao aSP wdp @@ -60541,20 +60479,20 @@ wrk jBE cTk fJL -pWy -pWy -pWy -pWy -pWy -pWy +eNb +eNb +eNb +eNb +eNb +eNb hWp -wBS -hYA -hYA -fmn -pWy -pWy -pWy +gpK +vao +vao +uPM +eNb +eNb +eNb eNb qBd wdp @@ -60646,22 +60584,22 @@ bVY (70,1,2) = {" wrk mUc -mUc -sRt -qmj -qmj -qmj -qmj -qmj +jBE +mEQ +aVS +aVS +aVS +aVS +aVS nMG -qmj -mWS -hYA -hYA -koa -qmj -qmj -qmj +aVS +emq +vao +vao +qBd +aVS +aVS +aVS aVS aVS lyP @@ -60753,23 +60691,23 @@ bVY (71,1,2) = {" wrk wrk -eNi +wcy dtM nRn nRn -eNi -qmj -qmj +wcy +aVS +aVS xmP nMG -qlp -hYA -hYA +nbz +vao +vao fet -jrM -jrM -qmj -qmj +fSt +fSt +aVS +aVS nMG vDG nrz @@ -60865,19 +60803,19 @@ oec wLa wLa stg -qmj -qmj -qmj +aVS +aVS +aVS aMe tPH -hYA -hYA -hYA -kSu -qka +vao +vao +vao +axU +aSP dDy -qmj -qmj +aVS +aVS aJQ tDy tDy @@ -60934,7 +60872,7 @@ dKS fYl swO adF -rAs +bMa bdL puI bdL @@ -60972,19 +60910,19 @@ wLa wLa ePO hoQ -qmj -qmj -qmj -qmj -qlp -hYA -hYA -hYA -kSu -qka -qmj -qmj -czf +aVS +aVS +aVS +aVS +nbz +vao +vao +vao +axU +aSP +aVS +aVS +pkp jfl hmb hmb @@ -61085,13 +61023,13 @@ wcy wcy wcy kiU -hYA -hYA -hYA -qka -qmj -qmj -qmj +vao +vao +vao +aSP +aVS +aVS +aVS jfl hmb hmb @@ -61192,13 +61130,13 @@ wLa kdf wcy lyA -hYA -hYA -hYA -qka -qmj -qmj -qmj +vao +vao +vao +aSP +aVS +aVS +aVS jfl hmb kCZ @@ -61299,13 +61237,13 @@ fwz dXd wcy lMK -kSu -hYA -kSu -qka -wXT -czf -qmj +axU +vao +axU +aSP +aza +pkp +aVS jfl hmb hmb @@ -61406,13 +61344,13 @@ tFx qBl wcy jdV -kSu -hYA -kSu -qka -czf +axU +vao +axU +aSP +pkp tCc -qmj +aVS jfl hmb hmb @@ -61512,14 +61450,14 @@ lVj cgy qbg wcy -hYA -hYA -hYA -hYA -qka -qmj +vao +vao +vao +vao +aSP +aVS oRS -qmj +aVS jfl hmb hmb @@ -61619,14 +61557,14 @@ lVj lVj auS wcy -hYA -hYA -hYA -hYA -qka -qmj -qmj -czf +vao +vao +vao +vao +aSP +aVS +aVS +pkp jfl hmb hmb @@ -61727,13 +61665,13 @@ lVj lVj wcy mqi -kSu +axU mqi -kSu -qka -qmj -qmj -nBI +axU +aSP +aVS +aVS +sAF jfl hmb hmb @@ -61833,14 +61771,14 @@ wcy nIw wcy wcy -hYA -kSu -hYA -kSu -qka -qmj -qmj -czf +vao +axU +vao +axU +aSP +aVS +aVS +pkp jfl hmb kCZ @@ -61940,14 +61878,14 @@ hDM qwB mNP wcy -xSX -xSX -xSX -xSX +jcr +jcr +jcr +jcr aKu bUK -qmj -qmj +aVS +aVS jfl hmb hmb @@ -62047,14 +61985,14 @@ uia iTb iTb cqu -qmj -qmj -qmj -qmj -qmj -qmj -qmj -qmj +aVS +aVS +aVS +aVS +aVS +aVS +aVS +aVS jfl hmb hmb @@ -62154,14 +62092,14 @@ nUJ qsW xNz wcy -qmj -czf -qmj -qmj -qmj -czf -qmj -qmj +aVS +pkp +aVS +aVS +aVS +pkp +aVS +aVS jfl hmb nPE @@ -62261,13 +62199,13 @@ fvH reN cxN wcy -qmj -qmj -qmj -qmj -qmj -qmj -qmj +aVS +aVS +aVS +aVS +aVS +aVS +aVS fQV fQV fQV @@ -62368,10 +62306,10 @@ wcy eVs wcy wcy -jrM +fSt nld -jrM -jrM +fSt +fSt rXZ bFf fQV @@ -62477,8 +62415,8 @@ kYC wcy oYa oYa -rgY -rgY +qOy +qOy fQV goT pAg @@ -62584,8 +62522,8 @@ kYC wcy piV epX -rgY -rgY +qOy +qOy iZL mlc mlc @@ -62691,8 +62629,8 @@ wcy wcy kwV bLQ -rgY -rgY +qOy +qOy iZL mlc mlc @@ -62797,8 +62735,8 @@ wLa wLa wcy tMn -rgY -rgY +qOy +qOy fQV fQV uvV @@ -62904,7 +62842,7 @@ wLa wLa hwO qKe -rgY +qOy elV fQV pmu @@ -63011,8 +62949,8 @@ wLa ieQ wcy cwl -rgY -rgY +qOy +qOy iZL snE mlc @@ -63118,7 +63056,7 @@ wLa sCz hwO kpl -rgY +qOy elV iZL oHm @@ -63225,7 +63163,7 @@ lik lik wcy kpl -rgY +qOy elV tNL rUn @@ -63332,7 +63270,7 @@ wcy wcy wcy pNo -rgY +qOy jZL tNL miv @@ -63428,7 +63366,7 @@ bVY (96,1,2) = {" wrk wDE -rgY +qOy qKe wcy aNJ @@ -63437,10 +63375,10 @@ qJJ agH kbu wcy -rgY +qOy rjU elV -rgY +qOy fQV nQy mlc @@ -63544,8 +63482,8 @@ oCV oCV xJD wcy -rgY -rgY +qOy +qOy rjU elV fQV @@ -63592,7 +63530,7 @@ mAQ pVB hLw ndM -daq +abs hdl omL msK @@ -63651,9 +63589,9 @@ oCV iHw xJD wcy -rgY -rgY -rgY +qOy +qOy +qOy uar wRd mLw @@ -63750,7 +63688,7 @@ bVY wrk wDE tMn -rgY +qOy wcy pSA pSA @@ -63758,10 +63696,10 @@ aHc npO xJD wcy -rgY +qOy elV kDs -rgY +qOy wRd vjY udU @@ -63857,7 +63795,7 @@ bVY wrk wDE elV -rgY +qOy wcy wcy wcy @@ -63964,15 +63902,15 @@ bVY wrk wDE elV -rgY +qOy jZL elV -rgY +qOy kpl elV -rgY -rgY -rgY +qOy +qOy +qOy weP fQe fQe @@ -64070,14 +64008,14 @@ bVY (102,1,2) = {" wrk wDE -rgY +qOy lET kpl kpl jTH bBZ -rgY -rgY +qOy +qOy nze cuV lbr @@ -65483,7 +65421,7 @@ rdj rdj rdj eeP -gEn +gUY eDm eDm dIN @@ -65543,7 +65481,7 @@ lUl xnJ alS jLk -nqt +gZI qBx lUl uoe @@ -65590,7 +65528,7 @@ rdj rdj rdj eeP -pep +oWp eDm eDm dIN @@ -84052,7 +83990,7 @@ woU qec woU sPI -uKR +xbT ojQ xAO mRu @@ -84266,7 +84204,7 @@ woU woU woU woU -uKR +xbT iWk cPB mRu @@ -84480,7 +84418,7 @@ woU woU woU woU -uKR +xbT vue bJC bJC From 3b17e743865d5a4ecef684e5309f37b1a03297b4 Mon Sep 17 00:00:00 2001 From: KaileyCtrg Date: Wed, 10 Jun 2026 23:28:04 +1000 Subject: [PATCH 2/4] stupid pizza box --- _maps/map_files/Vampire/special_fran/special_francisco.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index 2723830a51c9..75fc4f1f7695 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -14987,8 +14987,7 @@ }, /obj/item/pizzabox{ pixel_x = 0; - pixel_y = 16; - layer = 3.1 + pixel_y = 13 }, /turf/open/floor/city/bacotell, /area/vtm/interior/police) From a96952eaf7b055bf4f7ad8232b62ba47071e964a Mon Sep 17 00:00:00 2001 From: KaileyCtrg Date: Sat, 13 Jun 2026 21:07:23 +1000 Subject: [PATCH 3/4] park ocean is now park river --- _maps/map_files/Vampire/generic/forest.dmm | 98 +++++++++---------- .../modules/walls/code/floors/water.dm | 11 +++ 2 files changed, 60 insertions(+), 49 deletions(-) diff --git a/_maps/map_files/Vampire/generic/forest.dmm b/_maps/map_files/Vampire/generic/forest.dmm index 8f50d64d8e5e..a971fbc053a5 100644 --- a/_maps/map_files/Vampire/generic/forest.dmm +++ b/_maps/map_files/Vampire/generic/forest.dmm @@ -272,7 +272,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 9 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "cj" = ( /obj/effect/turf_decal/darkpack/sand/corner, @@ -941,7 +941,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 4 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "ix" = ( /obj/structure/fireplace, @@ -968,7 +968,7 @@ "iD" = ( /obj/effect/turf_decal/darkpack/cave/corner, /obj/effect/turf_decal/darkpack/cave, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "iG" = ( /obj/structure/glowshroom/single, @@ -1070,7 +1070,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 9 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "jH" = ( /obj/effect/decal/pallet, @@ -1092,7 +1092,7 @@ /obj/effect/turf_decal/darkpack/rough/corner{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "jS" = ( /obj/effect/gibspawner/human/bodypartless, @@ -1261,7 +1261,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "lD" = ( /obj/effect/turf_decal/siding{ @@ -1368,7 +1368,7 @@ dir = 8 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "mD" = ( /obj/effect/realistic_fog/dense, @@ -1376,7 +1376,7 @@ /area/vtm/outside/forest/sept) "mN" = ( /obj/effect/turf_decal/darkpack/rough, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "mO" = ( /obj/structure/vampdoor, @@ -1707,7 +1707,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 4 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "pC" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -1869,7 +1869,7 @@ dir = 1 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "qY" = ( /obj/effect/turf_decal/darkpack/sand/corner, @@ -1932,7 +1932,7 @@ dir = 4 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "rp" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -1991,7 +1991,7 @@ /obj/effect/turf_decal/darkpack/rough/corner{ dir = 4 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "rU" = ( /obj/effect/turf_decal/darkpack/grass{ @@ -2222,7 +2222,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "tI" = ( /obj/effect/turf_decal/darkpack/cave/corner{ @@ -2231,7 +2231,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "tL" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -2350,7 +2350,7 @@ "ux" = ( /obj/effect/turf_decal/darkpack/cave/corner, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "uC" = ( /obj/structure/chair/sofa/left/brown{ @@ -2423,7 +2423,7 @@ dir = 1 }, /obj/effect/turf_decal/darkpack/cave, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "vd" = ( /obj/effect/turf_decal/darkpack/sand/corner{ @@ -2478,7 +2478,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "vP" = ( /obj/effect/turf_decal/darkpack/cave{ @@ -2778,7 +2778,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 10 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "yk" = ( /obj/item/flashlight/lantern{ @@ -2851,7 +2851,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "zc" = ( /turf/open/floor/plating/rough/cave, @@ -2869,7 +2869,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 5 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "zh" = ( /obj/effect/turf_decal/darkpack/grass{ @@ -3101,7 +3101,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Bt" = ( /obj/structure/table/wood, @@ -3117,7 +3117,7 @@ /area/vtm/outside/forest) "Bx" = ( /obj/effect/turf_decal/darkpack/cave, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "BC" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -3247,7 +3247,7 @@ dir = 1 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Cq" = ( /obj/structure/vampdoor/wood{ @@ -3333,7 +3333,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 5 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "CS" = ( /obj/effect/decal/coastline/corner{ @@ -3364,7 +3364,7 @@ /obj/effect/turf_decal/darkpack/cave, /obj/effect/turf_decal/darkpack/rough/corner, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Db" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -3440,7 +3440,7 @@ base_icon_state = "ocean"; alpha = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/outside/forest/sept) "DU" = ( /obj/structure/glowshroom, @@ -3570,7 +3570,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 4 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Fi" = ( /obj/effect/turf_decal/darkpack/grass/corner{ @@ -3580,7 +3580,7 @@ /area/vtm/planetgeneration) "Fk" = ( /obj/effect/turf_decal/darkpack/rough/corner, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Fu" = ( /obj/transfer_point_vamp/forest/north/four, @@ -3590,7 +3590,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 6 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "FD" = ( /obj/item/bouquet/poppy{ @@ -3604,7 +3604,7 @@ /turf/open/misc/grass, /area/vtm/outside/forest) "FK" = ( -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "FN" = ( /obj/effect/turf_decal/darkpack/cave/corner{ @@ -3754,7 +3754,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Ho" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -3768,7 +3768,7 @@ dir = 4 }, /obj/effect/turf_decal/darkpack/cave/corner, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Hq" = ( /turf/open/floor/iron/stairs/black{ @@ -3786,7 +3786,7 @@ dir = 10 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Hz" = ( /obj/structure/bed/dogbed, @@ -3800,7 +3800,7 @@ /obj/effect/turf_decal/darkpack/rough/corner{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "HD" = ( /obj/structure/flora/rock/darkpack, @@ -3810,7 +3810,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 6 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "HI" = ( /obj/effect/turf_decal/darkpack/grass/corner, @@ -4060,7 +4060,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "JX" = ( /obj/effect/turf_decal/darkpack/grass/corner{ @@ -4215,7 +4215,7 @@ }, /obj/effect/turf_decal/darkpack/cave/corner, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "LA" = ( /obj/effect/decal/pallet, @@ -4531,7 +4531,7 @@ /area/vtm/outside/forest/sept) "Oj" = ( /obj/effect/turf_decal/darkpack/cave/corner, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Ok" = ( /obj/effect/turf_decal/darkpack/grass/corner{ @@ -4593,7 +4593,7 @@ /turf/open/misc/beach/vamp, /area/vtm/outside/forest) "OQ" = ( -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/outside/forest) "OR" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -4720,7 +4720,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "PW" = ( /obj/effect/spawner/random/trash/garbage, @@ -4885,7 +4885,7 @@ /obj/effect/turf_decal/darkpack/rough{ dir = 10 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Ru" = ( /obj/effect/turf_decal/darkpack/dirt{ @@ -4923,7 +4923,7 @@ }, /obj/effect/turf_decal/darkpack/rough/corner, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "RJ" = ( /obj/structure/glowshroom, @@ -4971,7 +4971,7 @@ /obj/effect/turf_decal/darkpack/rough/corner{ dir = 1 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Sc" = ( /obj/structure/flora/bush/flowers_yw/style_random, @@ -5022,7 +5022,7 @@ dir = 5 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Sz" = ( /obj/structure/bonfire/prelit{ @@ -5410,7 +5410,7 @@ dir = 8 }, /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Wc" = ( /obj/structure/chair/stool/bar/darkpack/red, @@ -5420,7 +5420,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 4 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Wf" = ( /obj/effect/realistic_fog/dense, @@ -5455,7 +5455,7 @@ /obj/effect/turf_decal/darkpack/rough/corner{ dir = 8 }, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "Wu" = ( /obj/structure/table/wood, @@ -5586,7 +5586,7 @@ dir = 1 }, /obj/effect/turf_decal/darkpack/cave, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "XX" = ( /obj/effect/turf_decal/darkpack/grass{ @@ -5821,7 +5821,7 @@ /area/vtm/outside/forest) "ZF" = ( /obj/effect/realistic_fog/dense, -/turf/open/water/beach/vamp, +/turf/open/water/river, /area/vtm/interior/forest/cave) "ZG" = ( /obj/effect/turf_decal/darkpack/dirt{ diff --git a/modular_darkpack/modules/walls/code/floors/water.dm b/modular_darkpack/modules/walls/code/floors/water.dm index 071baae6b100..1e5ecb709933 100644 --- a/modular_darkpack/modules/walls/code/floors/water.dm +++ b/modular_darkpack/modules/walls/code/floors/water.dm @@ -3,6 +3,17 @@ icon = 'modular_darkpack/modules/walls/icons/floors.dmi' icon_state = "ocean" baseturfs = /turf/open/water/river + fishing_datum = /datum/fish_source/river + +/turf/open/water/river/deep + name = "river" + icon = 'modular_darkpack/modules/walls/icons/floors.dmi' + icon_state = "ocean" + desc = "A little too deep for comfort" + immerse_overlay = "immerse_deep" + baseturfs = /turf/open/water/river/deep + is_swimming_tile = TRUE + color = "#979797" /turf/open/water/beach/vamp name = "ocean" From abc1108e3ed9a84b72a62ed65e428f296f756a86 Mon Sep 17 00:00:00 2001 From: KaileyCtrg Date: Sun, 14 Jun 2026 15:33:39 +1000 Subject: [PATCH 4/4] deep river water, random billboard --- _maps/map_files/Vampire/generic/forest.dmm | 12 ++++++++---- .../Vampire/special_fran/special_francisco.dmm | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/Vampire/generic/forest.dmm b/_maps/map_files/Vampire/generic/forest.dmm index a971fbc053a5..8b21f1baadfd 100644 --- a/_maps/map_files/Vampire/generic/forest.dmm +++ b/_maps/map_files/Vampire/generic/forest.dmm @@ -1758,7 +1758,7 @@ /turf/open/misc/grass/random, /area/vtm/outside/forest) "pX" = ( -/turf/open/water/beach/vamp/deep, +/turf/open/water/river/deep, /area/vtm/outside/forest) "qb" = ( /obj/effect/turf_decal/darkpack/rough{ @@ -3014,6 +3014,10 @@ /obj/effect/turf_decal/darkpack/sand{ dir = 9 }, +/obj/machinery/vending/cola{ + pixel_y = 20; + density = 0 + }, /turf/open/floor/plating/concrete, /area/vtm/interior/forest) "AB" = ( @@ -3963,7 +3967,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 6 }, -/turf/open/water/beach/vamp/deep, +/turf/open/water/river/deep, /area/vtm/outside/forest) "IO" = ( /obj/effect/decal/remains/human, @@ -4142,7 +4146,7 @@ /obj/effect/turf_decal/darkpack/cave/corner{ dir = 4 }, -/turf/open/water/beach/vamp/deep, +/turf/open/water/river/deep, /area/vtm/outside/forest) "KD" = ( /obj/effect/turf_decal/darkpack/dirt/corner, @@ -5482,7 +5486,7 @@ /obj/effect/turf_decal/darkpack/cave{ dir = 4 }, -/turf/open/water/beach/vamp/deep, +/turf/open/water/river/deep, /area/vtm/outside/forest) "WK" = ( /mob/living/basic/cockroach/apoc, diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index 75fc4f1f7695..a28bf43ae568 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -9965,9 +9965,9 @@ /turf/open/floor/wood/smooth/old, /area/vtm/interior/ghetto) "fMI" = ( -/obj/structure/billboard/darkpack/king{ +/obj/effect/spawner/random/structure/billboard/darkpack{ pixel_x = 0; - pixel_y = 9 + pixel_y = 3 }, /turf/open/misc/dirt, /area/vtm/outside/financialdistrict)