From 37ebe0f4703c4a4d93b19665c4dd7566d60b875f Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Thu, 6 Aug 2026 14:05:54 -0800 Subject: [PATCH 1/8] part 1 --- .../vanderlin/house_templates/noble_blue.dmm | 2151 ++++++++ .../vanderlin/house_templates/noble_red.dmm | 1704 ++++++ _maps/map_files/vanderlin/vanderlin.dmm | 4780 +++++------------ .../subsystem/properties/controller.dm | 59 + .../subsystem/properties/landmarks.dm | 46 + .../subsystem/properties/property_sign.dm | 124 + .../subsystem/properties/subsystem.dm | 246 + .../subsystem/property_management.dm | 616 --- vanderlin.dme | 5 +- 9 files changed, 5709 insertions(+), 4022 deletions(-) create mode 100644 _maps/map_files/vanderlin/house_templates/noble_blue.dmm create mode 100644 _maps/map_files/vanderlin/house_templates/noble_red.dmm create mode 100644 code/controllers/subsystem/properties/controller.dm create mode 100644 code/controllers/subsystem/properties/landmarks.dm create mode 100644 code/controllers/subsystem/properties/property_sign.dm create mode 100644 code/controllers/subsystem/properties/subsystem.dm delete mode 100644 code/controllers/subsystem/property_management.dm diff --git a/_maps/map_files/vanderlin/house_templates/noble_blue.dmm b/_maps/map_files/vanderlin/house_templates/noble_blue.dmm new file mode 100644 index 00000000000..a190aa69317 --- /dev/null +++ b/_maps/map_files/vanderlin/house_templates/noble_blue.dmm @@ -0,0 +1,2151 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aH" = ( +/obj/structure/door/iron/bars{ + name = "Blue Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/blue) +"aM" = ( +/obj/effect/decal/cleanable/dirt/cobweb, +/obj/structure/bed/hay, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"bi" = ( +/obj/item/bin/water, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"bl" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueledstreet/orange, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"bo" = ( +/obj/structure/fluff/walldeco/customflag{ + pixel_x = -32 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"bs" = ( +/turf/closed/wall/mineral/craftstone, +/area/outdoors/town/noble_manor/blue) +"bA" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/book/manners, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"bK" = ( +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"bZ" = ( +/obj/structure/carpet/blue, +/obj/structure/bookcase/random{ + pixel_y = 15 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"cr" = ( +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"cI" = ( +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"cO" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"dG" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 8 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"dI" = ( +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/tile/checker, +/area/indoors/town/noble_manor/blue) +"dM" = ( +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/structure/door{ + name = "Blue Noble Manor" + }, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"dU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/map_spawner/hauntz_random, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"ew" = ( +/obj/structure/rack, +/obj/item/dice_cup/wooden/liars_dice, +/obj/item/dice/d6/bone, +/obj/item/dice/d6/ebony, +/obj/item/toy/cards/deck, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"eN" = ( +/obj/effect/decal/cobblerockedge/alt, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"eQ" = ( +/obj/structure/bars, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"eV" = ( +/obj/machinery/light/fueled/wallfire/candle/weak, +/turf/open/water/bath, +/area/indoors/town/noble_manor/blue) +"eZ" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/flashlight/flare/torch/metal, +/obj/item/flint, +/obj/item/weapon/hammer/iron, +/obj/item/natural/bundle/plank, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"fh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/carpet/blue, +/obj/structure/table/map{ + dir = 9 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"fy" = ( +/obj/structure/fluff/railing/wood{ + dir = 4; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"fW" = ( +/turf/open/water/bath, +/area/indoors/town/noble_manor/blue) +"gA" = ( +/obj/structure/flora/grass, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"hk" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 1 + }, +/obj/structure/flora/grass, +/obj/structure/closet/crate/crafted_closet/inn/south, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/blue) +"hr" = ( +/obj/structure/fermentation_keg/random/water, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"hz" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass/bush_meagre, +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"ix" = ( +/obj/machinery/light/fueled/hearth, +/obj/item/reagent_containers/glass/bucket/pot/stone, +/obj/structure/rack/shelf, +/obj/item/reagent_containers/glass/carafe/teapot{ + pixel_y = 44 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"iD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"iE" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"iT" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/reagent_containers/glass/carafe, +/obj/item/reagent_containers/glass/cup{ + pixel_x = -8; + pixel_y = -4 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"jc" = ( +/obj/structure/fluff/statue/tdummy, +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"je" = ( +/obj/structure/closet/keyrack, +/obj/item/key/mnoble1_blue, +/obj/item/key/mnoble1_blue, +/obj/item/key/mnoble1_blue, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"jq" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 4 + }, +/obj/structure/flora/grass, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/natural/bundle/brick, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/blue) +"jw" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"jy" = ( +/obj/item/reagent_containers/glass/cup{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/structure/table/map{ + dir = 5 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"jF" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/obj/structure/carpet/blue, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"jH" = ( +/obj/structure/closet/crate/chest/old_crate, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"ke" = ( +/obj/structure/chair/stool{ + pixel_y = 5 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"lC" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 4 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"lG" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 4 + }, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"lJ" = ( +/obj/structure/carpet/blue, +/obj/structure/table/map{ + dir = 10 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"lM" = ( +/obj/item/natural/cloth{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/natural/cloth{ + pixel_x = -10; + pixel_y = 6 + }, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/blue) +"mh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/carpet/blue, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"ml" = ( +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/structure/door{ + name = "Blue Noble Manor" + }, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/blue) +"mv" = ( +/obj/structure/flora/tree/dead_bush, +/obj/structure/flora/grass, +/obj/machinery/light/fueled/torchholder/metal_torch/east, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"mx" = ( +/obj/structure/carpet/blue, +/obj/effect/landmark/events/haunts, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"mF" = ( +/obj/structure/bed/hay, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"mM" = ( +/obj/structure/flora/grass, +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"ne" = ( +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"nl" = ( +/obj/structure/door/weak/bolt{ + dir = 8 + }, +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/blue) +"nB" = ( +/obj/structure/fluff/railing/wood{ + dir = 4; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cobblerockedge/alt, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"nF" = ( +/obj/structure/table/map{ + dir = 5 + }, +/obj/item/carvedgem/turq/spoon{ + pixel_x = -4; + sellprice = 1 + }, +/obj/item/plate/turq{ + pixel_x = -16; + sellprice = 1 + }, +/obj/item/carvedgem/turq/fork{ + pixel_x = 2; + sellprice = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"ou" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"pa" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"pg" = ( +/obj/effect/landmark/start/minor_noble, +/obj/structure/chair/wood/alt/chair_noble, +/obj/structure/carpet/blue, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"py" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"pO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/openclose/reinforced{ + dir = 8 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"pU" = ( +/obj/structure/flora/tree/burnt, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"pV" = ( +/obj/structure/closet/crate/drawer, +/obj/item/storage/belt/pouch/coins/mid, +/obj/item/servant_bell, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"qb" = ( +/obj/structure/fluff/railing/wood{ + dir = 4; + pixel_x = 1 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"qv" = ( +/obj/item/broom, +/obj/structure/flora/grass, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"qV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/stonebrick, +/area/indoors/town/noble_manor/blue) +"rj" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"sd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"se" = ( +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/effect/mapping_helpers/access/locker, +/obj/structure/door{ + name = "Blue Noble Manor" + }, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"sv" = ( +/obj/structure/door{ + name = "Blue Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"sx" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/natural/feather{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"sz" = ( +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/blue) +"sG" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cobblerockedge/alt, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"sV" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"th" = ( +/obj/structure/bookcase/random, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"tC" = ( +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"tW" = ( +/turf/closed/mineral, +/area/outdoors/town/noble_manor/blue) +"up" = ( +/obj/structure/closet/crate/chest/gold, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"uM" = ( +/obj/structure/fluff/railing/wood{ + dir = 1 + }, +/obj/structure/fluff/railing/wood{ + dir = 4; + pixel_x = 1 + }, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"uP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/glass/cup{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/reagent_containers/glass/bottle/beer, +/obj/structure/table/map{ + dir = 6 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"vl" = ( +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/blue) +"vv" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"xb" = ( +/obj/structure/flora/tree/dying_bush, +/obj/structure/flora/grass/bush_meagre, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"xg" = ( +/obj/item/weapon/mace/woodclub/train_sword, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"xp" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"xA" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cobblerockedge/alt{ + dir = 10 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"xK" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 8 + }, +/obj/item/clothing/gloves/leather, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/flashlight/flare/torch/metal, +/obj/item/plate{ + pixel_x = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"ya" = ( +/obj/structure/flora/grass/bush, +/obj/structure/flora/tree/dying_bush, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"yg" = ( +/obj/structure/flora/grass, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/blue) +"yA" = ( +/obj/structure/rack/shelf, +/obj/structure/closet/crate/crafted_closet, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/broom, +/obj/item/clothing/cloak/apron/cook, +/obj/item/flint, +/obj/item/book/yeoldecookingmanual, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/blue) +"yJ" = ( +/obj/structure/mirror/fancy{ + pixel_x = -31; + pixel_y = -2 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"yR" = ( +/obj/structure/flora/tree/dying_bush, +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"zk" = ( +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/structure/door{ + name = "Blue Noble Manor" + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"zB" = ( +/obj/structure/rack/shelf/biggest, +/obj/item/reagent_containers/glass/bottle/wine, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"zG" = ( +/obj/structure/flora/tree/dying_bush, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"AP" = ( +/obj/structure/rack/shelf/biggest, +/obj/item/reagent_containers/glass/bottle/wine{ + pixel_x = 6; + pixel_y = 17 + }, +/obj/item/clothing/head/crown/circlet/turq{ + sellprice = 1 + }, +/obj/item/clothing/neck/turqamulet{ + sellprice = 1 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Bf" = ( +/turf/closed/wall/mineral/stone, +/area/outdoors/town/noble_manor/blue) +"Bv" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"BE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cobblerockedge/alt{ + dir = 8 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"BJ" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"BS" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/fluff/statue/small{ + pixel_x = -1; + pixel_y = 6 + }, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"Cb" = ( +/obj/structure/flora/grass/bush_meagre, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Cr" = ( +/obj/structure/chair/stool{ + pixel_y = 5 + }, +/obj/item/weapon/knife/villager, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/blue) +"Cx" = ( +/obj/structure/fluff/clock, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"CQ" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Dn" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/fluff/railing/tall{ + dir = 4 + }, +/obj/structure/flora/grass/bush_meagre, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"DH" = ( +/obj/structure/fluff/railing/wood{ + dir = 4; + pixel_x = 1 + }, +/obj/structure/fermentation_keg/water, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"DI" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/reagent_containers/food/snacks/meat/salami, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"DK" = ( +/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ + pixel_x = 7; + pixel_y = 3 + }, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/blue) +"DQ" = ( +/obj/structure/flora/tree/burnt, +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"DU" = ( +/obj/item/bin/water, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/blue) +"Ee" = ( +/turf/template_noop, +/area/template_noop) +"Ew" = ( +/obj/structure/window/openclose/reinforced{ + dir = 8 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"EK" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"FD" = ( +/turf/closed/wall/mineral/stonebrick, +/area/indoors/town/noble_manor/blue) +"FE" = ( +/obj/structure/well/fountain{ + pixel_x = -16 + }, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/blue) +"FH" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 10 + }, +/obj/effect/decal/cobblerockedge/alt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"FP" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/reagent_containers/peppermill, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"FU" = ( +/obj/structure/fermentation_keg/random/water, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"GF" = ( +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"GZ" = ( +/obj/structure/flora/grass/bush_meagre, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Hm" = ( +/obj/structure/fluff/walldeco/vinez, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/blue) +"Hv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cobblerockedge/alt, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"HS" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"HU" = ( +/turf/closed/mineral, +/area/under/cave) +"HX" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 10 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Id" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Ig" = ( +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Iz" = ( +/obj/structure/flora/grass/bush_meagre, +/obj/structure/flora/tree/dying_bush, +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"IR" = ( +/obj/structure/mannequin, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"IW" = ( +/obj/structure/rack/shelf, +/obj/structure/chair/stool/bar, +/obj/item/soap{ + pixel_x = 6; + pixel_y = 40 + }, +/obj/structure/rack/shelf/big, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/blue) +"JD" = ( +/obj/structure/flora/grass, +/obj/structure/flora/tree/burnt, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"JM" = ( +/obj/structure/flora/grass/bush, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Kc" = ( +/obj/structure/flora/grass/bush_meagre, +/obj/structure/fluff/walldeco/customflag{ + pixel_x = -32 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Kd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/bench/couch/left, +/obj/structure/rack/shelf, +/obj/item/carvedgem/turq/figurine{ + pixel_x = 16; + pixel_y = 41; + sellprice = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"Kg" = ( +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/blue) +"Kl" = ( +/obj/structure/flora/grass/bush_meagre, +/obj/structure/fluff/walldeco/customflag{ + pixel_x = -32 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Km" = ( +/obj/structure/closet/crate/chest/gold, +/obj/item/gem/violet{ + sellprice = 1 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"Kn" = ( +/obj/structure/fluff/railing/tall{ + dir = 4 + }, +/obj/structure/flora/grass/bush_meagre, +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"KK" = ( +/obj/structure/carpet/blue, +/obj/structure/chair/bench/couch/lord_secondary, +/obj/machinery/light/fueled/wallfire{ + pixel_y = 32 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Lh" = ( +/obj/structure/table/wood/plain_alt, +/obj/structure/fluff/millstone, +/obj/item/kitchen/rollingpin{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/machinery/light/fueled/wallfire/candle, +/obj/item/weapon/knife/villager, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"Ll" = ( +/obj/structure/closet/crate/chest/gold, +/obj/item/clothing/ring/gold/saffira{ + sellprice = 1 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"Lq" = ( +/obj/structure/fluff/railing/border{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/hotspring_rocks/grassy, +/turf/open/floor/grass, +/area/indoors/town/noble_manor/blue) +"LB" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/tree/dead_bush, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"LF" = ( +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"LH" = ( +/obj/machinery/light/fueled/oven, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/blue) +"LM" = ( +/obj/item/weapon/mace/woodclub/train_sword, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/blue) +"LV" = ( +/obj/structure/fluff/railing/border{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/flora/grass/herb/rosa, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/grass, +/area/indoors/town/noble_manor/blue) +"Mq" = ( +/obj/structure/carpet/blue, +/obj/structure/table/map{ + dir = 6 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"MI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"MM" = ( +/obj/structure/chair/bench, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"Nu" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/item/flashlight/flare/torch/metal, +/obj/structure/rack, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"NV" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Oa" = ( +/obj/structure/carpet/blue, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Oj" = ( +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"OP" = ( +/obj/structure/flora/grass/bush_meagre, +/obj/structure/flora/grass/bush_meagre, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"OQ" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 6 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Pn" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/obj/structure/chair/bench/couch/right, +/obj/structure/rack/shelf, +/obj/item/carvedgem/turq/duck{ + pixel_x = -3; + pixel_y = 35; + sellprice = 1 + }, +/obj/item/carvedgem/turq/cutgem{ + pixel_x = 7; + pixel_y = 39; + sellprice = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"PG" = ( +/obj/structure/handcart, +/obj/item/rope, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"PI" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/clothing/face/cigarette/pipe/westman, +/obj/item/reagent_containers/food/snacks/produce/dry_westleach, +/obj/structure/fluff/globe{ + pixel_x = -1; + pixel_y = 14 + }, +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/item/lipstick/blue{ + pixel_x = 1; + pixel_y = -20 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"PK" = ( +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass/bush, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"PZ" = ( +/obj/structure/fake_machine/mail{ + mailtag = "Blue" + }, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"Qm" = ( +/obj/structure/door/iron/bars{ + name = "Blue Noble Vault" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"QC" = ( +/turf/closed/wall/mineral/decowood, +/area/indoors/town/noble_manor/blue) +"RY" = ( +/obj/structure/closet/crate/crafted_closet/crafted, +/obj/item/clothing/shoes/nobleboot, +/obj/item/clothing/head/courtierhat, +/obj/item/clothing/shirt/tunic/noblecoat, +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/item/clothing/pants/trou/leather/quiltedkilt/colored/blue, +/obj/item/clothing/shirt/undershirt/sash/colored/blue, +/obj/item/clothing/cloak/raincloak/colored/blue, +/obj/item/clothing/shirt/dress/gown/wintergown, +/obj/item/clothing/pants/tights/colored/black, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Si" = ( +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/blue) +"So" = ( +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/blue) +"SE" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"SW" = ( +/obj/structure/rack/shelf, +/obj/effect/decal/carpet/square/black{ + pixel_x = -13; + pixel_y = 16 + }, +/obj/structure/rack/shelf/big, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/blue) +"Ta" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/door/iron/bars{ + name = "Blue Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble1, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"Tr" = ( +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Tt" = ( +/obj/item/candle/yellow/lit{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/candle/yellow/lit{ + pixel_x = 9; + pixel_y = 6 + }, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/blue) +"Tu" = ( +/obj/structure/flora/grass/bush, +/obj/structure/flora/tree/dying_bush, +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"TB" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"TJ" = ( +/turf/open/floor/tile/checker, +/area/indoors/town/noble_manor/blue) +"Uc" = ( +/obj/structure/rack{ + pixel_y = 10 + }, +/obj/item/storage/fancy/cigarettes/zig, +/obj/item/ore/coal{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/flint{ + pixel_x = 12; + pixel_y = 3 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Uu" = ( +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"Uv" = ( +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/reagent_containers/food/snacks/veg/potato_sliced, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"Uw" = ( +/obj/structure/fluff/walldeco/vinez, +/turf/closed/wall/mineral/decowood, +/area/indoors/town/noble_manor/blue) +"UC" = ( +/obj/structure/window/openclose/reinforced, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) +"UL" = ( +/obj/structure/stairs/stone{ + dir = 8 + }, +/turf/open/floor/blocks, +/area/outdoors/town/noble_manor/blue) +"US" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/butter, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"UV" = ( +/obj/structure/carpet/blue, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"Vv" = ( +/obj/structure/well, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"VA" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/blue) +"VI" = ( +/obj/effect/decal/cobblerockedge/alt{ + dir = 10 + }, +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"VV" = ( +/obj/structure/bed/wool/double, +/obj/item/bedsheet/double_pelt, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Wl" = ( +/obj/structure/fluff/walldeco/vinez, +/turf/open/floor/grass, +/area/indoors/town/noble_manor/blue) +"Wv" = ( +/obj/machinery/light/fueled/firebowl/standing, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/blue) +"Ww" = ( +/obj/machinery/light/fueled/hearth, +/obj/structure/rack/shelf, +/obj/item/reagent_containers/glass/cup/teacup{ + pixel_x = 7; + pixel_y = 42 + }, +/obj/item/reagent_containers/glass/cup/teacup{ + pixel_x = -7; + pixel_y = 41 + }, +/obj/machinery/light/fueled/wallfire/candle/r, +/obj/item/cooking/pan, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/blue) +"Wy" = ( +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"WB" = ( +/obj/structure/rack/shelf, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, +/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/blue) +"Xm" = ( +/turf/closed/wall/mineral/stone/window/moss, +/area/outdoors/town/noble_manor/blue) +"Xo" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/blue) +"Xq" = ( +/obj/structure/spider/stickyweb/solo, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"Xu" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0 + }, +/obj/structure/carpet/blue, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/blue) +"Ye" = ( +/obj/structure/fluff/railing/tall{ + dir = 4 + }, +/obj/structure/flora/grass/bush_meagre, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/blue) +"Yu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Yw" = ( +/obj/structure/carpet/blue, +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/blue) +"YA" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/blocks, +/area/outdoors/town/noble_manor/blue) +"YT" = ( +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"Zq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cobblerockedge/alt{ + dir = 4 + }, +/obj/structure/fluff/statue/tdummy, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/blue) +"ZL" = ( +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/blue) + +(1,1,1) = {" +HU +HU +HU +HU +HU +HU +HU +jc +HU +HU +HU +HU +HU +HU +HU +sz +sz +sz +sz +sz +FD +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(2,1,1) = {" +HU +HU +HU +jq +HU +HU +Xq +xg +HU +HU +HU +HU +HU +HU +HU +sz +VA +Uu +Uu +hr +FD +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(3,1,1) = {" +HU +HU +HU +hk +Xo +Xo +Wy +HU +HU +HU +HU +HU +HU +HU +HU +sz +US +Uu +ke +bK +FD +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(4,1,1) = {" +HU +HU +HU +HU +PG +Wy +Xo +HU +HU +HU +zG +ne +JD +Ig +cr +sz +Lh +bK +FP +bK +FD +FD +FD +sz +sz +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(5,1,1) = {" +HU +HU +QC +aM +Wy +Xo +Wy +eZ +Uw +HU +HS +ne +ne +yR +ne +sz +ix +bK +DI +bK +sz +WB +jw +FU +sz +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(6,1,1) = {" +HU +HU +Uw +mF +Wy +Xo +Wy +bi +Uw +HU +YT +JD +sV +sV +ne +LH +bK +bK +ke +Uu +se +vl +vl +Uv +sz +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(7,1,1) = {" +HU +HU +Uw +mF +Wy +Kg +Wy +xK +QC +HU +xb +sV +sV +sV +YT +sz +Ww +Uu +Uu +ou +sz +yA +DK +Cr +FD +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(8,1,1) = {" +HU +HU +QC +Wl +Uw +nl +Uw +Uw +QC +HU +cr +ne +sV +ne +LF +FD +sz +dM +eQ +sz +sz +FD +FD +FD +FD +FD +FD +sz +Ee +Ee +Ee +Ee +Ee +Ee +"} +(9,1,1) = {" +hz +JM +Kl +ya +mv +jH +YT +Tu +Kc +YT +GZ +ne +Ig +bl +Cb +FD +Nu +ZL +iD +jy +uP +ew +sz +th +yJ +PI +iT +sz +Ee +Ee +Ee +Ee +Ee +Ee +"} +(10,1,1) = {" +vv +cO +pU +ne +ne +tC +py +py +Id +Id +dG +tC +tC +xp +Cb +UC +ZL +sd +UV +UV +Wy +ZL +sz +Cx +UV +pg +sx +sz +sz +sz +sz +sz +sz +Ee +"} +(11,1,1) = {" +rj +So +BJ +ne +Ig +pa +Yu +HS +dU +py +tC +tC +tC +tC +tC +sv +ZL +mh +UV +UV +UV +ZL +zk +cI +UV +UV +bA +sz +sz +bK +bK +bK +sz +sz +"} +(12,1,1) = {" +EK +So +tC +yg +py +pa +py +iE +py +pa +FH +SE +tC +OQ +lC +UC +ZL +mh +mx +UV +UV +ZL +sz +je +UV +UV +NV +sz +bK +bK +TJ +bK +up +sz +"} +(13,1,1) = {" +BS +FE +MM +tC +py +pa +tC +py +py +VI +ne +sV +sV +Ig +Iz +FD +Kd +fh +lJ +Yw +UV +ZL +FD +th +UV +UV +cI +Qm +bK +TJ +dI +TJ +Km +sz +"} +(14,1,1) = {" +Bv +DU +So +yg +py +pa +tC +tC +py +ne +sV +sV +sV +Ig +OP +FD +Pn +nF +Mq +jF +ZL +ZL +FD +th +cI +zB +AP +sz +bK +bK +TJ +bK +Ll +sz +"} +(15,1,1) = {" +LB +So +cO +ne +Ig +CQ +Oj +tC +py +SE +sV +ne +tC +xA +GZ +Hm +FD +LV +Lq +FD +sz +ml +FD +sz +zk +sz +sz +sz +sz +bK +bK +bK +sz +sz +"} +(16,1,1) = {" +Bv +DQ +cO +bs +Ta +aH +bs +PZ +py +tC +JD +ne +lC +tC +HX +Tr +qV +pO +Ew +Tt +SW +Si +FD +Uc +cI +RY +IR +sz +sz +sz +sz +sz +sz +Ee +"} +(17,1,1) = {" +PK +cO +ne +YA +py +So +Xm +py +py +py +eN +ne +ne +tC +tC +Yu +Yu +MI +Tr +lM +IW +Si +FD +Oa +UV +Wy +cI +sz +Ee +Ee +Ee +Ee +Ee +Ee +"} +(18,1,1) = {" +Dn +Kn +Ye +YA +UL +UL +YA +tC +py +py +eN +ne +Vv +sG +lC +lC +LM +MI +MI +sz +eV +fW +FD +KK +UV +Wy +cI +FD +Ee +Ee +Ee +Ee +Ee +Ee +"} +(19,1,1) = {" +Tr +Tr +Tr +Bf +Ee +Ee +YA +gA +TB +py +eN +sV +ne +ne +GF +lG +lG +Zq +HS +sz +fW +fW +FD +Xu +bZ +pV +VV +FD +Ee +Ee +Ee +Ee +Ee +Ee +"} +(20,1,1) = {" +Ee +Ee +Tr +bo +Ee +Ee +Bf +bs +bs +qv +eN +sV +mM +gA +tC +tC +py +tC +tC +sz +sz +sz +sz +sz +sz +sz +FD +FD +Ee +Ee +Ee +Ee +Ee +Ee +"} +(21,1,1) = {" +Ee +Ee +Ee +Ee +Ee +Ee +bo +tW +bs +BE +Hv +tC +tC +tC +bs +bs +Ee +Wv +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(22,1,1) = {" +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Tr +Tr +uM +nB +fy +DH +qb +bs +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(23,1,1) = {" +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ig +Ig +Ig +Ig +Ig +Ig +Ig +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} +(24,1,1) = {" +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ig +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +Ee +"} diff --git a/_maps/map_files/vanderlin/house_templates/noble_red.dmm b/_maps/map_files/vanderlin/house_templates/noble_red.dmm new file mode 100644 index 00000000000..4f9f7e562e9 --- /dev/null +++ b/_maps/map_files/vanderlin/house_templates/noble_red.dmm @@ -0,0 +1,1704 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"am" = ( +/obj/structure/flora/grass, +/obj/structure/flora/grass/bush_meagre/yellow, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"aG" = ( +/obj/structure/bookcase/random, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"aP" = ( +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"aQ" = ( +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"bz" = ( +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"bA" = ( +/obj/structure/carpet/red, +/obj/structure/chair/wood/alt/chair_noble/red{ + dir = 4 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"bX" = ( +/obj/structure/chair/stool{ + pixel_y = 5 + }, +/obj/item/weapon/knife/villager, +/obj/structure/rack/shelf, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"ct" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/structure/mirror/fancy{ + pixel_x = 33; + pixel_y = -1 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"cY" = ( +/obj/effect/landmark/events/haunts, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/red) +"dg" = ( +/obj/structure/carpet/red, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"dl" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"dC" = ( +/obj/item/reagent_containers/food/snacks/produce/vegetable/onion, +/obj/item/reagent_containers/food/snacks/produce/vegetable/onion{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/reagent_containers/food/snacks/produce/vegetable/onion{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"dV" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"eH" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"fb" = ( +/obj/structure/table/wood/plain_alt, +/obj/structure/fluff/millstone, +/obj/item/kitchen/rollingpin{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/weapon/knife/villager, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"fp" = ( +/obj/structure/flora/newtree, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"gC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/stone, +/area/indoors/town/noble_manor/red) +"ho" = ( +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"hv" = ( +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"hA" = ( +/obj/item/bin/water, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"in" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/red) +"iI" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"js" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"jH" = ( +/obj/structure/fluff/railing/tall{ + dir = 8 + }, +/obj/structure/wild_plant/nospread/sunflower, +/obj/structure/flora/grass/herb/calendula, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"jO" = ( +/obj/structure/well/fountain, +/obj/structure/fluff/statue/small{ + pixel_x = 16; + pixel_y = 39; + density = 0 + }, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"ke" = ( +/obj/structure/rack/shelf/big, +/obj/structure/rack/shelf, +/obj/item/soap/bath{ + pixel_y = 39 + }, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/red) +"lc" = ( +/obj/structure/rack, +/obj/item/clothing/head/crown/circlet/coral{ + sellprice = 1 + }, +/obj/item/clothing/neck/coralamulet{ + sellprice = 1 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"ld" = ( +/obj/structure/chair/bench/couch/right, +/obj/structure/rack/shelf, +/obj/item/carvedgem/coral/fish{ + pixel_y = 37; + sellprice = 1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"lp" = ( +/obj/structure/fluff/railing/border{ + dir = 4 + }, +/obj/structure/flora/grass/herb/calendula, +/obj/structure/wild_plant/nospread/sunflower, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/red, +/area/indoors/town/noble_manor/red) +"lJ" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueled/wallfire/candle/lamp{ + pixel_y = -32 + }, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"mL" = ( +/obj/machinery/light/fueled/oven/south, +/obj/item/reagent_containers/glass/bucket/pot, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"ni" = ( +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"nV" = ( +/obj/structure/flora/grass/herb/calendula, +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"oe" = ( +/obj/structure/bed/wool/double, +/obj/item/bedsheet/double_pelt, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"oo" = ( +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"oC" = ( +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"oK" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 1 + }, +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"pZ" = ( +/obj/structure/sign/property_sign/claim, +/turf/closed/wall/mineral/craftstone, +/area/outdoors/town/noble_manor/red) +"qj" = ( +/obj/structure/closet/keyrack, +/obj/item/key/mnoble3_red, +/obj/item/key/mnoble3_red, +/obj/item/key/mnoble3_red, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"rz" = ( +/obj/structure/flora/grass, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"rK" = ( +/obj/structure/door/iron/bars{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/red) +"rW" = ( +/obj/machinery/light/fueled/hearth, +/obj/item/cooking/pan, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"rX" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"so" = ( +/obj/structure/bookcase/random, +/obj/structure/carpet/red, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"su" = ( +/obj/structure/flora/grass/bush_meagre/yellow, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"ti" = ( +/obj/structure/fluff/railing/tall, +/obj/structure/fluff/railing/tall{ + dir = 8 + }, +/obj/structure/wild_plant/nospread/sunflower, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"tC" = ( +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/obj/structure/carpet/red, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"tD" = ( +/obj/machinery/light/fueled/hearth/big_fireplace, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/red) +"ub" = ( +/obj/effect/decal/carpet{ + pixel_x = 16; + pixel_y = -12 + }, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/red) +"vk" = ( +/turf/open/floor/tile/checker, +/area/indoors/town/noble_manor/red) +"vY" = ( +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/red) +"wB" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/butter, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"wC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/fancy/red, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"wP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"wZ" = ( +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"xk" = ( +/obj/structure/table/map{ + dir = 9 + }, +/obj/item/reagent_containers/glass/cup/teacup, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"xn" = ( +/obj/structure/bookcase/random, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"xS" = ( +/obj/structure/carpet/red, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"xY" = ( +/obj/structure/flora/grass, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"yu" = ( +/obj/structure/rack/shelf, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, +/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/red) +"yY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"zD" = ( +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/reagent_containers/food/snacks/veg/onion_sliced, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/red) +"zL" = ( +/obj/structure/flora/grass, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/natural/bundle/brick, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"zR" = ( +/obj/structure/flora/grass, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/red) +"zU" = ( +/obj/structure/fermentation_keg/random/water, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"Ah" = ( +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Aj" = ( +/obj/structure/flora/grass/bush/wall/tall/bog, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"AN" = ( +/obj/structure/flora/newtree, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/red) +"AO" = ( +/obj/structure/chair/bench/couch/alt, +/obj/effect/landmark/start/minor_noble, +/obj/structure/carpet/red, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Bc" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/water/bath, +/area/indoors/town/noble_manor/red) +"Bk" = ( +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"Bp" = ( +/obj/structure/flora/grass/bush_meagre/yellow, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"Bq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/openclose/reinforced{ + dir = 4 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"Cl" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/flashlight/flare/torch/metal, +/obj/item/flint, +/obj/item/weapon/hammer/iron, +/obj/item/natural/bundle/plank, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"CQ" = ( +/turf/open/water/bath, +/area/indoors/town/noble_manor/red) +"CY" = ( +/turf/closed/wall/mineral/wooddark/horizontal, +/area/indoors/town/noble_manor/red) +"Dw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"DC" = ( +/obj/structure/window/openclose/reinforced{ + dir = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"DI" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/obj/structure/table/wood/reinforced_alter, +/obj/structure/fluff/globe{ + pixel_x = -1; + pixel_y = 14 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Es" = ( +/obj/structure/bed/hay, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Ey" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/book/bibble{ + pixel_x = 1; + pixel_y = -14 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"EA" = ( +/obj/structure/carpet/red, +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Ff" = ( +/obj/structure/rack{ + pixel_y = -1 + }, +/obj/item/dice/d6/bone, +/obj/item/dice/d6/ebony, +/obj/item/toy/cards/deck, +/obj/item/dice_cup/wooden/liars_dice, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Fw" = ( +/obj/machinery/light/fueledstreet/orange, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"FL" = ( +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/tile/checker, +/area/indoors/town/noble_manor/red) +"FX" = ( +/obj/structure/table/map{ + dir = 10 + }, +/obj/item/plate/coral{ + sellprice = 1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Ga" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/obj/structure/rack/shelf/biggest, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Gf" = ( +/turf/closed/wall/mineral/craftstone, +/area/outdoors/town/noble_manor/red) +"Gk" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"Go" = ( +/obj/structure/closet/crate/drawer, +/obj/item/servant_bell, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Gt" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"Gx" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"GX" = ( +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Hf" = ( +/obj/structure/closet/crate/crafted_closet/crafted, +/obj/item/clothing/shoes/nobleboot, +/obj/item/clothing/head/courtierhat, +/obj/item/clothing/head/chaperon/colored, +/obj/item/clothing/cloak/half/colored/red, +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/item/clothing/shirt/ornate/dress, +/obj/item/clothing/shirt/ornate/tunic, +/obj/item/clothing/cloak/raincloak/colored/red, +/obj/item/clothing/pants/skirt/patkilt/colored/red, +/obj/item/clothing/pants/tights/colored/black, +/obj/item/clothing/head/helmet/leather/headscarf/colored/red, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Hi" = ( +/obj/structure/closet/crate/chest/gold, +/obj/item/clothing/ring/gold/rontz{ + sellprice = 1 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"Hl" = ( +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/effect/mapping_helpers/access/locker, +/obj/structure/door/iron/bars{ + name = "Red Noble Vault" + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"HM" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/red) +"Ic" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 8 + }, +/obj/item/clothing/gloves/leather, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/flashlight/flare/torch/metal, +/obj/item/plate{ + pixel_x = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"It" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bookcase/random, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"II" = ( +/obj/structure/handcart, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/rope, +/obj/machinery/light/fueled/wallfire/candle/lamp, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Jt" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"JI" = ( +/turf/closed/mineral, +/area/under/cave) +"JL" = ( +/turf/closed/wall/mineral/stone, +/area/indoors/town/noble_manor/red) +"JX" = ( +/obj/structure/chair/bench/couch/left, +/obj/structure/rack/shelf, +/obj/machinery/light/fueled/wallfire/candle/l, +/obj/item/carvedgem/coral/fancyvase{ + pixel_x = 10; + pixel_y = 44; + sellprice = 1 + }, +/obj/item/carvedgem/coral/vase{ + pixel_x = -5; + pixel_y = 41; + sellprice = 1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"KE" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"KQ" = ( +/obj/structure/table/map{ + dir = 6 + }, +/obj/structure/carpet/red, +/obj/item/reagent_containers/glass/cup/teacup{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/carvedgem/coral/fork{ + pixel_x = -21; + pixel_y = 4; + sellprice = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"Lc" = ( +/obj/structure/closet/crate/chest/gold, +/obj/item/gem/red{ + sellprice = 1 + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"Li" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Ly" = ( +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"LA" = ( +/obj/structure/closet/crate/crafted_closet/inn/south, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/red) +"Mf" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Mz" = ( +/turf/template_noop, +/area/template_noop) +"MA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/red) +"MG" = ( +/obj/structure/closet/crate/chest/gold, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"NX" = ( +/obj/structure/table/map{ + dir = 5 + }, +/obj/item/reagent_containers/glass/carafe/teapot, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"Oe" = ( +/obj/structure/fluff/clock, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Oz" = ( +/obj/item/carvedgem/coral/duck{ + sellprice = 1 + }, +/turf/open/water/bath, +/area/indoors/town/noble_manor/red) +"OR" = ( +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/red) +"OS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"PB" = ( +/turf/closed/mineral, +/area/indoors/town/noble_manor/red) +"QA" = ( +/obj/structure/flora/grass/herb/calendula, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"QI" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"QJ" = ( +/obj/structure/fluff/railing/tall{ + dir = 8 + }, +/obj/structure/wild_plant/nospread/sunflower, +/obj/structure/flora/grass/herb/calendula, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"QL" = ( +/obj/structure/closet/crate/crafted_closet, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/broom, +/obj/item/flint, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"Ru" = ( +/obj/structure/door/fancy{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/red) +"RK" = ( +/obj/structure/door/weak/bolt{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/red) +"RO" = ( +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/red) +"Sa" = ( +/obj/effect/mapping_helpers/access/keyset/manor/Noble3, +/obj/structure/door/iron/bars{ + name = "Red Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/cobblerock, +/area/outdoors/town/noble_manor/red) +"Ss" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"SH" = ( +/obj/machinery/light/fueled/hearth, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/red) +"TI" = ( +/obj/structure/rack/shelf/big, +/obj/structure/rack/shelf, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/red) +"TW" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0 + }, +/obj/structure/carpet/red, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Ua" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Ub" = ( +/obj/structure/rack{ + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Uf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/carpet/red, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"UR" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0 + }, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"Vx" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/reagent_containers/peppermill, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"VW" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/book/manners, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"VX" = ( +/obj/structure/bars, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/red) +"Wk" = ( +/obj/structure/bed/hay, +/obj/effect/decal/cleanable/dirt/cobweb, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/red) +"Wp" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/red) +"WW" = ( +/obj/structure/wild_plant/nospread/sunflower, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"WX" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/reagent_containers/food/snacks/meat/salami, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/red) +"XB" = ( +/obj/structure/fluff/railing/tall{ + dir = 8 + }, +/obj/structure/fluff/railing/tall{ + dir = 1 + }, +/obj/structure/flora/grass/bush_meagre/yellow, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"XN" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/red) +"YP" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/red) +"YU" = ( +/obj/structure/flora/newtree, +/turf/open/floor/grass/red, +/area/outdoors/town/noble_manor/red) +"Zp" = ( +/turf/closed/wall/mineral/decowood, +/area/indoors/town/noble_manor/red) + +(1,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Gf +Gf +KE +Sa +Sa +dl +pZ +"} +(2,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +KE +KE +ho +ho +OR +OR +ho +YU +"} +(3,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Gf +Gf +dl +dl +dl +KE +KE +KE +KE +KE +KE +KE +KE +YU +YU +OR +OR +OR +ho +HM +"} +(4,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +KE +Gk +aa +QA +OR +OR +OR +OR +OR +Bp +ho +ho +zR +OR +OR +zR +OR +OR +aa +fp +"} +(5,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +rK +OR +OR +OR +OR +OR +zR +OR +OR +OR +YU +zR +zR +OR +OR +OR +cY +aa +aa +am +"} +(6,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +rK +OR +OR +OR +zR +OR +su +ho +OR +OR +zR +OR +OR +WW +ho +OR +OR +ho +ho +YU +"} +(7,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +KE +ho +ho +Gk +ho +Jt +ho +aa +Bp +OR +OR +OR +Jt +ho +jO +rz +OR +OR +ho +Mz +"} +(8,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Gf +nV +Jt +YU +XB +jH +QJ +ti +ho +aa +fp +Gk +Jt +ho +ho +ho +zR +OR +su +Mz +"} +(9,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Gf +Aj +Aj +JL +JL +Bq +Bq +gC +oo +ho +Gk +Gk +aa +ho +WW +zR +zR +OR +xY +Mz +"} +(10,1,1) = {" +Mz +Mz +Mz +Mz +RO +RO +RO +RO +RO +JL +CY +lp +lp +in +RO +RO +RO +RO +Fw +rz +zR +zR +OR +ho +AN +Mz +"} +(11,1,1) = {" +Mz +Mz +Mz +Mz +RO +fb +rW +Ss +SH +JL +JX +xk +FX +hv +It +Dw +Ff +RO +ho +OR +zR +OR +OR +ho +Mz +Mz +"} +(12,1,1) = {" +Mz +Mz +Mz +Mz +RO +Ly +Ly +Bk +Bk +JL +ld +NX +KQ +tC +so +yY +Ub +DC +OR +OR +OR +OR +ho +Mz +Mz +Mz +"} +(13,1,1) = {" +RO +RO +RO +JL +JL +wB +Bk +Vx +Bk +OS +aQ +dg +dg +dg +dg +Uf +Dw +aP +OR +OR +ho +ho +nV +Mz +Mz +Mz +"} +(14,1,1) = {" +RO +yu +eH +XN +JL +Gt +Bk +WX +Bk +VX +aQ +dg +dg +dg +Uf +Uf +Dw +DC +ho +ho +ho +nV +Mz +Mz +Mz +Mz +"} +(15,1,1) = {" +RO +zD +wZ +wZ +Ru +Bk +Bk +Bk +Ly +JL +iI +bz +dg +dg +Uf +yY +aQ +RO +ni +HM +aa +ho +Mz +Mz +Mz +Mz +"} +(16,1,1) = {" +JL +bX +dC +QL +RO +mL +dV +Ly +zU +JL +iI +Ua +aQ +aQ +Ey +wC +Ua +RO +Gf +ho +Aj +Mz +Mz +Mz +Mz +Mz +"} +(17,1,1) = {" +JL +JL +JL +JL +JL +RO +RO +RO +RO +JL +JL +RO +oC +RO +RO +RO +RO +Zp +Zp +RK +Zp +Zp +JL +Mz +Mz +Mz +"} +(18,1,1) = {" +Mz +Mz +Mz +Mz +RO +RO +Hf +lc +RO +QI +VW +YP +GX +Oe +RO +RO +JL +LA +vY +MA +wP +Gx +JL +Mz +Mz +Mz +"} +(19,1,1) = {" +Mz +Mz +Mz +Mz +RO +Li +GX +xS +EA +xS +GX +GX +GX +GX +aG +RO +JL +zL +wP +MA +Dw +aQ +JL +Mz +Mz +Mz +"} +(20,1,1) = {" +Mz +Mz +Mz +Mz +RO +TW +xS +GX +RO +qj +GX +GX +GX +GX +xn +RO +JL +oK +Mf +rX +aQ +PB +JL +Mz +Mz +Mz +"} +(21,1,1) = {" +Mz +Mz +Mz +Mz +tD +AO +xS +GX +RO +RO +xS +bA +xS +GX +RO +RO +JL +PB +II +Dw +lJ +PB +JL +Mz +Mz +Mz +"} +(22,1,1) = {" +Mz +Mz +Mz +Mz +RO +TW +xS +GX +oe +RO +DI +ct +GX +Ga +RO +JI +JL +Wk +aQ +js +Dw +Cl +JL +Mz +Mz +Mz +"} +(23,1,1) = {" +Mz +Mz +Mz +Mz +RO +UR +GX +Go +RO +RO +RO +RO +Hl +RO +RO +JI +JL +Es +aQ +rX +Dw +hA +JL +Mz +Mz +Mz +"} +(24,1,1) = {" +Mz +Mz +RO +RO +RO +RO +Ah +RO +RO +RO +RO +Bk +Bk +Bk +RO +RO +JL +Es +aQ +MA +Dw +Ic +JL +Mz +Mz +Mz +"} +(25,1,1) = {" +Mz +Mz +RO +ke +CQ +Bc +ub +RO +Mz +RO +Bk +Bk +vk +Bk +Bk +RO +JL +JL +JL +JL +JL +JL +JL +Mz +Mz +Mz +"} +(26,1,1) = {" +Mz +Mz +RO +TI +Oz +CQ +Wp +RO +Mz +RO +Bk +vk +FL +vk +Bk +RO +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +"} +(27,1,1) = {" +Mz +Mz +RO +RO +RO +RO +RO +RO +Mz +RO +Bk +Bk +vk +Bk +Bk +RO +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +"} +(28,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +RO +RO +Hi +Lc +MG +RO +RO +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +"} +(29,1,1) = {" +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +RO +RO +RO +RO +RO +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +"} diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm index dc7498a847b..bc6c62cd2dd 100644 --- a/_maps/map_files/vanderlin/vanderlin.dmm +++ b/_maps/map_files/vanderlin/vanderlin.dmm @@ -110,14 +110,6 @@ dir = 8 }, /area/outdoors/mountains) -"acO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cobblerockedge/alt{ - dir = 4 - }, -/obj/structure/fluff/statue/tdummy, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "acX" = ( /obj/structure/spider/stickyweb, /turf/open/floor/greenstone, @@ -127,14 +119,6 @@ /obj/item/natural/cloth, /turf/open/floor/twig, /area/indoors/soilsons) -"ado" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0 - }, -/obj/structure/carpet/red, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "ads" = ( /obj/structure/carpet, /turf/open/floor/ruinedwood/chevron, @@ -150,10 +134,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/outdoors/town) -"adC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/stone, -/area/indoors/town/noble_manor/red) "adG" = ( /obj/structure/fluff/clock, /turf/open/floor/herringbone, @@ -256,11 +236,6 @@ /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/garrison) -"agQ" = ( -/obj/structure/flora/grass/bush, -/obj/structure/flora/tree/dying_bush, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "ahf" = ( /turf/open/floor/carpet/purple, /area/indoors/town/tavern) @@ -357,13 +332,6 @@ /obj/structure/closet/crate/chest, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) -"ajN" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "akk" = ( /obj/structure/toilet/filled, /turf/open/floor/twig, @@ -467,21 +435,6 @@ /obj/structure/closet/dirthole/grave, /turf/open/floor/dirt, /area/outdoors/exposed/church/graveyard) -"alY" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/butter, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "ama" = ( /obj/structure/bars, /turf/open/floor/cobblerock, @@ -491,16 +444,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue/l, /turf/open/floor/tile/bath, /area/indoors/town/merc_guild) -"amz" = ( -/obj/structure/fluff/railing/tall{ - dir = 8 - }, -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass/bush_meagre/yellow, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "amQ" = ( /obj/item/candle/yellow{ pixel_x = -12; @@ -719,6 +662,16 @@ /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/grass/yel, /area/outdoors/exposed/church/graveyard) +"aqT" = ( +/obj/effect/landmark/house_spot/noble{ + property_id = "noble_blue"; + save_id = "noble_blue"; + template_x = 24; + template_y = 34; + default_template = /datum/map_template/vanderlin_noble_blue + }, +/turf/closed/mineral, +/area/under/cave) "arc" = ( /obj/structure/door/iron/bars{ name = "Cell Yard Door" @@ -789,13 +742,6 @@ }, /turf/open/floor/churchrough, /area/indoors/town/church/chapel) -"ast" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/openclose/reinforced{ - dir = 4 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "asC" = ( /turf/open/floor/blocks/paving, /area/under/town/sewer) @@ -835,14 +781,6 @@ /obj/structure/table/wood/plain_alt, /turf/open/floor/carpet/purple, /area/indoors/town/tavern) -"auK" = ( -/obj/structure/rack, -/obj/item/dice_cup/wooden/liars_dice, -/obj/item/dice/d6/bone, -/obj/item/dice/d6/ebony, -/obj/item/toy/cards/deck, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "auL" = ( /obj/structure/closet/crate/crafted_closet/lord, /obj/machinery/light/fueled/wallfire/candle{ @@ -993,22 +931,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/blocks/green, /area/under/town/sewer) -"ayL" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/obj/structure/chair/bench/couch/right, -/obj/structure/rack/shelf, -/obj/item/carvedgem/turq/duck{ - pixel_x = -3; - pixel_y = 35; - sellprice = 1 - }, -/obj/item/carvedgem/turq/cutgem{ - pixel_x = 7; - pixel_y = 39; - sellprice = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "ayP" = ( /obj/machinery/light/fueled/wallfire/candle, /turf/open/floor/ruinedwood/spiral, @@ -1198,14 +1120,6 @@ /obj/structure/bookcase/random/thesis, /turf/open/floor/herringbone, /area/indoors/town/keep/library) -"aDt" = ( -/obj/structure/door/iron/bars{ - name = "Blue Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/blue) "aDx" = ( /obj/structure/bed/hay, /obj/effect/decal/cleanable/dirt/cobweb, @@ -1239,22 +1153,11 @@ /obj/structure/fluff/railing/wood, /turf/open/floor/grass, /area/outdoors/town) -"aFm" = ( -/obj/structure/mannequin, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "aFp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/chest/neu, /turf/open/floor/hexstone, /area/indoors/town/clocktower) -"aFr" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "aFK" = ( /turf/closed/wall/mineral/tent, /area/outdoors/basin/safe) @@ -1888,13 +1791,6 @@ }, /turf/open/floor/tile, /area/indoors/town/bath) -"aSJ" = ( -/obj/structure/rack/shelf, -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, -/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "aTf" = ( /obj/structure/fluff/walldeco/bath/wallpipes/innie{ dir = 8; @@ -2020,14 +1916,6 @@ }, /turf/open/floor/woodturned, /area/indoors/town/keep/magician) -"aXT" = ( -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/structure/door/iron/bars{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/red) "aXW" = ( /obj/structure/rack/shelf/biggest, /obj/item/reagent_containers/glass/bottle/wine, @@ -2796,20 +2684,6 @@ }, /turf/open/floor/ruinedwood/darker, /area/indoors/town/tavern) -"bqd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/carpet/blue, -/obj/structure/table/map{ - dir = 9 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) -"bqk" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 4 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "bql" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/blocks/paving, @@ -2900,10 +2774,6 @@ "bst" = ( /turf/open/openspace, /area/outdoors/exposed/cell) -"bsC" = ( -/obj/structure/carpet/red, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "bsG" = ( /obj/structure/door/iron/bars/cell, /obj/effect/mapping_helpers/structure/breaker{ @@ -3053,11 +2923,6 @@ "bwG" = ( /turf/closed/wall/mineral/decostone/center, /area/under/town/basement) -"bwI" = ( -/obj/structure/flora/grass/herb/calendula, -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "bwO" = ( /obj/structure/table/wood/reinf_long{ dir = 1 @@ -3271,9 +3136,6 @@ }, /turf/open/floor/ruinedwood/alt, /area/indoors/town/smithy) -"bCq" = ( -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "bCB" = ( /obj/structure/fluff/walldeco/bath/wallpipes/innie{ dir = 4; @@ -3463,17 +3325,6 @@ "bGD" = ( /turf/open/floor/blocks/paving, /area/under/cave) -"bGJ" = ( -/obj/structure/rack{ - pixel_y = -1 - }, -/obj/item/dice/d6/bone, -/obj/item/dice/d6/ebony, -/obj/item/toy/cards/deck, -/obj/item/dice_cup/wooden/liars_dice, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "bGL" = ( /obj/structure/closet/crate/crafted_closet/lord, /obj/item/clothing/armor/plate/blkknight, @@ -3573,13 +3424,6 @@ /obj/structure/flora/grass, /turf/open/floor/grass, /area/outdoors/town) -"bJh" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "bJk" = ( /obj/structure/fluff/walldeco/chains, /turf/open/floor/metal/barograte, @@ -3814,11 +3658,6 @@ /obj/structure/fake_machine/scomm/l, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/hand) -"bPD" = ( -/obj/structure/flora/grass, -/obj/structure/flora/grass/bush_meagre/yellow, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "bPL" = ( /obj/structure/table/wood{ dir = 1; @@ -4086,9 +3925,6 @@ /obj/structure/table/wood/plain, /turf/open/floor/cobblerock, /area/under/town/basement) -"bVi" = ( -/turf/closed/mineral, -/area/outdoors/town/noble_manor/blue) "bVm" = ( /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/dirt, @@ -4182,13 +4018,6 @@ "bXi" = ( /turf/open/floor/carpet/red, /area/indoors/town/keep/library) -"bXv" = ( -/obj/structure/table/map{ - dir = 9 - }, -/obj/item/reagent_containers/glass/cup/teacup, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "bXC" = ( /obj/structure/flora/newleaf{ dir = 1 @@ -4198,9 +4027,6 @@ }, /turf/open/openspace, /area/outdoors/mountains) -"bXM" = ( -/turf/closed/mineral, -/area/indoors/town/noble_manor/red) "bXY" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_y = -32 @@ -4334,15 +4160,6 @@ "ccS" = ( /turf/closed/wall/mineral/decostone/center, /area/indoors/town/keep/magician) -"ccW" = ( -/obj/structure/fluff/railing/tall{ - dir = 8 - }, -/obj/structure/wild_plant/nospread/sunflower, -/obj/structure/flora/grass/herb/calendula, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "ccX" = ( /obj/structure/fluff/railing/border{ dir = 1 @@ -4637,17 +4454,6 @@ /obj/structure/fluff/walldeco/vinez, /turf/closed/wall/mineral/stone/moss, /area/outdoors/woods_safe) -"ckW" = ( -/obj/item/candle/yellow/lit{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/candle/yellow/lit{ - pixel_x = 9; - pixel_y = 6 - }, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/blue) "clc" = ( /obj/machinery/light/fueled/wallfire/candle/l{ pixel_x = 32 @@ -4812,10 +4618,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/cobblerock, /area/under/town/basement) -"cpw" = ( -/obj/machinery/light/fueled/oven, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/blue) "cpQ" = ( /obj/structure/fluff/railing/wood, /obj/structure/fluff/railing/wood{ @@ -5243,10 +5045,6 @@ }, /turf/open/floor/cobble, /area/under/town/basement) -"cyN" = ( -/obj/effect/landmark/events/haunts, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/red) "cyS" = ( /turf/open/floor/ruinedwood/darker, /area/indoors/town/keep/hand) @@ -5301,10 +5099,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/outdoors/town) -"czW" = ( -/obj/structure/closet/crate/chest/gold, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "cAe" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/retaliate/shade, @@ -5464,13 +5258,6 @@ }, /turf/open/floor/blocks/stonered, /area/indoors/town/keep/feast) -"cDH" = ( -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/obj/structure/carpet/red, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "cDI" = ( /obj/structure/rack, /obj/item/clothing/shoes/nobleboot, @@ -5510,17 +5297,6 @@ /obj/structure/flora/grass, /turf/open/floor/dirt, /area/outdoors/basin) -"cEr" = ( -/obj/structure/fluff/railing/wood{ - dir = 4; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "cEs" = ( /obj/structure/window/openclose{ dir = 4 @@ -5572,15 +5348,6 @@ }, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/church) -"cEU" = ( -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "cEZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/start/villager, @@ -5613,12 +5380,6 @@ }, /turf/open/floor/cobblerock, /area/indoors/town/keep/magician) -"cFF" = ( -/obj/structure/closet/crate/drawer, -/obj/item/servant_bell, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "cFM" = ( /obj/structure/table/wood/large/corner{ dir = 10 @@ -5787,16 +5548,6 @@ }, /turf/open/floor/churchrough, /area/indoors/town/church/chapel) -"cIx" = ( -/obj/structure/rack/shelf, -/obj/structure/chair/stool/bar, -/obj/item/soap{ - pixel_x = 6; - pixel_y = 40 - }, -/obj/structure/rack/shelf/big, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/blue) "cIU" = ( /obj/machinery/light/fueled/wallfire/candle/blue, /obj/structure/bookcase/random_recipes, @@ -6053,24 +5804,6 @@ /obj/item/weapon/sword/iron, /turf/open/floor/cobble, /area/indoors/dungeon) -"cPN" = ( -/obj/structure/table/map{ - dir = 5 - }, -/obj/item/carvedgem/turq/spoon{ - pixel_x = -4; - sellprice = 1 - }, -/obj/item/plate/turq{ - pixel_x = -16; - sellprice = 1 - }, -/obj/item/carvedgem/turq/fork{ - pixel_x = 2; - sellprice = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "cPP" = ( /turf/open/floor/abyss_sand/path, /area/outdoors/river) @@ -6333,10 +6066,6 @@ }, /turf/closed/wall/mineral/craftstone, /area/indoors/town/steward) -"cTP" = ( -/obj/structure/closet/crate/crafted_closet/inn/south, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "cTT" = ( /obj/structure/rack/shelf/biggest, /obj/item/plate/onyxa, @@ -6396,10 +6125,6 @@ /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/grass, /area/outdoors/town) -"cUR" = ( -/obj/structure/carpet/red, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "cVk" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = 32; @@ -6523,20 +6248,10 @@ "cYo" = ( /turf/closed/wall/mineral/stone/moss, /area/indoors/town/vault) -"cYs" = ( -/obj/structure/carpet/blue, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "cYG" = ( /obj/structure/fluff/steamvent, /turf/open/floor/blocks/stonered/tiny, /area/under/town/basement) -"cZc" = ( -/obj/structure/flora/grass/bush, -/obj/structure/flora/tree/dying_bush, -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "cZl" = ( /obj/structure/minecart_rail{ dir = 5 @@ -6567,14 +6282,6 @@ }, /turf/open/floor/church, /area/indoors/town/church) -"daM" = ( -/obj/structure/carpet/red, -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "daT" = ( /obj/machinery/light/fueled/wallfire/big_fireplace{ pixel_y = 32 @@ -6829,13 +6536,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/blocks/newstone, /area/indoors/town/keep/throne) -"dgR" = ( -/obj/structure/rack/shelf, -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, -/obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/red) "dgS" = ( /obj/structure/fluff/wallclock{ pixel_y = -32 @@ -6845,11 +6545,6 @@ "dhc" = ( /turf/open/floor/blocks/newstone/alt, /area/indoors/town/keep/guest/guest2) -"dhu" = ( -/obj/structure/bookcase/random, -/obj/structure/carpet/red, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "dhy" = ( /obj/structure/table/wood/large/corner{ dir = 10 @@ -6916,11 +6611,6 @@ }, /turf/open/floor/wood, /area/indoors/town/tavern) -"djF" = ( -/obj/structure/flora/grass/herb/calendula, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "djK" = ( /obj/machinery/light/fueled/oven/south, /turf/open/floor/cobble, @@ -7001,11 +6691,6 @@ /obj/effect/waterfall, /turf/open/floor/cobble/mossy, /area/outdoors/farm) -"dla" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/reagent_containers/food/snacks/meat/salami, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "dlc" = ( /obj/structure/rack/shelf/biggest, /obj/item/restraints/legcuffs/beartrap/crafted, @@ -7213,17 +6898,10 @@ }, /turf/open/floor/dirt/road, /area/outdoors/exposed/church/graveyard) -"dpW" = ( -/turf/open/floor/tile/checker, -/area/indoors/town/noble_manor/blue) "dqh" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/dirt/road, /area/indoors/town/church/inquisition) -"dqm" = ( -/obj/machinery/light/fueled/firebowl/standing, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "dqo" = ( /obj/structure/chair/wood/alt/chair3{ dir = 8 @@ -7254,10 +6932,6 @@ /obj/structure/table/wood/fancy/blue, /turf/open/floor/ruinedwood/two, /area/indoors/town/shop) -"drh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "dro" = ( /turf/closed/wall/mineral/stone, /area/indoors/town/keep/servanthead) @@ -7509,11 +7183,6 @@ }, /turf/open/openspace, /area/outdoors/basin/safe) -"dyI" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "dyJ" = ( /obj/structure/door/violet{ name = "Wizard Tower" @@ -7548,9 +7217,6 @@ "dzx" = ( /turf/open/floor/carpet/royalblack, /area/indoors/town/smithy) -"dzP" = ( -/turf/open/water/bath, -/area/indoors/town/noble_manor/red) "dzW" = ( /obj/machinery/light/fueled/lanternpost/fixed{ pixel_x = -5; @@ -7666,14 +7332,6 @@ }, /turf/open/openspace, /area/outdoors/river) -"dCz" = ( -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/effect/mapping_helpers/access/locker, -/obj/structure/door/iron/bars{ - name = "Red Noble Vault" - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "dCF" = ( /obj/effect/landmark/events/haunts, /turf/open/floor/tile/masonic, @@ -7841,10 +7499,6 @@ /obj/structure/ladder, /turf/open/floor/ruinedwood/spiral, /area/under/town/basement) -"dGR" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "dGW" = ( /obj/structure/fluff/railing/border{ dir = 10 @@ -8115,10 +7769,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/outdoors/town) -"dMi" = ( -/obj/item/weapon/mace/woodclub/train_sword, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "dMt" = ( /obj/structure/closet/crate/chest/crafted, /obj/item/reagent_containers/food/snacks/hardtack, @@ -8271,14 +7921,6 @@ /obj/item/lipstick/black, /turf/open/floor/tile/bfloorz, /area/indoors/town/keep/lord_appt) -"dQP" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/flashlight/flare/torch/metal, -/obj/item/flint, -/obj/item/weapon/hammer/iron, -/obj/item/natural/bundle/plank, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "dRa" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/fueled/wallfire/candle{ @@ -8293,14 +7935,6 @@ "dRl" = ( /turf/open/floor/dirt, /area/outdoors/town/noble_manor/yellow) -"dRq" = ( -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/structure/door{ - name = "Blue Noble Manor" - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "dRP" = ( /turf/open/water/clean/dirt, /area/outdoors/town) @@ -8413,14 +8047,6 @@ }, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/keep/knight) -"dVz" = ( -/obj/structure/chair/stool{ - pixel_y = 5 - }, -/obj/item/weapon/knife/villager, -/obj/structure/rack/shelf, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "dVG" = ( /turf/open/floor/concrete, /area/indoors/town/keep/magician) @@ -8738,16 +8364,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town) -"ecY" = ( -/obj/structure/table/wood/plain_alt, -/obj/structure/fluff/millstone, -/obj/item/kitchen/rollingpin{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/weapon/knife/villager, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "edn" = ( /obj/structure/fluff/railing/wood, /turf/open/floor/blocks, @@ -9040,16 +8656,6 @@ /obj/structure/stairs, /turf/open/floor/wood, /area/outdoors/beach/boat) -"ejL" = ( -/obj/structure/fluff/railing/wood{ - dir = 1 - }, -/obj/structure/fluff/railing/wood{ - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "ejO" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -9147,15 +8753,6 @@ /obj/structure/flora/grass/bush, /turf/open/floor/grass/eora, /area/outdoors/eora) -"enc" = ( -/obj/structure/rack/shelf, -/obj/effect/decal/carpet/square/black{ - pixel_x = -13; - pixel_y = 16 - }, -/obj/structure/rack/shelf/big, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/blue) "eng" = ( /obj/structure/chair/stool, /turf/open/floor/tile/bath/pool{ @@ -9289,23 +8886,6 @@ /obj/structure/fake_machine/atm, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/throne) -"epD" = ( -/obj/structure/well, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) -"epI" = ( -/obj/structure/closet/crate/crafted_closet/crafted, -/obj/item/clothing/shoes/nobleboot, -/obj/item/clothing/head/courtierhat, -/obj/item/clothing/shirt/tunic/noblecoat, -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/item/clothing/pants/trou/leather/quiltedkilt/colored/blue, -/obj/item/clothing/shirt/undershirt/sash/colored/blue, -/obj/item/clothing/cloak/raincloak/colored/blue, -/obj/item/clothing/shirt/dress/gown/wintergown, -/obj/item/clothing/pants/tights/colored/black, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "epK" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -9809,14 +9389,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hexstone, /area/indoors/town/clocktower) -"eDn" = ( -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/effect/mapping_helpers/access/locker, -/obj/structure/door{ - name = "Blue Noble Manor" - }, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "eDD" = ( /obj/structure/chair/bench/couch/right, /obj/structure/rack/shelf, @@ -9996,12 +9568,6 @@ dir = 8 }, /area/indoors/town) -"eIG" = ( -/obj/structure/stairs/stone{ - dir = 8 - }, -/turf/open/floor/blocks, -/area/outdoors/town/noble_manor/blue) "eII" = ( /obj/structure/fluff/walldeco/vinez, /turf/closed/wall/mineral/stone, @@ -10099,10 +9665,6 @@ }, /turf/open/floor/tile/bath, /area/indoors/town/bath) -"eKg" = ( -/obj/structure/flora/tree/dying_bush, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "eKi" = ( /obj/structure/door/stone, /obj/effect/mapping_helpers/access/keyset/church/general, @@ -10114,15 +9676,6 @@ /obj/item/weapon/mace/woodclub, /turf/open/floor/cobble/mossy, /area/outdoors/town/keep) -"eKs" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/obj/structure/table/wood/reinforced_alter, -/obj/structure/fluff/globe{ - pixel_x = -1; - pixel_y = 14 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "eKR" = ( /obj/structure/ladder, /turf/open/floor/cobblerock, @@ -10304,10 +9857,6 @@ /obj/machinery/light/fueled/wallfire/candle/l, /turf/open/floor/carpet/green, /area/indoors/town/merc_guild) -"eOP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/red) "eOW" = ( /obj/structure/closet/crate/chest/wicker, /obj/item/needle/thorn, @@ -10565,10 +10114,6 @@ }, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/merc_guild) -"eUB" = ( -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "eUK" = ( /obj/structure/fluff/walldeco/church/line{ dir = 8 @@ -11010,10 +10555,6 @@ /obj/structure/door, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/keep/gate) -"ffg" = ( -/obj/machinery/light/fueled/hearth/big_fireplace, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/red) "ffh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/fancy/purple, @@ -11021,15 +10562,6 @@ /obj/item/bouquet/rosa, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town) -"ffl" = ( -/obj/structure/chair/bench/couch/right, -/obj/structure/rack/shelf, -/obj/item/carvedgem/coral/fish{ - pixel_y = 37; - sellprice = 1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "ffp" = ( /obj/machinery/light/fueled/wallfire/candle/l, /obj/structure/toilet, @@ -11198,16 +10730,6 @@ /obj/structure/stairs, /turf/open/floor/dirt/road, /area/under/town/sewer) -"fkm" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/fluff/railing/tall{ - dir = 4 - }, -/obj/structure/flora/grass/bush_meagre, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "fkq" = ( /obj/machinery/essence/reservoir, /obj/structure/table/wood{ @@ -11444,10 +10966,6 @@ }, /turf/open/floor/ruinedwood/darker, /area/indoors/town/merc_guild) -"fqe" = ( -/obj/machinery/light/fueled/wallfire/candle/weak, -/turf/open/water/bath, -/area/indoors/town/noble_manor/blue) "fqj" = ( /obj/structure/closet/crate/crafted_closet, /obj/item/natural/cloth, @@ -11782,11 +11300,6 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/town/roofs) -"fzy" = ( -/obj/structure/flora/tree/dying_bush, -/obj/structure/flora/grass/bush_meagre, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "fzA" = ( /obj/effect/waterfall, /turf/open/water/river{ @@ -12196,10 +11709,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/indoors/town) -"fJZ" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "fKt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/broom, @@ -12227,11 +11736,6 @@ /obj/structure/flora/shells, /turf/open/floor/grass, /area/outdoors/beach) -"fKN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bookcase/random, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "fKX" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/fueled/wallfire/candle/weak, @@ -12344,13 +11848,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/tile, /area/indoors/town/keep/servant) -"fNH" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "fNZ" = ( /obj/structure/rack/shelf/biggest, /obj/item/needle, @@ -12374,13 +11871,6 @@ }, /turf/open/openspace, /area/outdoors/woods_safe) -"fOv" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/openclose/reinforced{ - dir = 8 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "fOx" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass, @@ -12412,10 +11902,6 @@ }, /turf/open/floor/wood, /area/indoors/town/tavern) -"fOS" = ( -/obj/structure/flora/newtree, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "fPe" = ( /turf/open/floor/cobblerock/alt, /area/indoors/town/noble_manor/blue) @@ -12525,10 +12011,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/ruinedwood, /area/indoors/town) -"fRh" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "fRm" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dirt, @@ -12706,10 +12188,6 @@ /obj/effect/spawner/map_spawner/tallgrass, /turf/open/floor/dirt, /area/indoors/dungeon) -"fWw" = ( -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "fWy" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -13027,10 +12505,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/cobble, /area/under/town/basement) -"gfE" = ( -/obj/structure/closet/crate/chest/old_crate, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "gfU" = ( /turf/open/floor/greenstone, /area/indoors/town/orphanage) @@ -13364,10 +12838,6 @@ /obj/structure/table/wood/plain_alt, /turf/open/floor/churchmarble, /area/indoors/town/clinic_large) -"gpq" = ( -/obj/structure/bars, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "gpx" = ( /obj/machinery/light/fueled/wallfire/candle/l, /obj/machinery/light/fueled/wallfire/candle{ @@ -13624,10 +13094,6 @@ }, /turf/closed/wall/mineral/wood/window, /area/indoors/town) -"gvy" = ( -/obj/structure/bookcase/random, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "gvM" = ( /obj/effect/decal/remains/human, /turf/open/floor/carpet/royalblack, @@ -13853,13 +13319,6 @@ /obj/effect/landmark/start/vagrant, /turf/open/floor/dirt/road, /area/outdoors/exposed/church/graveyard) -"gBB" = ( -/obj/structure/flora/grass/bush_meagre, -/obj/structure/fluff/walldeco/customflag{ - pixel_x = -32 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "gBI" = ( /turf/open/floor/herringbone, /area/indoors/town/keep/gate) @@ -13868,10 +13327,6 @@ /obj/structure/curtain/bounty/dir, /turf/open/floor/blocks, /area/indoors/town/steward) -"gCf" = ( -/obj/structure/fluff/walldeco/vinez, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/blue) "gCg" = ( /obj/structure/table/wood{ icon_state = "largetable" @@ -13993,10 +13448,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/dirt/road, /area/indoors/town/church/inquisition) -"gFl" = ( -/obj/structure/flora/grass/bush_meagre, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "gFo" = ( /obj/machinery/light/fueled/wallfire/candle/blue/r, /turf/open/floor/cobblerock, @@ -14014,10 +13465,6 @@ /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town) -"gFK" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "gFW" = ( /obj/machinery/light/fueled/wallfire/candle/blue, /obj/structure/table/wood/plain_alt, @@ -14255,11 +13702,6 @@ "gNo" = ( /turf/open/floor/carpet/green, /area/indoors/town) -"gNr" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueledstreet/orange, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "gNv" = ( /obj/item/grown/log/tree/stick, /obj/structure/flora/grass, @@ -14374,11 +13816,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue/l, /turf/open/floor/cobblerock, /area/indoors/town/keep/magician) -"gRf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cobblerockedge/alt, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "gRl" = ( /obj/structure/flora/grass/bush, /obj/structure/flora/grass, @@ -14505,14 +13942,6 @@ }, /turf/open/floor/church, /area/indoors/town/church) -"gUD" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/tree/dead_bush, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "gUF" = ( /obj/structure/stairs/stone{ dir = 4 @@ -14788,15 +14217,6 @@ }, /turf/open/floor/grass, /area/outdoors/town) -"hav" = ( -/obj/structure/fluff/railing/border{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/flora/grass/herb/rosa, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/grass, -/area/indoors/town/noble_manor/blue) "haA" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass, @@ -15046,10 +14466,6 @@ "hhW" = ( /turf/open/floor/carpet/lord/left, /area/indoors/town/keep/throne) -"hiI" = ( -/obj/structure/bars/cemetery, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "hiR" = ( /obj/machinery/light/fueled/wallfire/candle, /obj/structure/table/wood/counter/end{ @@ -15201,12 +14617,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/cobble, /area/under/town/basement) -"hmQ" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 4 - }, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "hmV" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass, @@ -15496,12 +14906,6 @@ /obj/structure/chair/bench/coucha/r, /turf/open/floor/tile/masonic, /area/indoors/town/keep/lord_appt) -"htO" = ( -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 4 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "hub" = ( /obj/structure/wallladder{ dir = 8 @@ -15541,10 +14945,6 @@ "hux" = ( /turf/open/floor/hexstone, /area/indoors/town/church) -"huA" = ( -/obj/item/bin/water, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/blue) "huQ" = ( /obj/structure/door/violet, /obj/effect/mapping_helpers/access/keyset/manor/mage, @@ -15625,10 +15025,6 @@ /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/adv_guild) -"hwE" = ( -/obj/structure/chair/bench, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "hwV" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt/dust, @@ -15810,11 +15206,6 @@ /obj/effect/spawner/map_spawner/loot/armor, /turf/open/floor/twig, /area/under/town/sewer) -"hzL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/carpet/blue, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "hzM" = ( /turf/open/water/ocean, /area/outdoors/beach) @@ -16285,9 +15676,6 @@ "hJR" = ( /turf/open/floor/grass/yel, /area/outdoors/basin/safe) -"hJX" = ( -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/red) "hJY" = ( /obj/structure/door{ name = "LUXURY ROOM III" @@ -16515,21 +15903,6 @@ /obj/structure/chair/bench/ultimacouch, /turf/open/floor/carpet, /area/indoors/town) -"hPS" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/meat/steak, -/obj/item/reagent_containers/food/snacks/butter, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "hPZ" = ( /obj/structure/bars/cemetery, /turf/open/floor/blocks, @@ -16540,10 +15913,6 @@ }, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/keep/magician) -"hQH" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "hQK" = ( /obj/structure/closet/crate/crafted_closet, /obj/item/candle/yellow, @@ -16839,13 +16208,6 @@ /obj/structure/stairs, /turf/open/floor/ruinedwood/turned, /area/indoors/town) -"hYb" = ( -/obj/effect/decal/carpet{ - pixel_x = 16; - pixel_y = -12 - }, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/red) "hYe" = ( /turf/open/floor/blocks, /area/indoors/town/keep/jester) @@ -17075,10 +16437,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/twig, /area/indoors/town/church/inquisition) -"ieM" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/red) "ieW" = ( /obj/structure/chair/stool{ pixel_x = -8; @@ -17211,19 +16569,10 @@ /obj/item/reagent_containers/food/snacks/produce/swampweed_dried, /turf/open/floor/wood, /area/indoors/town) -"ihb" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cobblerockedge/alt, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "ihj" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/dirt, /area/outdoors/woods_safe) -"ihH" = ( -/obj/structure/fermentation_keg/random/water, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "ihN" = ( /obj/structure/window/openclose{ dir = 4 @@ -17597,21 +16946,6 @@ /obj/structure/bookcase/random, /turf/open/floor/wood, /area/indoors/town/noble_manor/yellow) -"iqS" = ( -/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ - pixel_x = 6; - pixel_y = -5 - }, -/obj/item/reagent_containers/food/snacks/produce/vegetable/potato{ - pixel_x = 7; - pixel_y = 3 - }, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/blue) "irg" = ( /obj/structure/fake_machine/scomm/r, /obj/structure/fluff/walldeco/church/line{ @@ -17885,13 +17219,6 @@ }, /turf/open/openspace, /area/outdoors/town) -"ivq" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cobblerockedge/alt{ - dir = 10 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "ivu" = ( /obj/structure/chair/stool, /turf/open/floor/cobblerock, @@ -18013,10 +17340,6 @@ "izm" = ( /turf/closed/wall/mineral/wooddark/horizontal, /area/indoors/town/keep/throne) -"izx" = ( -/obj/structure/closet/crate/chest/gold, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "izC" = ( /obj/item/reagent_containers/food/snacks/hardtack, /turf/open/floor/hay, @@ -18483,9 +17806,6 @@ }, /turf/open/floor/blocks, /area/indoors/dungeon) -"iJr" = ( -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "iJy" = ( /obj/structure/bars/cemetery, /turf/open/floor/blocks, @@ -18549,12 +17869,6 @@ "iKO" = ( /turf/open/floor/wood, /area/indoors/town/noble_manor/yellow) -"iKR" = ( -/obj/structure/chair/stool{ - pixel_y = 5 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "iLg" = ( /obj/structure/fluff/railing/border{ dir = 8 @@ -18617,11 +17931,6 @@ /mob/living/simple_animal/hostile/retaliate/trufflepig/male, /turf/open/floor/dirt/road, /area/outdoors/farm) -"iMm" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/reagent_containers/peppermill, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "iMt" = ( /obj/structure/stairs/stone, /turf/open/floor/cobble, @@ -19291,10 +18600,6 @@ }, /turf/open/floor/dirt, /area/outdoors/exposed/church/graveyard) -"jbX" = ( -/obj/structure/bars/cemetery, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "jct" = ( /obj/structure/bed/wool, /obj/item/bedsheet/fabric, @@ -19520,16 +18825,9 @@ }, /turf/open/floor/tile, /area/indoors/town/keep/throne) -"jgm" = ( -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "jgz" = ( /turf/closed/wall/mineral/wooddark/end, /area/indoors/soilsons) -"jgH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "jgS" = ( /obj/effect/decal/borderfall{ dir = 1 @@ -19557,12 +18855,6 @@ }, /turf/open/floor/cobblerock, /area/under/cave) -"jiw" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 6 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "jiA" = ( /obj/effect/landmark/start/priest, /obj/effect/decal/carpet/kover_purple{ @@ -19721,14 +19013,6 @@ }, /turf/open/floor/blocks/stonered/tiny, /area/indoors/town/keep/feast) -"jlT" = ( -/obj/structure/door/iron/bars{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/red) "jlV" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_y = -32 @@ -19819,10 +19103,6 @@ /obj/structure/fluff/walldeco/church/line, /turf/open/floor/churchrough, /area/indoors/town/church/chapel) -"jno" = ( -/obj/effect/decal/cobblerockedge/alt, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "jnE" = ( /obj/structure/table/wood/plain_alt, /obj/item/reagent_containers/glass/cup, @@ -19912,16 +19192,6 @@ }, /turf/open/floor/metal/barograte, /area/indoors/town/clocktower) -"jpp" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/fluff/statue/small{ - pixel_x = -1; - pixel_y = 6 - }, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "jpA" = ( /turf/closed/mineral/random/med_nonval, /area/under/cave) @@ -19971,13 +19241,6 @@ }, /turf/open/floor/grass/eora, /area/outdoors/eora) -"jrc" = ( -/obj/structure/closet/crate/chest/gold, -/obj/item/clothing/ring/gold/rontz{ - sellprice = 1 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "jrh" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/dirt, @@ -19992,10 +19255,6 @@ "jru" = ( /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) -"jrz" = ( -/obj/structure/flora/grass, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "jrH" = ( /obj/structure/table/wood{ dir = 4; @@ -20023,11 +19282,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue, /turf/open/floor/blocks/stonered/tiny, /area/indoors/town/clinic_large/apothecary) -"jsb" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "jsh" = ( /obj/structure/bed/hay, /obj/effect/landmark/start/fisher{ @@ -20097,11 +19351,6 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/cobble, /area/under/town/basement) -"jts" = ( -/obj/structure/bed/wool/double, -/obj/item/bedsheet/double_pelt, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "jtt" = ( /obj/structure/closet/crate/crafted_closet{ name = "Medical Attire" @@ -20216,10 +19465,6 @@ /obj/structure/hotspring/border/two, /turf/open/water, /area/outdoors/eora) -"jwb" = ( -/obj/structure/flora/grass, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/red) "jwc" = ( /obj/structure/fluff/buysign{ name = "Train Station South" @@ -20235,22 +19480,6 @@ /obj/structure/flora/grass/bush/wall, /turf/open/floor/grass/red, /area/outdoors/woods_safe) -"jwp" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "jwq" = ( /obj/structure/door{ name = "Clock Tower" @@ -20269,16 +19498,6 @@ }, /turf/open/floor/grass, /area/outdoors/farm) -"jwy" = ( -/obj/structure/rack, -/obj/item/clothing/head/crown/circlet/coral{ - sellprice = 1 - }, -/obj/item/clothing/neck/coralamulet{ - sellprice = 1 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "jwG" = ( /turf/closed/basic, /area/indoors/town/merc_guild) @@ -20691,10 +19910,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) -"jFr" = ( -/obj/machinery/light/fueledstreet/orange, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "jFs" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -20806,11 +20021,6 @@ /obj/machinery/light/fueled/torchholder/l, /turf/open/openspace, /area/indoors/town/garrison) -"jHE" = ( -/obj/structure/flora/grass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "jHI" = ( /obj/structure/bed/wool, /obj/item/bedsheet/pelt, @@ -20886,12 +20096,6 @@ /obj/structure/table/stone_small, /turf/open/floor/churchbrick, /area/under/cave) -"jJh" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 10 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "jJt" = ( /obj/structure/fluff/railing/border{ dir = 8 @@ -20899,10 +20103,6 @@ /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/churchbrick, /area/indoors/town/keep/halls) -"jJu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "jJA" = ( /obj/item/natural/stone{ pixel_x = -3; @@ -21032,21 +20232,6 @@ /obj/structure/chair/bench/coucha, /turf/open/floor/carpet/royalblack, /area/indoors/town/smithy) -"jNe" = ( -/obj/structure/closet/crate/crafted_closet/crafted, -/obj/item/clothing/shoes/nobleboot, -/obj/item/clothing/head/courtierhat, -/obj/item/clothing/head/chaperon/colored, -/obj/item/clothing/cloak/half/colored/red, -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/item/clothing/shirt/ornate/dress, -/obj/item/clothing/shirt/ornate/tunic, -/obj/item/clothing/cloak/raincloak/colored/red, -/obj/item/clothing/pants/skirt/patkilt/colored/red, -/obj/item/clothing/pants/tights/colored/black, -/obj/item/clothing/head/helmet/leather/headscarf/colored/red, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "jNH" = ( /obj/structure/bed/mediocre, /obj/item/bedsheet/pelt, @@ -21471,11 +20656,6 @@ /obj/structure/fluff/steamvent, /turf/open/floor/cobblerock, /area/outdoors/town) -"jZJ" = ( -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/reagent_containers/food/snacks/veg/onion_sliced, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/red) "kaK" = ( /obj/structure/industrial_lift/tram{ icon_state = "vertw" @@ -21504,15 +20684,6 @@ /obj/structure/closet/crate/miningcar, /turf/open/floor/naturalstone, /area/under/cave) -"kbq" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "kbv" = ( /obj/machinery/light/fueled/wallfire/candle/r, /obj/structure/rack/shelf/biggest, @@ -21637,9 +20808,6 @@ }, /turf/closed/basic, /area/indoors/town/merc_guild) -"kdk" = ( -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "kdn" = ( /obj/machinery/light/fueled/torchholder{ pixel_y = 26 @@ -21685,15 +20853,6 @@ }, /turf/open/floor/ruinedwood/darker, /area/indoors/town/merc_guild) -"keP" = ( -/obj/machinery/light/fueled/hearth, -/obj/item/reagent_containers/glass/bucket/pot/stone, -/obj/structure/rack/shelf, -/obj/item/reagent_containers/glass/carafe/teapot{ - pixel_y = 44 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "kfp" = ( /obj/structure/water_pipe, /turf/open/floor/dirt/road, @@ -21951,10 +21110,6 @@ }, /turf/open/floor/cobble, /area/under/town/basement) -"kkd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/stonebrick, -/area/indoors/town/noble_manor/blue) "kki" = ( /obj/structure/table/wood/plain_alt, /obj/item/storage/sack, @@ -22308,13 +21463,6 @@ /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/tile, /area/indoors/town/keep/courtagent) -"ksR" = ( -/obj/structure/handcart, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/rope, -/obj/machinery/light/fueled/wallfire/candle/lamp, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "ktf" = ( /obj/structure/flora/grass/water/reeds, /obj/structure/flora/grass/water/reeds, @@ -22410,10 +21558,6 @@ }, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/merc_guild) -"kvl" = ( -/obj/structure/fluff/clock, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "kvt" = ( /obj/structure/fluff/railing/border, /turf/open/floor/carpet/royalblack, @@ -22445,17 +21589,6 @@ }, /turf/open/floor/blocks, /area/indoors/town/cell) -"kwx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/bench/couch/left, -/obj/structure/rack/shelf, -/obj/item/carvedgem/turq/figurine{ - pixel_x = 16; - pixel_y = 41; - sellprice = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "kwH" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = -32; @@ -22749,9 +21882,6 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/town/roofs) -"kEY" = ( -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "kFk" = ( /obj/structure/pottery_lathe, /turf/open/floor/dirt/road, @@ -23152,11 +22282,6 @@ dir = 4 }, /area/indoors/town/keep/magician) -"kPb" = ( -/obj/structure/flora/tree/dying_bush, -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "kPc" = ( /turf/open/floor/carpet/lord/left{ dir = 1 @@ -23318,11 +22443,6 @@ /obj/item/clothing/pants/tights/colored/black, /turf/open/floor/woodturned, /area/indoors/town/keep/knight) -"kSF" = ( -/obj/machinery/light/fueled/oven/south, -/obj/item/reagent_containers/glass/bucket/pot, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "kSJ" = ( /obj/effect/decal/carpet/square/black{ pixel_x = 16; @@ -23395,10 +22515,6 @@ }, /turf/open/floor/cobble, /area/indoors/town/cell) -"kVl" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "kVp" = ( /turf/open/water/bath, /area/indoors/town/merc_guild) @@ -23519,15 +22635,6 @@ /obj/structure/table/wood/reinforced_alter, /turf/open/floor/concrete, /area/indoors/town) -"kXd" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0 - }, -/obj/structure/carpet/blue, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "kXg" = ( /obj/structure/fluff/statue/femalestatue{ icon_state = "5" @@ -23666,14 +22773,6 @@ /obj/structure/fermentation_keg/beer, /turf/open/floor/ruinedwood/turned/alt, /area/indoors/town/tavern) -"kZX" = ( -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "lae" = ( /obj/structure/bookcase/random/archive, /obj/structure/fluff/walldeco/customflag{ @@ -23999,13 +23098,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/outdoors/town) -"lgI" = ( -/obj/structure/flora/grass/bush_meagre, -/obj/structure/fluff/walldeco/customflag{ - pixel_x = -32 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "lgM" = ( /obj/structure/fluff/railing/wood{ dir = 4; @@ -24040,9 +23132,6 @@ /obj/effect/landmark/events/haunts, /turf/open/floor/cobble, /area/outdoors/town) -"lhT" = ( -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/blue) "lih" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/cobblerock, @@ -24267,11 +23356,6 @@ /obj/item/book/bibble, /turf/open/floor/tile/masonic, /area/indoors/town/keep/lord_appt) -"lns" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/reagent_containers/peppermill, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "lnt" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/cobblerock, @@ -24355,12 +23439,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/blocks, /area/indoors/town/cell) -"lph" = ( -/obj/structure/chair/bench/couch/alt, -/obj/effect/landmark/start/minor_noble, -/obj/structure/carpet/red, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "lpt" = ( /obj/structure/bed/hay, /obj/effect/landmark/start/fisher{ @@ -24491,7 +23569,7 @@ /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) "lsZ" = ( -/turf/closed/wall/mineral/craftstone, +/turf/open/openspace, /area/indoors/town/noble_manor/blue) "lte" = ( /obj/structure/table/wood{ @@ -24594,26 +23672,6 @@ }, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/shop) -"lvt" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/natural/feather{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "lvu" = ( /obj/structure/door/fancy{ name = "Green Noble Manor" @@ -24867,10 +23925,6 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/town) -"lCO" = ( -/obj/structure/bookcase/random, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "lDf" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -24910,13 +23964,6 @@ "lEh" = ( /turf/open/floor/carpet/lord/corner, /area/indoors/town/keep/halls/w) -"lEz" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass/bush, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "lED" = ( /obj/structure/flora/grass, /turf/open/floor/grass/red, @@ -25110,17 +24157,6 @@ }, /turf/open/floor/greenstone, /area/indoors/town/dwarfin) -"lJk" = ( -/obj/structure/closet/crate/crafted_closet, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/broom, -/obj/item/flint, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "lJr" = ( /obj/structure/door/fancy{ name = "Keep Entrance" @@ -25214,15 +24250,6 @@ /obj/structure/bars, /turf/open/floor/blocks, /area/under/town/sewer) -"lLd" = ( -/obj/structure/table/map{ - dir = 10 - }, -/obj/item/plate/coral{ - sellprice = 1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "lLn" = ( /turf/open/floor/ruinedwood/chevron, /area/indoors/town/steward) @@ -25291,14 +24318,6 @@ /obj/effect/mapping_helpers/structure/grave_spawner/t3/_tennite, /turf/open/floor/dirt, /area/outdoors/town/keep) -"lNk" = ( -/obj/structure/fluff/railing/wood{ - dir = 4; - pixel_x = 1 - }, -/obj/structure/fermentation_keg/water, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "lNp" = ( /turf/open/water/river, /area/outdoors/eora) @@ -25548,9 +24567,6 @@ /obj/structure/dye_bin/luxury, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/keep/servant) -"lSc" = ( -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/red) "lSM" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/wood, @@ -25894,9 +24910,6 @@ /obj/structure/bars, /turf/open/floor/cobble, /area/under/dungeon) -"lZc" = ( -/turf/closed/wall/mineral/decowood, -/area/indoors/town/noble_manor/red) "lZq" = ( /obj/item/recipe_book/cooking{ pixel_x = -4; @@ -25979,26 +24992,12 @@ "map" = ( /turf/closed/mineral/random/high_nonval, /area/under/cave) -"maH" = ( -/obj/structure/fluff/railing/border{ - dir = 4 - }, -/obj/structure/flora/grass/herb/calendula, -/obj/structure/wild_plant/nospread/sunflower, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/red, -/area/indoors/town/noble_manor/red) "maN" = ( /obj/structure/fluff/walldeco/bath/wallpipes/innie{ dir = 8 }, /turf/closed/wall/mineral/stonebrick, /area/under/town/basement) -"maR" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "maX" = ( /obj/effect/turf_decal/magedecal{ icon_state = "imbuement" @@ -26173,11 +25172,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/blocks, /area/indoors/dungeon) -"mgk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/map_spawner/hauntz_random, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "mgC" = ( /obj/structure/table/wood{ dir = 9; @@ -26337,13 +25331,6 @@ dir = 1 }, /area/outdoors/town) -"mkS" = ( -/obj/structure/door/weak/bolt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/red) "mkW" = ( /obj/structure/fluff/walldeco/church/line, /obj/structure/fluff/walldeco/church/line{ @@ -26953,15 +25940,6 @@ /obj/structure/chair/wood/alt, /turf/open/floor/concrete, /area/indoors/town/dwarfin) -"mAe" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 10 - }, -/obj/effect/decal/cobblerockedge/alt{ - dir = 4 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "mAf" = ( /obj/structure/fluff/walldeco/vinez, /turf/closed/wall/mineral/stone/moss, @@ -27128,12 +26106,6 @@ }, /turf/open/floor/cobblerock, /area/outdoors/town) -"mCh" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 10 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "mCk" = ( /obj/structure/rack/shelf/biggest, /obj/item/reagent_containers/glass/bottle/whitewine, @@ -27268,14 +26240,6 @@ /obj/machinery/light/fueled/firebowl/standing/blue, /turf/open/floor/churchrough, /area/indoors/town/clinic_large) -"mGh" = ( -/obj/structure/fluff/railing/tall{ - dir = 4 - }, -/obj/structure/flora/grass/bush_meagre, -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "mGi" = ( /obj/structure/fermentation_keg/random/water, /turf/open/floor/ruinedwood/spiral, @@ -27681,10 +26645,6 @@ /obj/machinery/light/fueled/wallfire/candle, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/garrison) -"mOU" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/water/bath, -/area/indoors/town/noble_manor/red) "mOW" = ( /obj/effect/landmark/tram/queued_path{ next_path_id = "cargo_return_2"; @@ -27846,14 +26806,6 @@ }, /turf/open/floor/wood, /area/indoors/town/church/chapel) -"mRB" = ( -/obj/structure/door/iron/bars{ - name = "Blue Noble Vault" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "mRI" = ( /obj/structure/fermentation_keg/water, /turf/open/floor/blocks, @@ -28027,12 +26979,6 @@ /obj/structure/table/wood/crafted, /turf/open/floor/carpet/royalblack, /area/indoors/town/church/inquisition) -"mXZ" = ( -/obj/effect/landmark/start/minor_noble, -/obj/structure/chair/wood/alt/chair_noble, -/obj/structure/carpet/blue, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "mYr" = ( /obj/structure/fluff/railing/wood{ dir = 4 @@ -28079,10 +27025,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/carpet/green, /area/indoors/town/adv_guild) -"mYZ" = ( -/obj/structure/wild_plant/nospread/sunflower, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "mZm" = ( /obj/machinery/light/fueled/torchholder{ dir = 1 @@ -28157,21 +27099,6 @@ "nam" = ( /turf/open/floor/dirt/road, /area/under/cave) -"nao" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/clothing/face/cigarette/pipe/westman, -/obj/item/reagent_containers/food/snacks/produce/dry_westleach, -/obj/structure/fluff/globe{ - pixel_x = -1; - pixel_y = 14 - }, -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/item/lipstick/blue{ - pixel_x = 1; - pixel_y = -20 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "naq" = ( /obj/structure/window/solid, /obj/structure/bars/passage/shutter/open{ @@ -28271,9 +27198,6 @@ /obj/structure/bars/cemetery, /turf/open/floor/dirt, /area/under/town/basement) -"ncK" = ( -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/red) "ndb" = ( /obj/structure/fluff/walldeco/bath/wallpipes{ dir = 8; @@ -28384,12 +27308,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) -"nfh" = ( -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "nfk" = ( /obj/structure/window/solid, /obj/structure/barricade/wooden, @@ -28528,11 +27446,6 @@ /obj/machinery/light/fueled/wallfire/candle/l, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town) -"nhZ" = ( -/obj/structure/flora/tree/burnt, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "nib" = ( /obj/structure/table/wood/large_new{ dir = 5; @@ -28580,15 +27493,6 @@ }, /turf/open/floor/cobble/alt, /area/under/town/sewer) -"njk" = ( -/obj/structure/well/fountain, -/obj/structure/fluff/statue/small{ - pixel_x = 16; - pixel_y = 39; - density = 0 - }, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "njn" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass/red, @@ -28650,27 +27554,10 @@ /obj/structure/chair/stool, /turf/open/floor/greenstone, /area/under/town/sewer) -"nkm" = ( -/obj/structure/rack/shelf/biggest, -/obj/item/reagent_containers/glass/bottle/wine{ - pixel_x = 6; - pixel_y = 17 - }, -/obj/item/clothing/head/crown/circlet/turq{ - sellprice = 1 - }, -/obj/item/clothing/neck/turqamulet{ - sellprice = 1 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "nkE" = ( /obj/structure/chair/stool/bar, /turf/open/floor/cobblerock, /area/indoors/town/keep/magician) -"nkM" = ( -/turf/closed/wall/mineral/stonebrick, -/area/indoors/town/noble_manor/blue) "nkN" = ( /obj/effect/decal/cleanable/debris/wood, /turf/open/floor/ruinedwood/turned/darker, @@ -28752,14 +27639,6 @@ }, /turf/open/floor/cobblerock, /area/indoors/town/church) -"nnq" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/obj/item/reagent_containers/food/snacks/produce/coffeebeansroasted, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/red) "nny" = ( /obj/structure/table/wood/reinforced_alter, /obj/item/paper/scroll{ @@ -28882,10 +27761,6 @@ /obj/structure/door/swing, /turf/open/floor/carpet, /area/under/town/sewer) -"nqk" = ( -/obj/machinery/light/fueled/hearth, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "nqs" = ( /obj/effect/decal/carpet{ pixel_y = 16 @@ -28927,11 +27802,6 @@ }, /turf/open/floor/cobble, /area/indoors/dungeon) -"nrH" = ( -/obj/structure/flora/tree/burnt, -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "nrU" = ( /turf/open/floor/ruinedwood/chevron, /area/indoors/town/keep/knight) @@ -29065,14 +27935,6 @@ /obj/structure/fluff/walldeco/sign/tailorsign/left, /turf/open/openspace, /area/outdoors/town) -"nvH" = ( -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/structure/door{ - name = "Blue Noble Manor" - }, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "nvP" = ( /obj/structure/closet/dirthole/grave, /turf/open/floor/dirt/road, @@ -29147,15 +28009,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/concrete, /area/indoors/town/clocktower) -"nym" = ( -/obj/structure/fluff/railing/border{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/hotspring_rocks/grassy, -/turf/open/floor/grass, -/area/indoors/town/noble_manor/blue) "nyn" = ( /obj/structure/table/wood/plain_alt, /obj/item/paper/scroll, @@ -29435,11 +28288,6 @@ /obj/structure/fluff/railing/wood, /turf/open/floor/ruinedwood/turned, /area/outdoors/town) -"nFI" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "nFK" = ( /turf/closed/wall/mineral/decostone/moss/red/cand, /area/indoors/town/church) @@ -29561,10 +28409,6 @@ }, /turf/open/floor/cobblerock, /area/outdoors/town/keep) -"nIU" = ( -/obj/structure/carpet/blue, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "nIX" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = -32; @@ -29644,15 +28488,6 @@ }, /turf/open/floor/cobble, /area/under/dungeon) -"nLp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "nLs" = ( /obj/structure/closet/crate/chest/neu, /obj/item/paper/scroll, @@ -29688,11 +28523,6 @@ /obj/structure/chair/bench/coucha/r, /turf/open/floor/carpet/royalblack, /area/indoors/town/smithy) -"nLR" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/book/manners, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "nMv" = ( /turf/open/water, /area/under/cavewet) @@ -30087,11 +28917,6 @@ /obj/effect/landmark/start/vagrant, /turf/open/floor/grass, /area/outdoors/town) -"nWg" = ( -/obj/item/broom, -/obj/structure/flora/grass, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "nWs" = ( /obj/structure/window/openclose{ dir = 8 @@ -30242,8 +29067,7 @@ /turf/open/floor/grass/red, /area/outdoors/woods_safe) "nZc" = ( -/obj/structure/flora/newtree, -/turf/open/floor/grass/red, +/turf/open/openspace, /area/outdoors/town/noble_manor/red) "nZg" = ( /obj/structure/window/openclose{ @@ -30291,11 +29115,6 @@ /obj/item/clothing/face/spectacles, /turf/open/floor/greenstone/runed, /area/indoors/town/keep/magician) -"oab" = ( -/obj/structure/flora/grass/bush, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "oar" = ( /obj/structure/closet/crate/chest/wicker/random_bee_keeping, /turf/open/floor/twig, @@ -30371,9 +29190,6 @@ /obj/machinery/tanningrack, /turf/open/floor/cobble, /area/indoors/town/church) -"ocq" = ( -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "oct" = ( /obj/structure/rack/shelf/biggest, /obj/item/reagent_containers/glass/bottle/redwine, @@ -30564,10 +29380,6 @@ dir = 4 }, /area/indoors/town/keep/throne) -"ohz" = ( -/obj/structure/bars/cemetery, -/turf/open/floor/blocks, -/area/outdoors/town/noble_manor/blue) "ohC" = ( /obj/machinery/light/fueled/wallfire/candle/blue/r, /obj/structure/chair/stool, @@ -30871,10 +29683,6 @@ /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/grass, /area/outdoors/town) -"onM" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "onW" = ( /obj/structure/bars/cemetery, /turf/open/floor/dirt/road, @@ -30933,12 +29741,6 @@ }, /turf/open/floor/grass, /area/outdoors/town) -"opz" = ( -/obj/structure/fake_machine/mail{ - mailtag = "Blue" - }, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "opH" = ( /obj/structure/fluff/railing/border, /turf/open/floor/ruinedwood/chevron, @@ -31434,12 +30236,6 @@ }, /turf/open/floor/wood, /area/outdoors/beach/boat) -"oxu" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "oxC" = ( /obj/structure/door/iron, /obj/effect/mapping_helpers/access/locker, @@ -31596,10 +30392,6 @@ /obj/structure/fermentation_keg/random/water, /turf/open/floor/tile/kitchen, /area/indoors/town) -"oAQ" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "oAS" = ( /obj/structure/guillotine, /obj/effect/decal/borderfall{ @@ -31755,22 +30547,6 @@ }, /turf/open/floor/cobblerock, /area/outdoors/woods_safe) -"oFw" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "oFz" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/dirt, @@ -32206,9 +30982,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/hexstone, /area/indoors/town) -"oPq" = ( -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "oPs" = ( /turf/open/floor/carpet/red, /area/indoors/town/church/inquisition) @@ -32259,13 +31032,6 @@ /obj/structure/rack/shelf/biggest, /turf/open/floor/churchmarble/violet, /area/indoors/town/church/inquisition) -"oQI" = ( -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "oQZ" = ( /turf/open/floor/woodturned/nosmooth, /area/indoors/town/keep/feast) @@ -32319,9 +31085,6 @@ /obj/effect/mapping_helpers/access/locker, /turf/open/floor/greenstone, /area/under/town/sewer) -"oSq" = ( -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "oSH" = ( /obj/structure/table/wood/counter/end{ dir = 4 @@ -32508,13 +31271,6 @@ /obj/item/reagent_containers/glass/bucket/wooden, /turf/open/floor/cobble, /area/under/town/basement) -"oWM" = ( -/obj/structure/mirror/fancy{ - pixel_x = -31; - pixel_y = -2 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "oWP" = ( /obj/structure/grindwheel{ pixel_y = 15; @@ -32534,10 +31290,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/tile/bfloorz, /area/indoors/town/garrison) -"oWX" = ( -/obj/structure/flora/grass/bush_meagre, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "oWY" = ( /obj/structure/table/wood/plain_alt, /turf/open/floor/ruinedwood/turned/darker, @@ -32699,10 +31451,6 @@ "pbC" = ( /turf/open/floor/concrete, /area/indoors/town/clocktower) -"pbL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/red) "pbM" = ( /obj/structure/fluff/walldeco/bath/wallpipes/innie{ dir = 1; @@ -32755,11 +31503,6 @@ dir = 1 }, /area/indoors/town/keep) -"pcv" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "pcK" = ( /obj/effect/waterfall{ pixel_y = 0 @@ -32865,12 +31608,6 @@ /obj/structure/table/wood/reinf_long, /turf/open/floor/tile/bfloorz, /area/indoors/town/bath) -"pew" = ( -/obj/structure/flora/tree/dead_bush, -/obj/structure/flora/grass, -/obj/machinery/light/fueled/torchholder/metal_torch/east, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "peH" = ( /obj/item/weapon/mace/church, /turf/open/floor/ruinedwood/spiral, @@ -33060,13 +31797,6 @@ }, /turf/open/floor/ruinedwood/spiral, /area/outdoors/river) -"phQ" = ( -/obj/structure/fluff/railing/tall{ - dir = 4 - }, -/obj/structure/flora/grass/bush_meagre, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "pin" = ( /obj/structure/door/iron, /obj/effect/mapping_helpers/access/locker, @@ -33198,11 +31928,6 @@ /obj/structure/fake_machine/mail, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/steward) -"pkR" = ( -/obj/structure/carpet/blue, -/obj/effect/landmark/events/haunts, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "pkZ" = ( /obj/structure/closet/crate/chest{ base_icon_state = "woodchestalt"; @@ -33455,13 +32180,6 @@ /obj/structure/chair/stool, /turf/open/floor/cobble, /area/under/town/sewer) -"ptf" = ( -/obj/structure/chair/stool{ - pixel_y = 5 - }, -/obj/item/weapon/knife/villager, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/blue) "ptw" = ( /obj/structure/fluff/walldeco/gear{ pixel_y = 24 @@ -33709,13 +32427,6 @@ }, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/adv_guild) -"pzJ" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueled/wallfire/candle/lamp{ - pixel_y = -32 - }, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "pAk" = ( /obj/machinery/light/fueled/wallfire/candle/l{ pixel_x = 0; @@ -33803,20 +32514,6 @@ }, /turf/open/floor/concrete, /area/indoors/town/dwarfin) -"pBy" = ( -/obj/structure/rack/shelf, -/obj/structure/closet/crate/crafted_closet, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/broom, -/obj/item/clothing/cloak/apron/cook, -/obj/item/flint, -/obj/item/book/yeoldecookingmanual, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/blue) "pBC" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, /obj/structure/closet/crate/chest/neu, @@ -34009,11 +32706,6 @@ }, /turf/open/floor/metal/barograte, /area/outdoors/town) -"pFQ" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/reagent_containers/food/snacks/meat/salami, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "pFR" = ( /obj/structure/table/wood/plain/alt, /turf/open/floor/churchbrick, @@ -34126,20 +32818,6 @@ }, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/smithy) -"pIk" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) -"pIq" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "pIv" = ( /obj/item/reagent_containers/food/snacks/smallrat, /turf/open/floor/greenstone, @@ -34501,12 +33179,6 @@ }, /turf/open/floor/church, /area/indoors/town/church) -"pQk" = ( -/obj/structure/window/openclose/reinforced{ - dir = 8 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "pQn" = ( /obj/structure/water_pipe, /turf/closed/wall/mineral/stone, @@ -34518,14 +33190,6 @@ /obj/effect/mapping_helpers/access/keyset/manor/atarms, /turf/open/floor/blocks, /area/indoors/town/clocktower) -"pQG" = ( -/obj/structure/closet/keyrack, -/obj/item/key/mnoble3_red, -/obj/item/key/mnoble3_red, -/obj/item/key/mnoble3_red, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "pQT" = ( /obj/structure/bed/wool, /obj/item/bedsheet/wool, @@ -34726,10 +33390,6 @@ }, /turf/open/floor/dirt/road, /area/under/town/basement) -"pUZ" = ( -/obj/structure/flora/grass/bush_meagre/yellow, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "pVb" = ( /obj/structure/rack/shelf/biggest, /obj/item/reagent_containers/glass/bucket/pot, @@ -34887,11 +33547,6 @@ }, /turf/open/floor/churchbrick, /area/outdoors/eora) -"pZD" = ( -/obj/structure/flora/grass, -/obj/structure/flora/tree/burnt, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "qah" = ( /obj/structure/table/wood/counter, /obj/item/candle/skull, @@ -34911,14 +33566,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/openspace, /area/indoors/town/church/inquisition) -"qaW" = ( -/obj/structure/rack/shelf/big, -/obj/structure/rack/shelf, -/obj/item/soap/bath{ - pixel_y = 39 - }, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/red) "qbb" = ( /turf/closed/wall/mineral/stone, /area/indoors/town/shop) @@ -34963,12 +33610,6 @@ }, /turf/open/floor/cobble, /area/under/town/basement) -"qbU" = ( -/obj/structure/bed/wool/double, -/obj/item/bedsheet/double_pelt, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "qcb" = ( /obj/structure/bookcase/random/thesis, /obj/structure/fluff/walldeco/church/line{ @@ -35069,17 +33710,6 @@ }, /turf/open/floor/dirt/road, /area/indoors/town/train_station) -"qfP" = ( -/obj/item/reagent_containers/glass/cup{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/structure/table/map{ - dir = 5 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "qfW" = ( /obj/item/reagent_containers/glass/cup/wooden, /obj/structure/table/wood{ @@ -35152,13 +33782,6 @@ /obj/structure/water_pipe, /turf/closed/wall/mineral/pipe, /area/under/town/basement) -"qgX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cobblerockedge/alt{ - dir = 8 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "qhb" = ( /obj/structure/stairs/stone{ dir = 1 @@ -35468,9 +34091,6 @@ /obj/structure/bars/grille, /turf/open/openspace, /area/indoors/town/garrison) -"qph" = ( -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/blue) "qpj" = ( /obj/item/weapon/mace/church{ pixel_y = 10 @@ -35702,21 +34322,6 @@ /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/woodturned, /area/indoors/town/smithy) -"quO" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 8 - }, -/obj/item/clothing/gloves/leather, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/flashlight/flare/torch/metal, -/obj/item/plate{ - pixel_x = 4 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "qvf" = ( /turf/open/floor/greenstone, /area/under/town/sewer) @@ -35827,14 +34432,6 @@ }, /turf/open/floor/ruinedwood/darker, /area/outdoors/town/roofs) -"qxE" = ( -/obj/structure/carpet/blue, -/obj/structure/chair/bench/couch/lord_secondary, -/obj/machinery/light/fueled/wallfire{ - pixel_y = 32 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "qxH" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -35888,9 +34485,6 @@ }, /turf/open/floor/metal/barograte, /area/under/town/basement) -"qzg" = ( -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "qzr" = ( /obj/structure/closet/crate/crafted_closet, /obj/item/clothing/shirt/dress/silkdress/colored/random, @@ -36359,15 +34953,6 @@ "qJD" = ( /turf/open/floor/wood, /area/outdoors/town) -"qJF" = ( -/obj/structure/fluff/railing/wood{ - dir = 4; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cobblerockedge/alt, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "qJO" = ( /obj/machinery/light/fueled/wallfire/candle/blue{ pixel_x = -32; @@ -36991,10 +35576,6 @@ /obj/structure/fluff/statue/psy, /turf/open/floor/church/purple, /area/indoors/town/church/inquisition) -"qXq" = ( -/obj/structure/bars, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "qXr" = ( /obj/structure/fluff/walldeco/church/line{ dir = 4 @@ -37007,13 +35588,6 @@ "qXw" = ( /turf/open/openspace, /area/indoors/town) -"qXy" = ( -/obj/structure/closet/crate/chest/gold, -/obj/item/gem/red{ - sellprice = 1 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/red) "qXA" = ( /obj/structure/fluff/railing/wood{ dir = 1 @@ -37220,7 +35794,14 @@ /turf/open/floor/cobble, /area/indoors/town/church/crypt) "rdl" = ( -/turf/closed/wall/mineral/craftstone, +/obj/effect/landmark/house_spot/noble{ + save_id = "noble_red"; + property_id = "lodge_two"; + default_template = /datum/map_template/vanderlin_noble_red; + template_x = 29; + template_y = 26 + }, +/turf/open/openspace, /area/outdoors/town/noble_manor/red) "rdw" = ( /obj/machinery/light/fueled/wallfire/candle/r, @@ -37384,10 +35965,6 @@ /obj/structure/bookcase/random_recipes, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/clinic_large/apothecary) -"rgr" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "rgI" = ( /obj/structure/table/wood{ dir = 10; @@ -37403,13 +35980,6 @@ /obj/structure/flora/grass/water, /turf/open/water, /area/under/town/basement) -"rgY" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 10 - }, -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "rgZ" = ( /obj/item/natural/rock/random_ore, /turf/open/water/clean, @@ -37569,14 +36139,6 @@ /obj/item/reagent_containers/food/snacks/produce/tealeaves_dry, /turf/open/floor/ruinedwood/spiral, /area/under/town/basement) -"rkL" = ( -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "rkM" = ( /obj/structure/table/wood/reinf_long{ dir = 4 @@ -37865,9 +36427,6 @@ }, /turf/open/floor/greenstone, /area/indoors/town/dwarfin) -"rrN" = ( -/turf/closed/wall/mineral/stone, -/area/outdoors/town/noble_manor/blue) "rrU" = ( /obj/structure/fluff/clock, /obj/structure/fluff/walldeco/stone{ @@ -37935,10 +36494,6 @@ /obj/item/clothing/head/maidband, /turf/open/floor/wood, /area/indoors/town/keep/servanthead) -"rsJ" = ( -/obj/structure/fermentation_keg/random/water, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "rsV" = ( /obj/structure/flora/grass/bush/wall, /turf/open/floor/grass/red, @@ -37979,10 +36534,6 @@ dir = 8 }, /area/indoors/town/keep/lord_appt) -"ruW" = ( -/obj/item/bin/water, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "rvn" = ( /obj/structure/ladder, /turf/open/floor/ruinedwood/spiral, @@ -39374,10 +37925,6 @@ }, /turf/open/floor/blocks, /area/indoors/town/vault) -"rZp" = ( -/obj/structure/flora/grass/bush_meagre/yellow, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "rZq" = ( /turf/open/floor/grass, /area/under/cave) @@ -39408,10 +37955,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue/r, /turf/open/floor/churchmarble/violet, /area/indoors/town/church/inquisition) -"rZI" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "rZL" = ( /obj/structure/fluff/walldeco/bath/wallpipes/innie{ pixel_y = 20 @@ -39549,22 +38092,6 @@ /obj/machinery/light/fueled/wallfire/candle, /turf/open/floor/ruinedwood/spiral, /area/indoors/town) -"sci" = ( -/obj/structure/chair/bench/couch/left, -/obj/structure/rack/shelf, -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/item/carvedgem/coral/fancyvase{ - pixel_x = 10; - pixel_y = 44; - sellprice = 1 - }, -/obj/item/carvedgem/coral/vase{ - pixel_x = -5; - pixel_y = 41; - sellprice = 1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "scj" = ( /obj/structure/flora/grass, /obj/structure/bars/cemetery, @@ -39616,10 +38143,6 @@ }, /turf/closed/wall/mineral/wooddark/horizontal, /area/outdoors/town/keep) -"sde" = ( -/obj/structure/flora/newtree, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/red) "sdf" = ( /obj/structure/window/solid, /obj/structure/barricade/wooden, @@ -39768,12 +38291,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/outdoors/farm) -"shX" = ( -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "sij" = ( /obj/structure/stairs/fancy/r, /turf/open/floor/carpet/lord/right, @@ -39816,10 +38333,6 @@ /obj/structure/fluff/railing/wood, /turf/open/floor/dirt, /area/outdoors/town) -"siV" = ( -/obj/structure/window/openclose/reinforced, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "siW" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -39972,13 +38485,6 @@ }, /turf/open/floor/churchmarble, /area/indoors/town/keep/phys) -"smf" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "smh" = ( /obj/structure/chair/bench/couch/left/lord_secondary, /turf/open/floor/carpet/royalblack, @@ -40065,9 +38571,6 @@ /obj/structure/closet/crate/chest/wicker, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/shop) -"soG" = ( -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "soQ" = ( /obj/structure/bed/shit, /obj/effect/decal/cleanable/dirt/cobweb{ @@ -40096,10 +38599,6 @@ /obj/structure/carpet/purple, /turf/open/floor/tile/kitchen, /area/indoors/town) -"spu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "spJ" = ( /obj/structure/fluff/walldeco/church/line{ dir = 4 @@ -40158,11 +38657,6 @@ }, /turf/open/floor/church, /area/indoors/town/church) -"srg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "srj" = ( /obj/structure/door/violet{ name = "Warehouse" @@ -40224,13 +38718,6 @@ "ssr" = ( /turf/open/water/river, /area/under/town/basement) -"ssO" = ( -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 1 - }, -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "ssU" = ( /obj/structure/fluff/walldeco/bigpainting, /obj/structure/chair/wood/alt, @@ -40365,28 +38852,11 @@ }, /turf/open/floor/churchmarble/violet, /area/indoors/town/church/inquisition) -"svP" = ( -/obj/item/reagent_containers/food/snacks/produce/vegetable/onion, -/obj/item/reagent_containers/food/snacks/produce/vegetable/onion{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/reagent_containers/food/snacks/produce/vegetable/onion{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "svW" = ( /obj/structure/fermentation_keg/water, /obj/machinery/light/fueled/wallfire/candle, /turf/open/floor/tile, /area/indoors/town/keep/knight) -"svX" = ( -/obj/structure/fermentation_keg/random/water, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/blue) "swi" = ( /obj/structure/fluff/railing/wood, /turf/open/floor/ruinedwood/spiral, @@ -40433,10 +38903,6 @@ }, /turf/open/floor/dirt, /area/outdoors/town) -"sxa" = ( -/obj/structure/fluff/clock, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "sxm" = ( /obj/effect/decal/cleanable/dirt/cobweb{ dir = 8 @@ -40508,11 +38974,6 @@ "syS" = ( /turf/open/floor/tile, /area/indoors/town/church/inquisition) -"sze" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/carpet/red, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "szg" = ( /obj/machinery/light/fueled/firebowl/standing/blue, /turf/open/floor/churchmarble/violet, @@ -40653,10 +39114,6 @@ "sCu" = ( /turf/closed/wall/mineral/roofwall/middle, /area/indoors/town) -"sCy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "sCH" = ( /obj/structure/closet/crate/chest/wicker, /obj/item/paper{ @@ -40714,7 +39171,7 @@ /turf/closed/wall/mineral/roofwall/middle, /area/outdoors/mountains) "sDt" = ( -/turf/closed/wall/mineral/stone, +/turf/open/openspace, /area/indoors/town/noble_manor/red) "sDI" = ( /obj/machinery/light/fueled/wallfire/candle/blue{ @@ -40733,23 +39190,10 @@ }, /turf/closed/wall/mineral/decorstone, /area/under/town/basement) -"sEi" = ( -/obj/structure/fluff/walldeco/customflag{ - pixel_x = -32 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "sEj" = ( /obj/machinery/anvil/crafted, /turf/open/floor/naturalstone, /area/under/town/sewer) -"sEk" = ( -/obj/structure/closet/crate/chest/gold, -/obj/item/clothing/ring/gold/saffira{ - sellprice = 1 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "sEp" = ( /obj/structure/fluff/railing/border{ dir = 8 @@ -40857,12 +39301,6 @@ }, /turf/open/floor/blocks, /area/outdoors/town) -"sGP" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/obj/item/flashlight/flare/torch/metal, -/obj/structure/rack, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "sGU" = ( /obj/structure/fake_machine/scomm/l, /turf/open/floor/twig, @@ -40914,13 +39352,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/church/purple, /area/indoors/town/church/inquisition) -"sHI" = ( -/obj/structure/carpet/blue, -/obj/structure/table/map{ - dir = 10 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "sHK" = ( /obj/machinery/light/fueled/firebowl/standing, /turf/open/floor/dirt, @@ -41000,12 +39431,6 @@ }, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/keep/heir/heir1) -"sJG" = ( -/obj/item/carvedgem/coral/duck{ - sellprice = 1 - }, -/turf/open/water/bath, -/area/indoors/town/noble_manor/red) "sJZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/plain_alt, @@ -41015,11 +39440,6 @@ /obj/structure/stairs/stone/church, /turf/open/floor/church, /area/indoors/town/church) -"sKc" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/book/manners, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "sKk" = ( /obj/structure/fluff/walldeco/church/line, /obj/structure/fluff/walldeco/church/line{ @@ -41091,17 +39511,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town/theatre) -"sLh" = ( -/obj/structure/table/wood/plain_alt, -/obj/structure/fluff/millstone, -/obj/item/kitchen/rollingpin{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/machinery/light/fueled/wallfire/candle, -/obj/item/weapon/knife/villager, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "sLy" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass, @@ -41239,10 +39648,6 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/cobble, /area/under/town/basement) -"sOD" = ( -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "sOF" = ( /obj/structure/table/vtable/v2, /turf/open/floor/dirt/road, @@ -41411,12 +39816,6 @@ /obj/item/reagent_containers/glass/bottle/beer/spottedhen, /turf/open/floor/churchmarble, /area/under/town/basement) -"sSa" = ( -/obj/structure/rack/shelf/biggest, -/obj/item/reagent_containers/glass/bottle/wine, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "sSi" = ( /turf/open/floor/grass, /area/outdoors/town/keep) @@ -41590,13 +39989,6 @@ }, /turf/open/floor/grass/red, /area/outdoors/woods_safe) -"sWy" = ( -/obj/structure/door/fancy{ - name = "Red Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble3, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "sXm" = ( /obj/machinery/light/fueled/wallfire/candle, /obj/structure/toilet/filled, @@ -41879,13 +40271,6 @@ "tfR" = ( /turf/closed/mineral/bedrock, /area/under/cavelava) -"tgb" = ( -/obj/structure/closet/crate/chest/gold, -/obj/item/gem/violet{ - sellprice = 1 - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "tgk" = ( /obj/structure/fluff/railing/border, /obj/structure/fermentation_keg/random/beer, @@ -42031,21 +40416,6 @@ }, /turf/open/openspace, /area/outdoors/river) -"tiJ" = ( -/obj/structure/rack{ - pixel_y = 10 - }, -/obj/item/storage/fancy/cigarettes/zig, -/obj/item/ore/coal{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/flint{ - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "tiV" = ( /obj/item/reagent_containers/food/snacks/smallrat, /turf/open/floor/hay, @@ -42183,13 +40553,6 @@ /obj/structure/roguetent/preopen, /turf/open/floor/grass, /area/outdoors/town) -"tmY" = ( -/obj/structure/carpet/blue, -/obj/structure/table/map{ - dir = 6 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "tng" = ( /obj/structure/fluff/steamvent, /turf/open/floor/metal, @@ -42260,10 +40623,6 @@ }, /turf/open/water/ocean/abyss, /area/outdoors/town) -"tom" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "tot" = ( /obj/structure/door/window{ name = "Dorms" @@ -42274,9 +40633,6 @@ /obj/effect/mapping_helpers/access/keyset/town/matron, /turf/open/floor/ruinedwood/darker, /area/indoors/town) -"toR" = ( -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "toY" = ( /obj/structure/table/wood/counter{ dir = 1 @@ -42386,10 +40742,6 @@ /obj/structure/ladder, /turf/open/floor/ruinedwood/spiral, /area/under/town/basement) -"tsC" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "tsI" = ( /obj/effect/mapping_helpers/access/keyset/manor/vault, /obj/effect/mapping_helpers/access/locker, @@ -42618,13 +40970,6 @@ "txM" = ( /turf/closed/wall/mineral/stone/window, /area/indoors/dungeon) -"tyb" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "tyg" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/carpet/royalblack, @@ -42737,9 +41082,6 @@ /obj/structure/bed/hay, /turf/open/floor/herringbone, /area/indoors/town/church) -"tAA" = ( -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "tAO" = ( /obj/structure/closet/crate/chest/crafted, /obj/effect/decal/cleanable/dirt/dust, @@ -42998,10 +41340,6 @@ /obj/item/canvas/random_painting, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/jester) -"tGO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "tGR" = ( /obj/structure/window/solid, /turf/open/floor/blocks, @@ -43437,15 +41775,6 @@ "tOV" = ( /turf/closed/wall/mineral/craftstone, /area/indoors/town/bath) -"tOW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/door/iron/bars{ - name = "Blue Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "tOY" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = 32; @@ -43453,10 +41782,6 @@ }, /turf/open/floor/carpet/lord/right, /area/indoors/town/keep/halls) -"tPe" = ( -/obj/structure/flora/grass, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/blue) "tPl" = ( /obj/structure/fluff/walldeco/vinez, /obj/structure/fluff/walldeco/vinez, @@ -43474,14 +41799,6 @@ /obj/structure/roguerock, /turf/open/water, /area/under/cavewet) -"tPB" = ( -/obj/structure/table/wood/fancy/red, -/obj/item/book/bibble{ - pixel_x = 1; - pixel_y = -14 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "tPE" = ( /obj/structure/table/wood{ dir = 1; @@ -43855,14 +42172,6 @@ /obj/item/natural/stone, /turf/open/floor/grass, /area/outdoors/basin) -"ubk" = ( -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/obj/structure/door{ - name = "Blue Noble Manor" - }, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/blue) "ubo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -43974,13 +42283,6 @@ }, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/courtagent) -"udc" = ( -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/obj/structure/flora/grass, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "udh" = ( /turf/closed/wall/mineral/decorstone, /area/indoors/town/keep/captain) @@ -44396,15 +42698,6 @@ /obj/machinery/loom, /turf/open/floor/blocks, /area/indoors/town/cell) -"unw" = ( -/obj/structure/fluff/railing/tall{ - dir = 8 - }, -/obj/structure/wild_plant/nospread/sunflower, -/obj/structure/flora/grass/herb/calendula, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/red) "unC" = ( /obj/structure/fluff/walldeco/customflag{ pixel_y = 32 @@ -44628,22 +42921,6 @@ }, /turf/open/floor/concrete, /area/indoors/town/clocktower) -"usq" = ( -/obj/structure/table/map{ - dir = 6 - }, -/obj/structure/carpet/red, -/obj/item/reagent_containers/glass/cup/teacup{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/carvedgem/coral/fork{ - pixel_x = -21; - pixel_y = 4; - sellprice = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "usr" = ( /obj/structure/well/fountain{ pixel_x = -32 @@ -44719,9 +42996,6 @@ }, /turf/open/floor/tile/bath, /area/under/town/basement) -"uun" = ( -/turf/open/water/bath, -/area/indoors/town/noble_manor/blue) "uup" = ( /obj/structure/fluff/railing/border{ dir = 10 @@ -44779,12 +43053,6 @@ }, /turf/open/floor/dirt/road, /area/outdoors/town/noble_manor/yellow) -"uvD" = ( -/obj/structure/closet/crate/drawer, -/obj/item/storage/belt/pouch/coins/mid, -/obj/item/servant_bell, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "uvF" = ( /obj/structure/table/wood/fancy/purple, /obj/item/bouquet/salvia, @@ -45204,9 +43472,6 @@ /obj/structure/flora/grass/herb/salvia, /turf/open/floor/dirt/road, /area/under/cavewet) -"uEh" = ( -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/blue) "uEt" = ( /obj/structure/fluff/signage{ name = "We are sick and tired of repairing these blasted gates everytime you bloody bookworms cast arcyne storm!" @@ -45282,9 +43547,6 @@ /obj/machinery/light/fueledstreet/midlamp, /turf/open/floor/blocks, /area/outdoors/town) -"uGt" = ( -/turf/open/floor/tile/checker, -/area/indoors/town/noble_manor/red) "uGw" = ( /obj/machinery/tanningrack, /obj/item/needle/thorn, @@ -45329,11 +43591,6 @@ /obj/structure/flora/newtree, /turf/open/floor/cobblerock, /area/outdoors/basin) -"uHa" = ( -/obj/structure/bed/hay, -/obj/effect/decal/cleanable/dirt/cobweb, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "uHc" = ( /obj/effect/landmark/house_spot{ template_y = 9; @@ -45889,10 +44146,6 @@ }, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/keep/halls/w) -"uTg" = ( -/obj/structure/bed/hay, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "uTj" = ( /obj/structure/fake_machine/scomm/r, /obj/machinery/light/fueled/wallfire/candle/blue, @@ -45921,11 +44174,6 @@ dir = 8 }, /area/indoors/town/dwarfin) -"uUr" = ( -/obj/machinery/light/fueled/hearth, -/obj/item/cooking/pan, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "uUx" = ( /obj/structure/fluff/railing/wood{ dir = 4 @@ -46249,14 +44497,6 @@ "vaq" = ( /turf/closed/wall/mineral/decorstone, /area/indoors/town/keep/guest/guest1) -"vat" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/structure/mirror/fancy{ - pixel_x = 33; - pixel_y = -1 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "vax" = ( /obj/effect/decal/borderfall{ dir = 1 @@ -46510,12 +44750,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/ruinedwood/darker, /area/indoors/town/theatre) -"vda" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 8 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "vdb" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = -32; @@ -46558,14 +44792,6 @@ /obj/structure/ladder, /turf/open/floor/ruinedwood/spiral, /area/outdoors/town/roofs) -"ved" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/obj/structure/carpet/blue, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "veE" = ( /obj/structure/fluff/statue/gargoyle{ layer = 4.11 @@ -46747,11 +44973,6 @@ }, /turf/open/floor/tile, /area/indoors/town) -"vku" = ( -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/reagent_containers/food/snacks/veg/potato_sliced, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/blue) "vkv" = ( /obj/structure/fluff/walldeco/church/line{ dir = 8 @@ -46906,11 +45127,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/garrison) -"voa" = ( -/obj/structure/rack/shelf/big, -/obj/structure/rack/shelf, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/red) "vob" = ( /obj/machinery/light/fueled/firebowl, /turf/open/floor/dirt, @@ -47285,14 +45501,6 @@ /obj/structure/flora/tree/burnt, /turf/open/floor/cobblerock, /area/under/cavelava) -"vvm" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0 - }, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "vvq" = ( /obj/structure/table/wood/large/corner{ dir = 1 @@ -47580,11 +45788,6 @@ /obj/structure/fake_machine/scomm/r, /turf/open/floor/wood, /area/indoors/town/tavern) -"vBG" = ( -/obj/structure/bookcase/random, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "vBI" = ( /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town/smithy) @@ -47726,12 +45929,6 @@ /obj/effect/decal/cleanable/dirt/cobweb, /turf/open/floor/blocks, /area/under/town/basement) -"vFl" = ( -/obj/structure/well/fountain{ - pixel_x = -16 - }, -/turf/open/floor/cobblerock, -/area/outdoors/town/noble_manor/blue) "vFn" = ( /obj/structure/stairs{ dir = 1 @@ -47780,10 +45977,6 @@ "vGl" = ( /turf/open/floor/twig, /area/under/cave) -"vGo" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/red) "vGI" = ( /obj/effect/decal/cobbleedge/alt{ dir = 10 @@ -47910,11 +46103,6 @@ }, /turf/open/floor/carpet/red, /area/indoors/town/garrison) -"vJb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood/fancy/red, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "vJe" = ( /obj/structure/chair/bench/church{ dir = 1 @@ -48232,9 +46420,6 @@ dir = 1 }, /area/outdoors/river) -"vPq" = ( -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/blue) "vPt" = ( /obj/effect/decal/cleanable/dirt/cobweb/cobweb2{ pixel_x = -5; @@ -48414,14 +46599,6 @@ /obj/structure/fluff/railing/border, /turf/open/floor/ruinedwood/darker, /area/indoors/town/keep/hand) -"vTb" = ( -/obj/structure/closet/keyrack, -/obj/item/key/mnoble1_blue, -/obj/item/key/mnoble1_blue, -/obj/item/key/mnoble1_blue, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "vTj" = ( /obj/structure/fluff/statue/gargoyle/moss, /turf/open/floor/blocks, @@ -48446,14 +46623,6 @@ /obj/item/reagent_containers/food/snacks/meat/mince/fish, /turf/open/floor/woodturned, /area/indoors/town/keep/magician) -"vTx" = ( -/obj/structure/fluff/railing/tall{ - dir = 1 - }, -/obj/structure/flora/grass/bush_meagre, -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "vTP" = ( /mob/living/simple_animal/pet/giraffe, /turf/open/floor/metal/alt, @@ -48632,18 +46801,6 @@ dir = 4 }, /area/outdoors/mountains) -"vYI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_containers/glass/cup{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/reagent_containers/glass/bottle/beer, -/obj/structure/table/map{ - dir = 6 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "vYQ" = ( /obj/machinery/light/fueledstreet{ pixel_y = 23 @@ -49099,14 +47256,6 @@ "wjN" = ( /turf/closed/wall/mineral/decostone/center, /area/indoors/town/clinic_large) -"wjU" = ( -/obj/structure/door{ - name = "Blue Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble1, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/blue) "wjW" = ( /turf/open/floor/ruinedwood/spiral, /area/indoors/town/keep/lord_appt) @@ -49276,12 +47425,6 @@ }, /turf/open/floor/cobble, /area/outdoors/town) -"wmV" = ( -/obj/structure/flora/grass, -/obj/structure/closet/crate/chest/old_crate, -/obj/item/natural/bundle/brick, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "wnc" = ( /obj/structure/table/wood/reinf_long{ dir = 1 @@ -49400,9 +47543,6 @@ /obj/effect/mapping_helpers/access/keyset/town/bathhouse, /turf/open/floor/tile/bfloorz, /area/indoors/town/bath) -"wqt" = ( -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "wqE" = ( /obj/structure/closet/crate/drawer, /turf/open/floor/ruinedwood/alt, @@ -49641,13 +47781,6 @@ /obj/item/bedsheet/fabric_double, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/keep/heir/heir1) -"wvS" = ( -/obj/structure/carpet/red, -/obj/structure/chair/wood/alt/chair_noble/red{ - dir = 4 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "wvX" = ( /obj/structure/door/viewport{ dir = 1 @@ -49696,10 +47829,6 @@ "wwP" = ( /turf/closed/mineral, /area/indoors/town/shop) -"wwZ" = ( -/obj/structure/flora/grass/bush/wall/tall/bog, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "wxh" = ( /obj/structure/closet/crate/drawer, /turf/open/floor/wood, @@ -49833,13 +47962,6 @@ /obj/structure/flora/grass, /turf/open/floor/dirt, /area/outdoors/town/roofs) -"wzw" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "wzC" = ( /obj/structure/table/map/vanderlin{ dir = 10 @@ -50004,22 +48126,12 @@ }, /turf/open/floor/wood, /area/indoors/town) -"wBU" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/red) "wCz" = ( /obj/machinery/light/fueled/torchholder{ dir = 4 }, /turf/open/floor/naturalstone, /area/under/cavewet) -"wCD" = ( -/obj/structure/flora/grass/bush_meagre, -/obj/structure/flora/grass/bush_meagre, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "wCN" = ( /obj/structure/fluff/wallclock, /turf/open/floor/wood, @@ -50278,15 +48390,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/ruinedwood/turned/alt, /area/outdoors/town) -"wHh" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/reagent_containers/glass/carafe, -/obj/item/reagent_containers/glass/cup{ - pixel_x = -8; - pixel_y = -4 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "wHm" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = -32; @@ -50449,12 +48552,6 @@ }, /turf/open/openspace, /area/indoors/town/garrison) -"wLd" = ( -/obj/effect/decal/cobblerockedge/alt{ - dir = 6 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "wLj" = ( /obj/structure/chair/bench/coucha/redleft, /obj/effect/decal/carpet{ @@ -50494,13 +48591,6 @@ }, /turf/open/floor/churchbrick, /area/indoors/town/church/inquisition) -"wLO" = ( -/obj/structure/flora/grass/bush_meagre, -/obj/structure/flora/tree/dying_bush, -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/blue) "wLT" = ( /obj/structure/stairs/stone{ dir = 8 @@ -50563,21 +48653,6 @@ }, /turf/closed/basic, /area/indoors/town/adv_guild) -"wMP" = ( -/obj/machinery/light/fueled/hearth, -/obj/structure/rack/shelf, -/obj/item/reagent_containers/glass/cup/teacup{ - pixel_x = 7; - pixel_y = 42 - }, -/obj/item/reagent_containers/glass/cup/teacup{ - pixel_x = -7; - pixel_y = 41 - }, -/obj/machinery/light/fueled/wallfire/candle/r, -/obj/item/cooking/pan, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "wMZ" = ( /obj/structure/window/solid, /obj/structure/curtain/bounty/dir{ @@ -50742,17 +48817,6 @@ }, /turf/open/openspace, /area/outdoors/river) -"wQl" = ( -/obj/item/natural/cloth{ - pixel_x = -2; - pixel_y = 7 - }, -/obj/item/natural/cloth{ - pixel_x = -10; - pixel_y = 6 - }, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/blue) "wQz" = ( /obj/structure/table/wood/reinforced_alter, /obj/item/reagent_containers/glass/cup/wooden, @@ -50830,9 +48894,6 @@ "wRN" = ( /turf/open/floor/naturalstone, /area/under/town/sewer) -"wRR" = ( -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/blue) "wRT" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = 32; @@ -51091,11 +49152,6 @@ }, /turf/open/openspace, /area/outdoors/town) -"wXB" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/obj/structure/rack/shelf/biggest, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/red) "wXD" = ( /obj/structure/bars/passage/shutter/open{ redstone_id = "bar_shutter" @@ -51280,12 +49336,6 @@ dir = 4 }, /area/indoors/town/keep/throne) -"wZs" = ( -/obj/structure/rack{ - pixel_y = -1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/red) "wZy" = ( /obj/machinery/light/fueled/wallfire/candle/r, /turf/open/floor/blocks/newstone/alt, @@ -51361,9 +49411,6 @@ /obj/item/storage/backpack/satchel/surgbag/shit, /turf/open/floor/churchbrick, /area/indoors/town/clinic_large/feldsher) -"xaZ" = ( -/turf/closed/wall/mineral/wooddark/horizontal, -/area/indoors/town/noble_manor/red) "xbd" = ( /obj/structure/table/wood{ dir = 10; @@ -51649,9 +49696,6 @@ }, /turf/open/floor/concrete, /area/indoors/town/dwarfin) -"xhY" = ( -/turf/closed/wall/mineral/stone/window/moss, -/area/outdoors/town/noble_manor/blue) "xhZ" = ( /turf/open/floor/rooftop{ dir = 1 @@ -51712,13 +49756,6 @@ }, /turf/open/floor/metal/alt, /area/indoors/town/keep/gate) -"xjj" = ( -/obj/structure/fluff/railing/wood{ - dir = 4; - pixel_x = 1 - }, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "xjD" = ( /obj/structure/closet/crate/chest/neu, /obj/item/reagent_containers/glass/bottle/healthpot, @@ -52149,10 +50186,6 @@ }, /turf/open/openspace, /area/outdoors/town/roofs) -"xtr" = ( -/obj/structure/flora/grass, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "xty" = ( /obj/structure/door/viewport{ dir = 1; @@ -52345,11 +50378,6 @@ /obj/structure/flora/grass/water/reeds, /turf/open/water/sewer, /area/under/town/sewer) -"xwh" = ( -/obj/structure/flora/grass, -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "xwo" = ( /obj/structure/fluff/walldeco/psybanner{ pixel_x = 32 @@ -52425,12 +50453,6 @@ /obj/structure/fake_machine/scomm/r, /turf/open/floor/grass, /area/outdoors/farm) -"xxS" = ( -/obj/structure/window/openclose/reinforced{ - dir = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "xyq" = ( /obj/effect/decal/borderfall{ dir = 1 @@ -53308,13 +51330,6 @@ /obj/structure/fluff/statue/pillar, /turf/open/floor/twig, /area/outdoors/basin/safe) -"xTG" = ( -/obj/structure/carpet/blue, -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/blue) "xTS" = ( /obj/structure/chair/bench/church/mid{ dir = 1 @@ -53368,10 +51383,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/ruinedwood/darker, /area/outdoors/town) -"xVY" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/red) "xWm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -53457,10 +51468,6 @@ /obj/structure/flora/grass/water, /turf/open/floor/dirt/road, /area/under/cavewet) -"xZn" = ( -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/blue) "xZr" = ( /obj/structure/door, /obj/effect/mapping_helpers/access/locker, @@ -53522,10 +51529,6 @@ "yaX" = ( /turf/closed/wall/mineral/stonebrick, /area/under/cave) -"ybb" = ( -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/tile/checker, -/area/indoors/town/noble_manor/blue) "ybv" = ( /obj/structure/water_pipe, /obj/structure/fluff/walldeco/bath/wallpipes/innie{ @@ -53574,13 +51577,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/wood, /area/indoors/town/cell) -"ycq" = ( -/obj/structure/carpet/blue, -/obj/structure/bookcase/random{ - pixel_y = 15 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/blue) "ycL" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, /turf/open/floor/tile, @@ -53603,15 +51599,6 @@ }, /turf/open/floor/cobble, /area/outdoors/woods_safe) -"ydE" = ( -/obj/structure/fluff/railing/tall, -/obj/structure/fluff/railing/tall{ - dir = 8 - }, -/obj/structure/wild_plant/nospread/sunflower, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/red, -/area/outdoors/town/noble_manor/red) "ydX" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -53738,9 +51725,6 @@ /obj/effect/decal/cleanable/debris/wood, /turf/open/floor/hexstone, /area/indoors/town/clocktower) -"yhr" = ( -/turf/open/floor/tile, -/area/indoors/town/noble_manor/blue) "yht" = ( /obj/item/fishingrod/fisher, /turf/open/floor/dirt, @@ -53753,10 +51737,6 @@ /obj/structure/rack/shelf, /turf/open/floor/ruinedwood/alt, /area/indoors/town/noble_manor/yellow) -"yhP" = ( -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/tile/checker, -/area/indoors/town/noble_manor/red) "yhX" = ( /obj/structure/chair/wood/alt/chair_noble/red{ dir = 8 @@ -53776,13 +51756,6 @@ }, /turf/open/floor/wood, /area/indoors/town/tavern) -"yiz" = ( -/obj/structure/table/map{ - dir = 5 - }, -/obj/item/reagent_containers/glass/carafe/teapot, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/red) "yiI" = ( /obj/structure/closet/crate/chest/crate, /obj/effect/decal/cleanable/dirt/dust, @@ -53861,9 +51834,6 @@ }, /turf/open/floor/ruinedwood/two, /area/indoors/town/shop) -"ykx" = ( -/turf/closed/wall/mineral/craftstone, -/area/outdoors/town/noble_manor/blue) "ykB" = ( /obj/structure/door/green{ name = "Tailor Shop" @@ -143991,7 +141961,211 @@ lsZ lsZ lsZ lsZ -nkM +lsZ +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +aqT +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +sCd +sCd +sCd +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +nRI +pef +tim +xBL +nyT +kUC +tFo +jdz +ibK +ibK +ibK +ibK +ibK +uoD +jdz +jdz +uoD +xqi +jdz +pCb +liO +pCb +tFo +tFo +loe +jdz +skV +ehX +qFx +qFx +qFx +qFx +qFx +dID +hlw +"} +(47,1,3) = {" +hlw +dID +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +ido +jEQ +jEQ +jEQ +ido +qFx +qFx +qFx +qFx +qFx +qFx +qFx +biy +biy +biy +biy +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +idr +qFx +qFx +aNC +plN +qFx +qFx +qFx +qFx +qFx +qFx +qFx +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +qFx +qFx qFx qFx qFx @@ -144030,8 +142204,6 @@ qFx qFx qFx qFx -sCd -sCd sCd nRI nRI @@ -144063,33 +142235,33 @@ nRI nRI nRI nRI -pef +liT +xGV +xqi tim -xBL -nyT -kUC -tFo +pCb +ryv jdz ibK ibK ibK ibK ibK -uoD -jdz -jdz -uoD +ibK +ryv +pCb +xqi +cAG xqi +cAG +cAG jdz +jdz +kUC pCb -liO -pCb -tFo -tFo -loe +uoD jdz skV -ehX qFx qFx qFx @@ -144098,7 +142270,7 @@ qFx dID hlw "} -(47,1,3) = {" +(48,1,3) = {" hlw dID qFx @@ -144161,12 +142333,13 @@ qFx qFx qFx qFx -qFx +biy qFx biy biy biy biy +biy qFx qFx qFx @@ -144175,12 +142348,11 @@ qFx qFx qFx qFx +gcK +wgm +wgm +pxd qFx -idr -qFx -qFx -aNC -plN qFx qFx qFx @@ -144189,11 +142361,11 @@ qFx qFx qFx lsZ -jwp -jgm -jgm -svX -nkM +lsZ +lsZ +lsZ +lsZ +lsZ qFx qFx qFx @@ -144265,12 +142437,11 @@ nRI nRI nRI nRI +nRI +liT liT xGV -xqi -tim -pCb -ryv +nxR jdz ibK ibK @@ -144278,20 +142449,21 @@ ibK ibK ibK ibK -ryv -pCb -xqi -cAG -xqi -cAG -cAG +ibK +ibK +ibK jdz jdz -kUC -pCb +cAG +mLy +gHN +skV +uoD +uoD +tFo +cAG uoD jdz -skV qFx qFx qFx @@ -144300,7 +142472,7 @@ qFx dID hlw "} -(48,1,3) = {" +(49,1,3) = {" hlw dID qFx @@ -144335,16 +142507,16 @@ qFx qFx qFx qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx +biy +biy +biy +biy +biy +biy +biy +biy +biy +biy qFx qFx qFx @@ -144363,8 +142535,8 @@ qFx qFx qFx qFx +xnl biy -qFx biy biy biy @@ -144378,28 +142550,28 @@ qFx qFx qFx qFx -gcK -wgm -wgm -pxd -qFx -qFx -qFx -qFx qFx +eLa +pxd +wgm qFx qFx qFx +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -hPS -jgm -iKR -yhr -nkM -qFx -qFx -qFx -qFx qFx qFx qFx @@ -144437,6 +142609,7 @@ qFx qFx qFx sCd +sCd nRI nRI nRI @@ -144468,11 +142641,12 @@ nRI nRI nRI nRI -liT -liT -xGV -nxR -jdz +ukl +ibK +ibK +ibK +ibK +ibK ibK ibK ibK @@ -144482,18 +142656,16 @@ ibK ibK ibK ibK -jdz -jdz -cAG -mLy -gHN -skV -uoD uoD -tFo -cAG +xgQ uoD +pCb +skV jdz +kUC +gHN +cAG +pCb qFx qFx qFx @@ -144502,7 +142674,7 @@ qFx dID hlw "} -(49,1,3) = {" +(50,1,3) = {" hlw dID qFx @@ -144534,9 +142706,6 @@ qFx qFx qFx qFx -qFx -qFx -qFx biy biy biy @@ -144547,10 +142716,13 @@ biy biy biy biy -qFx -qFx -qFx -qFx +biy +biy +biy +biy +biy +biy +biy qFx qFx qFx @@ -144564,42 +142736,42 @@ qFx qFx qFx qFx -qFx -xnl biy +xnl biy biy biy biy biy +glV +glV qFx qFx qFx qFx qFx qFx -qFx -qFx -qFx -eLa +vLV +mfP pxd wgm +pxd +tMR +kBz qFx -qFx -qFx -eKg -fWw -pZD -kEY -sOD +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -sLh -yhr -lns -yhr -nkM -nkM -nkM lsZ lsZ qFx @@ -144638,8 +142810,8 @@ qFx qFx qFx qFx -sCd -sCd +qFx +qFx nRI nRI nRI @@ -144686,17 +142858,17 @@ ibK ibK ibK ibK -uoD -xgQ -uoD -pCb -skV +ibK +ibK +jdz +ryv jdz -kUC -gHN -cAG pCb -qFx +gHN +jdz +skV +ehX +liO qFx qFx qFx @@ -144704,7 +142876,7 @@ qFx dID hlw "} -(50,1,3) = {" +(51,1,3) = {" hlw dID qFx @@ -144713,14 +142885,13 @@ qFx qFx qFx qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx +oFd +oFd +oFd +oFd +oFd +oFd +oFd qFx qFx qFx @@ -144753,209 +142924,8 @@ biy biy biy biy -qFx -qFx -qFx -qFx -ido -jEQ -jEQ -jEQ -ido -qFx -qFx -qFx -qFx -biy -xnl -biy -biy -biy -biy -biy -glV -glV -qFx -qFx -qFx -qFx -qFx -qFx -vLV -mfP -pxd -wgm -pxd -tMR -kBz -qFx -onM -fWw -fWw -kPb -fWw -lsZ -keP -yhr -dla -yhr -lsZ -aSJ -kbq -ihH -lsZ -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -nRI -ukl -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -ibK -jdz -ryv -jdz -pCb -gHN -jdz -skV -ehX -liO -qFx -qFx -qFx -qFx -dID -hlw -"} -(51,1,3) = {" -hlw -dID -qFx -qFx -qFx -qFx -qFx -qFx -oFd -oFd -oFd -oFd -oFd -oFd -oFd -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy -biy +biy +biy qFx qFx qFx @@ -144991,20 +142961,20 @@ pxd htj kBz qFx -eUB -pZD -oAQ -oAQ -fWw -cpw -yhr -yhr -iKR -jgm -eDn -wRR -wRR -vku +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ qFx qFx @@ -145193,21 +143163,21 @@ pxd dVR vLV qFx -fzy -oAQ -oAQ -oAQ -eUB +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -wMP -jgm -jgm -rZI lsZ -pBy -iqS -ptf -nkM qFx qFx qFx @@ -145395,23 +143365,23 @@ kBz kBz vLV qFx -sOD -fWw -oAQ -fWw -xZn -nkM +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -nvH -gpq lsZ lsZ -nkM -nkM -nkM -nkM -nkM -nkM lsZ qFx qFx @@ -145587,33 +143557,33 @@ qFx glV biy biy -vTx -oab -lgI -agQ -pew -gfE -eUB -cZc -gBB -eUB -gFl -fWw -kEY -gNr -oWX -nkM -sGP -soG -tom -qfP -vYI -auK +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -lCO -oWM -nao -wHh lsZ qFx qFx @@ -145789,33 +143759,33 @@ glV glV biy biy -ajN -fRh -nhZ -fWw -fWw -uEh -jgH -jgH -pIq -pIq -vda -uEh -uEh -mCh -oWX -siV -soG -jJu -cYs -cYs -pxd -soG +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -kvl -cYs -mXZ -lvt lsZ lsZ lsZ @@ -145991,38 +143961,38 @@ glV glV biy biy -smf -qph -pcv -fWw -kEY -drh -kVl -onM -mgk -jgH -uEh -uEh -uEh -uEh -uEh -wjU -soG -hzL -cYs -cYs -cYs -soG -dRq -toR -cYs -cYs -sKc +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ lsZ -yhr -yhr -yhr lsZ lsZ qFx @@ -146193,39 +144163,39 @@ glV glV biy biy -oxu -qph -uEh -tPe -jgH -drh -jgH -wzw -jgH -drh -mAe -wLd -uEh -jiw -bqk -siV -soG -hzL -pkR -cYs -cYs -soG +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -vTb -cYs -cYs -bJh lsZ -yhr -yhr -dpW -yhr -czW lsZ qFx qFx @@ -146395,39 +144365,39 @@ glV glV biy biy -jpp -vFl -hwE -uEh -jgH -drh -uEh -jgH -jgH -rgY -fWw -oAQ -oAQ -kEY -wLO -nkM -kwx -bqd -sHI -xTG -cYs -soG -nkM -lCO -cYs -cYs -toR -mRB -yhr -dpW -ybb -dpW -tgb +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ qFx qFx @@ -146597,39 +144567,39 @@ glV glV biy biy -pIk -huA -qph -tPe -jgH -drh -uEh -uEh -jgH -fWw -oAQ -oAQ -oAQ -kEY -wCD -nkM -ayL -cPN -tmY -ved -soG -soG -nkM -lCO -toR -sSa -nkm +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -yhr -yhr -dpW -yhr -sEk lsZ qFx qFx @@ -146799,38 +144769,38 @@ glV glV biy biy -gUD -qph -fRh -fWw -kEY -maR -shX -uEh -jgH -wLd -oAQ -fWw -uEh -ivq -gFl -gCf -nkM -hav -nym -nkM +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -ubk -nkM lsZ -dRq lsZ lsZ lsZ lsZ -yhr -yhr -yhr lsZ lsZ qFx @@ -147001,33 +144971,33 @@ glV glV biy biy -pIk -nrH -fRh -ykx -tOW -aDt -ykx -opz -jgH -uEh -pZD -fWw -bqk -uEh -jJh -ocq -kkd -fOv -pQk -ckW -enc -lhT -nkM -tiJ -toR -epI -aFm +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ lsZ lsZ @@ -147203,33 +145173,33 @@ glV biy biy biy -lEz -fRh -fWw -ohz -jgH -qph -xhY -jgH -jgH -jgH -jno -fWw -fWw -uEh -uEh -kVl -kVl -srg -ocq -wQl -cIx -lhT -nkM -nIU -cYs -pxd -toR +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ qFx qFx @@ -147405,34 +145375,34 @@ glV biy biy biy -fkm -mGh -phQ -ohz -eIG -eIG -ohz -uEh -jgH -jgH -jno -fWw -epD -ihb -bqk -bqk -dMi -srg -srg +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -fqe -uun -nkM -qxE -cYs -pxd -toR -nkM qFx qFx qFx @@ -147607,34 +145577,34 @@ glV biy biy biy -ocq -ocq -ocq -rrN kuA kuA -ohz -jrz -jsb -jgH -jno -oAQ -fWw -fWw -vPq -hmQ -hmQ -acO -onM +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ +lsZ lsZ -uun -uun -nkM -kXd -ycq -uvD -qbU -nkM qFx qFx qFx @@ -147811,23 +145781,25 @@ biy biy biy biy -ocq -sEi kuA kuA -rrN -ykx -ykx -nWg -jno -oAQ -xwh -jrz -uEh -uEh -jgH -uEh -uEh +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +lsZ +lsZ lsZ lsZ lsZ @@ -147835,8 +145807,6 @@ lsZ lsZ lsZ lsZ -nkM -nkM qFx qFx qFx @@ -148017,18 +145987,18 @@ biy kuA kuA kuA -sEi -bVi -ykx -qgX -gRf -uEh -uEh -uEh -ykx -ykx +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA qFx -dqm +kuA qFx qFx qFx @@ -148220,14 +146190,14 @@ biy biy biy biy -ocq -ocq -ejL -qJF -cEr -lNk -xjj -ykx +kuA +kuA +kuA +kuA +kuA +kuA +kuA +kuA qFx qFx qFx @@ -148424,13 +146394,13 @@ biy biy biy biy -kEY -kEY -kEY -kEY -kEY -kEY -kEY +kuA +kuA +kuA +kuA +kuA +kuA +kuA qFx qFx qFx @@ -148628,7 +146598,7 @@ biy biy biy biy -kEY +kuA biy biy biy @@ -169263,12 +167233,12 @@ nzP nzP nzP nzP -rdl -rdl -hiI -aXT -aXT -jbX +nZc +nZc +nZc +nZc +nZc +nZc rdl qFx qFx @@ -169464,13 +167434,13 @@ nzP nzP nzP nzP -hiI -hiI -tAA -tAA -lSc -lSc -tAA +nZc +nZc +nZc +nZc +nZc +nZc +nZc nZc qFx qFx @@ -169654,26 +167624,26 @@ szR rOu rOu aaV -rdl -rdl -jbX -jbX -jbX -hiI -hiI -hiI -hiI -hiI -hiI -hiI -hiI nZc nZc -lSc -lSc -lSc -tAA -gFK +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -169856,26 +167826,26 @@ szR szR rOu rOu -hiI -tsC -qzg -djF -lSc -lSc -lSc -lSc -lSc -pUZ -tAA -tAA -jwb -lSc -lSc -jwb -lSc -lSc -qzg -fOS +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -170058,26 +168028,26 @@ szR szR szR szR -jlT -lSc -lSc -lSc -lSc -lSc -jwb -lSc -lSc -lSc nZc -jwb -jwb -lSc -lSc -lSc -cyN -qzg -qzg -bPD +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -170260,25 +168230,25 @@ lED szR szR szR -jlT -lSc -lSc -lSc -jwb -lSc -rZp -tAA -lSc -lSc -jwb -lSc -lSc -mYZ -tAA -lSc -lSc -tAA -tAA +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc nZc qFx qFx @@ -170462,25 +168432,25 @@ sMC sMC sMC sMC -hiI -tAA -tAA -tsC -tAA -fJZ -tAA -qzg -pUZ -lSc -lSc -lSc -fJZ -tAA -njk -xtr -lSc -lSc -tAA +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -170664,25 +168634,25 @@ qYu sMC sMC sWw -rdl -bwI -fJZ nZc -amz -unw -ccW -ydE -tAA -qzg -fOS -tsC -fJZ -tAA -tAA -tAA -jwb -lSc -rZp +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -170866,25 +168836,25 @@ wVT wVT sMC dCm -rdl -wwZ -wwZ +nZc +nZc +nZc +sDt sDt sDt -ast -ast -adC -nfh -tAA -tsC -tsC -qzg -tAA -mYZ -jwb -jwb -lSc -jHE +sDt +sDt +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -171066,27 +169036,27 @@ qYu wVT wVT wVT -ncK -ncK -ncK -ncK -ncK sDt -xaZ -maH -maH -pbL -ncK -ncK -ncK -ncK -jFr -xtr -jwb -jwb -lSc -tAA -sde +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -171268,26 +169238,26 @@ wVT wVT wVT lED -ncK -ecY -uUr -hQH -nqk sDt -sci -bXv -lLd -oQI -fKN -tGO -bGJ -ncK -tAA -lSc -jwb -lSc -lSc -tAA +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -171470,25 +169440,25 @@ wVT wVT sMC uNU -ncK -oSq -oSq -bCq -bCq sDt -ffl -yiz -usq -cDH -dhu -spu -wZs -xxS -lSc -lSc -lSc -lSc -tAA +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -171668,29 +169638,29 @@ sMC wVT wVT gXl -ncK -ncK -ncK sDt sDt -alY -bCq -iMm -bCq -nLp -iJr -bsC -bsC -bsC -bsC -sze -tGO -cEU -lSc -lSc -tAA -tAA -bwI +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc +nZc qFx qFx qFx @@ -171870,28 +169840,28 @@ sMC lED wVT sMC -ncK -dgR -xVY -nnq sDt -oFw -bCq -pFQ -bCq -qXq -iJr -bsC -bsC -bsC -sze -sze -tGO -xxS -tAA -tAA -tAA -bwI +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc qFx qFx qFx @@ -172072,28 +170042,28 @@ uNU sMC wVT sMC -ncK -jZJ -oPq -oPq -kZX -bCq -bCq -bCq -oSq sDt -tyb -kdk -bsC -bsC -sze -spu -iJr -ncK -udc -gFK -qzg -tAA +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc +nZc qFx qFx qFx @@ -172275,26 +170245,26 @@ qFx kuX sMC sDt -dVz -svP -lJk -ncK -kSF -vGo -oSq -rsJ sDt -tyb -rgr -iJr -iJr -tPB -vJb -rgr -ncK -rdl -tAA -wwZ +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +nZc +nZc +nZc qFx qFx qFx @@ -172481,23 +170451,23 @@ sDt sDt sDt sDt -ncK -ncK -ncK -ncK sDt sDt -ncK -rkL -ncK -ncK -ncK -ncK -lZc -lZc -mkS -lZc -lZc +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -172682,24 +170652,24 @@ qFx qFx qFx qFx -ncK -ncK -jNe -jwy -ncK -fNH -nLR -dGR -wqt -sxa -ncK -ncK sDt -cTP -hJX -eOP -sCy -htO +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -172884,24 +170854,24 @@ qFx qFx qFx qFx -ncK -aFr -wqt -cUR -daM -cUR -wqt -wqt -wqt -wqt -vBG -ncK sDt -wmV -sCy -eOP -tGO -iJr +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -173086,24 +171056,24 @@ qFx qFx qFx qFx -ncK -ado -cUR -wqt -ncK -pQG -wqt -wqt -wqt -wqt -gvy -ncK sDt -ssO -dyI -wBU -iJr -bXM +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -173288,24 +171258,24 @@ qFx qFx qFx qFx -ffg -lph -cUR -wqt -ncK -ncK -cUR -wvS -cUR -wqt -ncK -ncK sDt -bXM -ksR -tGO -pzJ -bXM +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -173338,176 +171308,176 @@ qFx qFx qFx qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -dID -hlw -"} -(192,1,3) = {" -hlw -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -qFx -qFx -dID -dID -dID -dID -dID -qFx -qFx -qFx -qFx -uHr -uHr -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -dID -ido -jEQ -jEQ -jEQ -ido -biy -biy -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -hTX -iuv -wdV -wdV -anA -hTX -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -qFx -ncK -ado -cUR -wqt -jts -ncK -eKs -vat -wqt -wXB -ncK -qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +dID +hlw +"} +(192,1,3) = {" +hlw +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +qFx +qFx +dID +dID +dID +dID +dID +qFx +qFx +qFx +qFx +uHr +uHr +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +dID +ido +jEQ +jEQ +jEQ +ido +biy +biy +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +hTX +iuv +wdV +wdV +anA +hTX +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +qFx +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +glV +sDt +sDt +sDt +sDt +sDt sDt -uHa -iJr -nFI -tGO -dQP sDt qFx qFx @@ -173692,24 +171662,24 @@ qFx qFx qFx qFx -ncK -vvm -wqt -cFF -ncK -ncK -ncK -ncK -dCz -ncK -ncK -qFx sDt -uTg -iJr -wBU -tGO -ruW +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +glV +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -173892,26 +171862,26 @@ qFx qFx qFx qFx -ncK -ncK -ncK -ncK -sWy -ncK -ncK -ncK -ncK -bCq -bCq -bCq -ncK -ncK sDt -uTg -iJr -eOP -tGO -quO +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt qFx qFx @@ -174094,20 +172064,20 @@ qFx qFx qFx qFx -ncK -qaW -dzP -mOU -hYb -ncK +sDt +sDt +sDt +sDt +sDt +sDt qFx -ncK -bCq -bCq -uGt -bCq -bCq -ncK +sDt +sDt +sDt +sDt +sDt +sDt +sDt sDt sDt sDt @@ -174296,20 +172266,20 @@ qFx qFx qFx qFx -ncK -voa -sJG -dzP -ieM -ncK +sDt +sDt +sDt +sDt +sDt +sDt qFx -ncK -bCq -uGt -yhP -uGt -bCq -ncK +sDt +sDt +sDt +sDt +sDt +sDt +sDt qFx qFx qFx @@ -174498,20 +172468,20 @@ qFx qFx qFx qFx -ncK -ncK -ncK -ncK -ncK -ncK +sDt +sDt +sDt +sDt +sDt +sDt qFx -ncK -bCq -bCq -uGt -bCq -bCq -ncK +sDt +sDt +sDt +sDt +sDt +sDt +sDt qFx qFx qFx @@ -174707,13 +172677,13 @@ qFx qFx qFx qFx -ncK -ncK -jrc -qXy -izx -ncK -ncK +sDt +sDt +sDt +sDt +sDt +sDt +sDt qFx qFx qFx @@ -174910,11 +172880,11 @@ dID dID dID tHF -ncK -ncK -ncK -ncK -ncK +sDt +sDt +sDt +sDt +sDt dID dID dID diff --git a/code/controllers/subsystem/properties/controller.dm b/code/controllers/subsystem/properties/controller.dm new file mode 100644 index 00000000000..cd38fdb35e6 --- /dev/null +++ b/code/controllers/subsystem/properties/controller.dm @@ -0,0 +1,59 @@ +/datum/property_controller + var/obj/effect/landmark/house_spot/linked_property + var/list/allowed_list = list() + + var/property_bounds_minx + var/property_bounds_miny + var/property_bounds_minz + var/property_bounds_maxx + var/property_bounds_maxy + var/property_bounds_maxz + +/datum/property_controller/New(obj/effect/landmark/house_spot/property) + linked_property = property + if(!property) + return + + var/turf/start_turf = get_turf(property) + if(!start_turf) + return + + property_bounds_minx = start_turf.x + property_bounds_miny = start_turf.y + property_bounds_minz = start_turf.z + property_bounds_maxx = start_turf.x + property.template_x - 1 + property_bounds_maxy = start_turf.y + property.template_y - 1 + property_bounds_maxz = start_turf.z + property.template_z - 1 + +/datum/property_controller/proc/check_access(mob/user) + if(!linked_property || !user || !user.client) + return FALSE + + // Owner has access + if(user.ckey == linked_property.owner_ckey) + return TRUE + + // Check allow list + if(user.ckey in allowed_list) + return TRUE + + return FALSE + +/datum/property_controller/proc/is_in_property_bounds(atom/A) + if(!linked_property) + return FALSE + + var/turf/T = get_turf(A) + if(!T) + return FALSE + + return (T.x >= property_bounds_minx && T.x <= property_bounds_maxx && \ + T.y >= property_bounds_miny && T.y <= property_bounds_maxy && \ + T.z >= property_bounds_minz && T.z <= property_bounds_maxz) + +/datum/property_controller/proc/add_access(ckey) + if(!(ckey in allowed_list)) + allowed_list += ckey + +/datum/property_controller/proc/remove_access(ckey) + allowed_list -= ckey diff --git a/code/controllers/subsystem/properties/landmarks.dm b/code/controllers/subsystem/properties/landmarks.dm new file mode 100644 index 00000000000..09c976b200c --- /dev/null +++ b/code/controllers/subsystem/properties/landmarks.dm @@ -0,0 +1,46 @@ +/obj/effect/abstract/property_noop + invisibility = INVISIBILITY_ABSTRACT + var/property_id + +/obj/effect/landmark/house_spot + var/property_id = "" // Unique identifier for this specific property location + var/save_id = "" // Template type identifier (multiple properties can share same save_id) + var/owner_ckey = null + var/owner_property_slot = null // Which slot/ID the owner is using for this property + + var/template_x = 0 + var/template_y = 0 + var/template_z = 1 + + var/datum/map_template/default_template + + /// If set, only players currently assigned one of these job titles can claim this property. Null/empty = no restriction. + var/list/required_jobs = null + +/obj/effect/landmark/house_spot/Initialize(mapload) + . = ..() + SShousing.register_property(src) + +/obj/effect/landmark/house_spot/Destroy(force) + default_template = null + return ..() + +/obj/effect/landmark/house_spot/proc/check_job_requirement(mob/user) + if(!length(required_jobs)) + return TRUE + if(!user?.mind?.assigned_role) + return FALSE + if(is_type_in_list(SSjob.GetJob(user.job), required_jobs)) + return TRUE + return FALSE + +/obj/effect/landmark/house_spot/proc/get_required_jobs_string() + if(!length(required_jobs)) + return "" + var/list/titles = list() + for(var/datum/job/job as anything in required_jobs) + titles += initial(job.title) + return jointext(titles, ", ") + +/obj/effect/landmark/house_spot/noble + required_jobs = list(/datum/job/minor_noble) diff --git a/code/controllers/subsystem/properties/property_sign.dm b/code/controllers/subsystem/properties/property_sign.dm new file mode 100644 index 00000000000..f4ccbfcb541 --- /dev/null +++ b/code/controllers/subsystem/properties/property_sign.dm @@ -0,0 +1,124 @@ + +/obj/structure/sign/property_sign + name = "Property Sign" + desc = "A sign for property management." + icon = 'icons/roguetown/misc/structure.dmi' + icon_state = "questnoti" + + var/obj/effect/landmark/house_spot/linked_property + +/obj/structure/sign/property_sign/proc/setup_property_link(obj/effect/landmark/house_spot/property) + linked_property = property + +/obj/structure/sign/property_sign/proc/check_other_players(mob/user) + if(!linked_property) + return FALSE + + var/turf/start_turf = get_turf(linked_property) + if(!start_turf) + return FALSE + + var/minx = start_turf.x + var/miny = start_turf.y + var/minz = start_turf.z + var/maxx = minx + linked_property.template_x - 1 + var/maxy = miny + linked_property.template_y - 1 + var/maxz = minz + linked_property.template_z - 1 + + for(var/turf/T in block(locate(minx, miny, minz), locate(maxx, maxy, maxz))) + for(var/mob/M in T.contents) + if(M == user) + continue + if(M.client) + return TRUE + return FALSE + +/obj/structure/sign/property_sign/claim + var/claimed = FALSE + +/obj/structure/sign/property_sign/claim/attack_hand(mob/user) + . = ..() + if(!user.client || !linked_property) + return + + // If already claimed by this user, allow saving + if(linked_property?.owner_ckey == user.ckey) + save_property_design(user) + return + + // Check if already claimed + if(SShousing.temporary_claims[linked_property.property_id]) + to_chat(user, span_warning("This property is already claimed!")) + return + + // Check job restriction + if(!linked_property.check_job_requirement(user)) + to_chat(user, span_warning("Only the following can claim this property: [linked_property.get_required_jobs_string()]")) + return + + // Check if user already owns a property with this save_id + if(SShousing.player_owns_save_id(user.ckey, linked_property.save_id)) + to_chat(user, span_warning("You already have a property of this type!")) + return + + if(check_other_players(user)) + to_chat(user, span_warning("Cannot claim while others are present!")) + return + + // Show slot selection interface + show_slot_selection(user) + +/obj/structure/sign/property_sign/claim/proc/show_slot_selection(mob/user) + if(!user || !user.client || !linked_property) + return + + var/list/available_slots = SShousing.get_player_property_slots(user.ckey, linked_property.save_id) + var/list/options = list() + + // Add existing slots + for(var/slot in available_slots) + options["Load Design [slot]"] = slot + + // Add option to create new slot + var/next_slot = 1 + if(available_slots.len > 0) + next_slot = available_slots[available_slots.len] + 1 + options["Create New Design ([next_slot])"] = next_slot + + options["Cancel"] = null + + var/choice = input(user, "Select a property design slot:", "Property Claim") as null|anything in options + if(!choice || options[choice] == null) + return + + var/selected_slot = options[choice] + + if(check_other_players(user)) + to_chat(user, span_warning("Someone entered the area!")) + return + + if(SShousing.claim_temporary(linked_property, user, selected_slot)) + claimed = TRUE + name = "Claimed Property (Slot [selected_slot])" + desc = "Click to save your current design to slot [selected_slot]." + to_chat(user, span_notice("Property claimed with design slot [selected_slot]! Click again to save changes.")) + else + to_chat(user, span_warning("Failed to claim property!")) + +/obj/structure/sign/property_sign/claim/proc/save_property_design(mob/user) + if(!linked_property || linked_property.owner_ckey != user.ckey) + return + + var/slot = linked_property.owner_property_slot + if(!slot) + to_chat(user, span_warning("No slot assigned to this property!")) + return + + var/confirm = tgui_alert(user, "Save the current state to design slot [slot]?", "Save Property", list("Yes", "No")) + if(confirm != "Yes") + return + + if(SShousing.save_property(linked_property, user.ckey, slot)) + to_chat(user, span_notice("Property saved successfully to slot [slot]!")) + else + to_chat(user, span_warning("Failed to save property!")) diff --git a/code/controllers/subsystem/properties/subsystem.dm b/code/controllers/subsystem/properties/subsystem.dm new file mode 100644 index 00000000000..5fb0df5d811 --- /dev/null +++ b/code/controllers/subsystem/properties/subsystem.dm @@ -0,0 +1,246 @@ +SUBSYSTEM_DEF(housing) + name = "Housing" + flags = SS_NO_FIRE + init_order = INIT_ORDER_HOUSING + + var/list/properties = list() // All property landmarks + var/list/property_controllers = list() // All active property controllers + var/list/temporary_claims = list() // property_id -> list(ckey, slot) for round-only claims + +/datum/controller/subsystem/housing/Initialize() + initialize_properties() + return ..() + +/datum/controller/subsystem/housing/proc/register_property(obj/effect/landmark/house_spot/property) + if(!property.property_id) + log_admin("Housing: Property at [property.x],[property.y],[property.z] has no property_id!") + return + properties[property.property_id] = property + +/datum/controller/subsystem/housing/proc/initialize_properties() + for(var/property_id in properties) + var/obj/effect/landmark/house_spot/property = properties[property_id] + load_default_template(property) + +/datum/controller/subsystem/housing/proc/load_default_template(obj/effect/landmark/house_spot/property, claim = FALSE) + if(!property.default_template) + return FALSE + + var/datum/map_template/template = new property.default_template + var/turf/spawn_location = get_turf(property) + template.load(spawn_location) + + var/lock_id = "[rand(10000, 99999)]" + var/list/lock_list = list(lock_id) + var/list/turfs = template.get_affected_turfs(spawn_location) + for(var/turf/T as anything in turfs) + for(var/obj/structure/sign/property_sign/sign in T.contents) + sign.setup_property_link(property) + if(claim) + var/obj/item/key/new_key = new /obj/item/key(get_turf(sign)) + new_key.lockids = lock_list + if(claim) + for(var/obj/structure/door/door in T.contents) + if(door.lock) + QDEL_NULL(door.lock) + door.lock = new /datum/lock/key(door, lock_list) + + return TRUE + +/datum/controller/subsystem/housing/proc/load_property(obj/effect/landmark/house_spot/property, ckey, slot) + var/property_file = "data/properties/[ckey]_[property.save_id]_[slot].dmm" + + if(fexists(property_file)) + var/datum/map_template/saved_template = new /datum/map_template(property_file, "[ckey]_[property.save_id]_[slot]", TRUE) + var/turf/spawn_location = get_turf(property) + if(saved_template.cached_map) + saved_template.load(get_turf(property)) + var/lock_id = "[slot]_[ckey]" + var/list/lock_list = list(lock_id) + var/list/turfs = saved_template.get_affected_turfs(spawn_location) + for(var/turf/T as anything in turfs) + for(var/obj/structure/sign/property_sign/sign in T.contents) + sign.setup_property_link(property) + var/obj/item/key/new_key = new /obj/item/key(get_turf(sign)) + new_key.lockids = lock_list + for(var/obj/structure/door/door in T.contents) + if(door.lock) + QDEL_NULL(door.lock) + door.lock = new /datum/lock/key(door, lock_list) + + return TRUE + return load_default_template(property, TRUE) + +/datum/controller/subsystem/housing/proc/save_property(obj/effect/landmark/house_spot/property, ckey, slot) + if(!property || !ckey || !slot) + return FALSE + + var/turf/start_turf = get_turf(property) + if(!start_turf) + return FALSE + + var/minx = start_turf.x + var/miny = start_turf.y + var/minz = start_turf.z + var/maxx = minx + property.template_x - 1 + var/maxy = miny + property.template_y - 1 + var/maxz = minz + property.template_z - 1 + + var/save_flags = SAVE_OBJECTS | SAVE_TURFS | SAVE_AREAS | SAVE_OBJECT_PROPERTIES | SAVE_UUID_STASIS | SAVE_WHITELIST + var/map_data = write_map(minx, miny, minz, maxx, maxy, maxz, save_flags, SAVE_SHUTTLEAREA_DONTCARE, property_noop = property.save_id) + + if(!map_data) + log_admin("Housing: Failed to generate map data for [ckey]'s property [property.property_id] slot [slot]") + return FALSE + + var/property_file = "data/properties/[ckey]_[property.save_id]_[slot].dmm" + if(fexists(property_file)) + fdel(property_file) + + var/file_handle = file(property_file) + file_handle << map_data + + log_admin("Housing: Saved property [property.property_id] for [ckey] in slot [slot]") + return TRUE + +/datum/controller/subsystem/housing/proc/create_property_controller(obj/effect/landmark/house_spot/property) + var/datum/property_controller/controller = new(property) + property_controllers += controller + return controller + +/datum/controller/subsystem/housing/proc/claim_temporary(obj/effect/landmark/house_spot/property, mob/user, slot) + if(!user || !user.client || !property || !slot) + return FALSE + + var/ckey = user.ckey + + // Check if already claimed + if(temporary_claims[property.property_id]) + return FALSE + + if(!property.check_job_requirement(user)) + return FALSE + + // Check if user already has a property with this save_id + if(player_owns_save_id(ckey, property.save_id)) + return FALSE + + // Set claim + temporary_claims[property.property_id] = list("ckey" = ckey, "slot" = slot) + property.owner_ckey = ckey + property.owner_property_slot = slot + + // Load property if user has a saved design + clear_property_area(property) + load_property(property, ckey, slot) + create_property_controller(property) + + return TRUE + +/datum/controller/subsystem/housing/proc/get_player_property_slots(ckey, save_id) + if(!ckey || !save_id) + return list() + + var/list/slots = list() + + // Scan for existing property files + for(var/i = 1 to 10) // Check up to 10 slots + var/property_file = "data/properties/[ckey]_[save_id]_[i].dmm" + if(fexists(property_file)) + slots += i + + return slots + +/datum/controller/subsystem/housing/proc/has_saved_property(ckey, save_id, slot) + if(!ckey || !save_id || !slot) + return FALSE + + var/property_file = "data/properties/[ckey]_[save_id]_[slot].dmm" + return fexists(property_file) + +/datum/controller/subsystem/housing/proc/player_owns_save_id(ckey, save_id) + if(!ckey || !save_id) + return FALSE + + for(var/property_id in temporary_claims) + var/list/claim_data = temporary_claims[property_id] + if(claim_data["ckey"] != ckey) + continue + var/obj/effect/landmark/house_spot/property = properties[property_id] + if(property && property.save_id == save_id) + return TRUE + + return FALSE + +/datum/controller/subsystem/housing/proc/player_owns_property(client_key) + for(var/property_id in temporary_claims) + var/list/claim_data = temporary_claims[property_id] + if(claim_data["ckey"] == client_key) + return TRUE + + return FALSE + +/datum/controller/subsystem/housing/proc/auto_claim_compatible_property(mob/user) + if(!user || !user.client) + return null + + var/ckey = user.ckey + + // Look for unclaimed properties that match user's saved designs + for(var/property_id in properties) + var/obj/effect/landmark/house_spot/property = properties[property_id] + + // Skip if already claimed + if(temporary_claims[property_id]) + continue + + // Check if user has any saved designs for this template type + var/list/available_slots = get_player_property_slots(ckey, property.save_id) + if(available_slots.len > 0) + // Auto-claim with first available slot + if(claim_temporary(property, user, available_slots[1])) + return property + + return null + +/datum/controller/subsystem/housing/proc/clear_property_area(obj/effect/landmark/house_spot/property) + if(!property) + return + + var/turf/start_turf = get_turf(property) + if(!start_turf) + return + + var/minx = start_turf.x + var/miny = start_turf.y + var/minz = start_turf.z + var/maxx = minx + property.template_x - 1 + var/maxy = miny + property.template_y - 1 + var/maxz = minz + property.template_z - 1 + + for(var/turf/T in block(locate(minx, miny, minz), locate(maxx, maxy, maxz))) + var/has_noop = FALSE + for(var/obj/O in T.contents) + if(istype(O, /obj/effect/abstract/property_noop)) + var/obj/effect/abstract/property_noop/effect = O + if(effect.property_id == property.save_id) + has_noop = TRUE + break + if(!has_noop) + for(var/obj/O in T.contents) + if(istype(O, /obj/effect/landmark)) + continue + qdel(O) + + T.ScrapeAway() + +/datum/controller/subsystem/housing/proc/check_access(mob/user) + if(!has_world_trait(/datum/world_trait/delver)) + return TRUE + if(!user || !user.client) + return FALSE + + for(var/datum/property_controller/controller as anything in property_controllers) + if(controller.check_access(user)) + return TRUE + return FALSE diff --git a/code/controllers/subsystem/property_management.dm b/code/controllers/subsystem/property_management.dm deleted file mode 100644 index 959b116894d..00000000000 --- a/code/controllers/subsystem/property_management.dm +++ /dev/null @@ -1,616 +0,0 @@ -/obj/effect/abstract/property_noop - invisibility = INVISIBILITY_ABSTRACT - var/property_id - -/obj/effect/landmark/house_spot - var/rent_cost = 0 - var/property_id = "" // Unique identifier for this specific property location - var/save_id = "" // Template type identifier (multiple properties can share same save_id) - var/owner_ckey = null - var/owner_property_slot = null // Which slot/ID the owner is using for this property - - var/template_x = 0 - var/template_y = 0 - var/template_z = 1 - - var/datum/map_template/default_template - var/temporary_claim = FALSE // TRUE if claimed only for this round - -/obj/effect/landmark/house_spot/Initialize(mapload) - . = ..() - SShousing.register_property(src) - -/obj/effect/landmark/house_spot/Destroy(force) - default_template = null - return ..() - -SUBSYSTEM_DEF(housing) - name = "Housing" - flags = SS_NO_FIRE - init_order = INIT_ORDER_HOUSING - - var/list/properties = list() // All property landmarks - var/list/property_owners = list() // property_id -> list(ckey, slot) mapping - var/list/property_controllers = list() // All active property controllers - var/list/temporary_claims = list() // property_id -> list(ckey, slot) for round-only claims - var/rent_collection_enabled = TRUE - -/datum/controller/subsystem/housing/Initialize() - load_persistent_owners() - initialize_properties() - return ..() - -/datum/controller/subsystem/housing/proc/register_property(obj/effect/landmark/house_spot/property) - if(!property.property_id) - log_admin("Housing: Property at [property.x],[property.y],[property.z] has no property_id!") - return - properties[property.property_id] = property - -/datum/controller/subsystem/housing/proc/initialize_properties() - for(var/property_id in properties) - var/obj/effect/landmark/house_spot/property = properties[property_id] - - var/list/owner_data = property_owners[property_id] - if(owner_data) - var/owner_ckey = owner_data["ckey"] - var/owner_slot = owner_data["slot"] - - if(!validate_rent_payment(owner_ckey, property)) - property_owners -= property_id - owner_data = null - save_persistent_owners() - - if(owner_data) - property.owner_ckey = owner_ckey - property.owner_property_slot = owner_slot - property.temporary_claim = FALSE - load_property(property, owner_ckey, owner_slot) - create_property_controller(property) - continue - - load_default_template(property) - -/datum/controller/subsystem/housing/proc/load_persistent_owners() - if(!fexists("data/property_owners.json")) - return - - var/json_data = file2text("data/property_owners.json") - property_owners = json_decode(json_data) - if(!property_owners) - property_owners = list() - -/datum/controller/subsystem/housing/proc/save_persistent_owners() - var/json_data = json_encode(property_owners) - rustg_file_write(json_data, "data/property_owners.json") - -/datum/controller/subsystem/housing/proc/validate_rent_payment(ckey, obj/effect/landmark/house_spot/property) - if(!rent_collection_enabled) - return TRUE - - var/datum/save_manager/SM = get_save_manager(ckey) - var/current_balance = SM.get_data("banking", "persistent_balance", 0) - - if(current_balance < property.rent_cost) - return FALSE - - SM.set_data("banking", "persistent_balance", current_balance - property.rent_cost) - return TRUE - -/datum/controller/subsystem/housing/proc/load_default_template(obj/effect/landmark/house_spot/property, claim = FALSE) - if(!property.default_template) - return FALSE - - var/datum/map_template/template = new property.default_template - var/turf/spawn_location = get_turf(property) - template.load(spawn_location) - - var/lock_id = "[rand(10000, 99999)]" - var/list/lock_list = list(lock_id) - var/list/turfs = template.get_affected_turfs(spawn_location) - for(var/turf/T as anything in turfs) - for(var/obj/structure/sign/property_sign/sign in T.contents) - sign.setup_property_link(property) - if(claim) - var/obj/item/key/new_key = new /obj/item/key(get_turf(sign)) - new_key.lockids = lock_list - if(claim) - for(var/obj/structure/door/door in T.contents) - if(door.lock) - QDEL_NULL(door.lock) - door.lock = new /datum/lock/key(door, lock_list) - - return TRUE - -/datum/controller/subsystem/housing/proc/load_property(obj/effect/landmark/house_spot/property, ckey, slot) - var/property_file = "data/properties/[ckey]_[property.save_id]_[slot].dmm" - - if(fexists(property_file)) - var/datum/map_template/saved_template = new /datum/map_template(property_file, "[ckey]_[property.save_id]_[slot]", TRUE) - var/turf/spawn_location = get_turf(property) - if(saved_template.cached_map) - saved_template.load(get_turf(property)) - var/lock_id = "[slot]_[ckey]" - var/list/lock_list = list(lock_id) - var/list/turfs = saved_template.get_affected_turfs(spawn_location) - for(var/turf/T as anything in turfs) - for(var/obj/structure/sign/property_sign/sign in T.contents) - sign.setup_property_link(property) - var/obj/item/key/new_key = new /obj/item/key(get_turf(sign)) - new_key.lockids = lock_list - for(var/obj/structure/door/door in T.contents) - if(door.lock) - QDEL_NULL(door.lock) - door.lock = new /datum/lock/key(door, lock_list) - - return TRUE - return load_default_template(property, TRUE) - -/datum/controller/subsystem/housing/proc/save_property(obj/effect/landmark/house_spot/property, ckey, slot) - if(!property || !ckey || !slot) - return FALSE - - var/turf/start_turf = get_turf(property) - if(!start_turf) - return FALSE - - var/minx = start_turf.x - var/miny = start_turf.y - var/minz = start_turf.z - var/maxx = minx + property.template_x - 1 - var/maxy = miny + property.template_y - 1 - var/maxz = minz + property.template_z - 1 - - var/save_flags = SAVE_OBJECTS | SAVE_TURFS | SAVE_AREAS | SAVE_OBJECT_PROPERTIES | SAVE_UUID_STASIS | SAVE_WHITELIST - var/map_data = write_map(minx, miny, minz, maxx, maxy, maxz, save_flags, SAVE_SHUTTLEAREA_DONTCARE, property_noop = property.save_id) - - if(!map_data) - log_admin("Housing: Failed to generate map data for [ckey]'s property [property.property_id] slot [slot]") - return FALSE - - var/property_file = "data/properties/[ckey]_[property.save_id]_[slot].dmm" - if(fexists(property_file)) - fdel(property_file) - - var/file_handle = file(property_file) - file_handle << map_data - - log_admin("Housing: Saved property [property.property_id] for [ckey] in slot [slot]") - return TRUE - -/datum/controller/subsystem/housing/proc/create_property_controller(obj/effect/landmark/house_spot/property) - var/datum/property_controller/controller = new(property) - property_controllers += controller - return controller - -/datum/controller/subsystem/housing/proc/purchase_property(obj/effect/landmark/house_spot/property, mob/user, slot) - if(!user || !user.client || !property || !slot) - return FALSE - - var/ckey = user.ckey - - if(property_owners[property.property_id]) - return FALSE - - // Check if user already owns a property (single property limit) - if(player_owns_property(ckey)) - return FALSE - - var/datum/save_manager/SM = get_save_manager(ckey) - var/current_balance = SM.get_data("banking", "persistent_balance", 0) - - if(current_balance < property.rent_cost) - return FALSE - - // Deduct cost - SM.set_data("banking", "persistent_balance", current_balance - property.rent_cost) - - // Set ownership - property_owners[property.property_id] = list("ckey" = ckey, "slot" = slot) - property.owner_ckey = ckey - property.owner_property_slot = slot - property.temporary_claim = FALSE - save_persistent_owners() - - // Reload property with owner's saved data if available - clear_property_area(property) - load_property(property, ckey, slot) - create_property_controller(property) - - return TRUE - -/datum/controller/subsystem/housing/proc/claim_temporary(obj/effect/landmark/house_spot/property, mob/user, slot) - if(!user || !user.client || !property || !slot) - return FALSE - - var/ckey = user.ckey - - // Check if already owned or claimed - if(property_owners[property.property_id] || temporary_claims[property.property_id]) - return FALSE - - // Check if user already has a property with this save_id (permanent or temporary) - if(player_owns_save_id(ckey, property.save_id)) - return FALSE - - // Set temporary claim - temporary_claims[property.property_id] = list("ckey" = ckey, "slot" = slot) - property.owner_ckey = ckey - property.owner_property_slot = slot - property.temporary_claim = TRUE - - // Load property if user has a saved design - clear_property_area(property) - load_property(property, ckey, slot) - create_property_controller(property) - - return TRUE - -/datum/controller/subsystem/housing/proc/get_player_property_slots(ckey, save_id) - if(!ckey || !save_id) - return list() - - var/list/slots = list() - - // Scan for existing property files - for(var/i = 1 to 10) // Check up to 10 slots - var/property_file = "data/properties/[ckey]_[save_id]_[i].dmm" - if(fexists(property_file)) - slots += i - - return slots - -/datum/controller/subsystem/housing/proc/has_saved_property(ckey, save_id, slot) - if(!ckey || !save_id || !slot) - return FALSE - - var/property_file = "data/properties/[ckey]_[save_id]_[slot].dmm" - return fexists(property_file) - -/datum/controller/subsystem/housing/proc/player_owns_save_id(ckey, save_id) - if(!ckey || !save_id) - return FALSE - - // Check permanent ownership - for(var/property_id in property_owners) - var/list/owner_data = property_owners[property_id] - if(owner_data["ckey"] != ckey) - continue - var/obj/effect/landmark/house_spot/property = properties[property_id] - if(property && property.save_id == save_id) - return TRUE - - // Check temporary claims - for(var/property_id in temporary_claims) - var/list/claim_data = temporary_claims[property_id] - if(claim_data["ckey"] != ckey) - continue - var/obj/effect/landmark/house_spot/property = properties[property_id] - if(property && property.save_id == save_id) - return TRUE - - return FALSE - -/datum/controller/subsystem/housing/proc/player_owns_property(client_key) - for(var/property_id in temporary_claims) - var/list/claim_data = temporary_claims[property_id] - if(claim_data["ckey"] == client_key) - return TRUE - - for(var/property_id in property_owners) - var/list/owner_data = property_owners[property_id] - if(owner_data["ckey"] == client_key) - return TRUE - - return FALSE - -/datum/controller/subsystem/housing/proc/auto_claim_compatible_property(mob/user) - if(!user || !user.client) - return null - - var/ckey = user.ckey - - // Look for unclaimed properties that match user's saved designs - for(var/property_id in properties) - var/obj/effect/landmark/house_spot/property = properties[property_id] - - // Skip if already owned/claimed - if(property_owners[property_id] || temporary_claims[property_id]) - continue - - // Check if user has any saved designs for this template type - var/list/available_slots = get_player_property_slots(ckey, property.save_id) - if(available_slots.len > 0) - // Auto-claim with first available slot - if(claim_temporary(property, user, available_slots[1])) - return property - - return null - -/datum/controller/subsystem/housing/proc/clear_property_area(obj/effect/landmark/house_spot/property) - if(!property) - return - - var/turf/start_turf = get_turf(property) - if(!start_turf) - return - - var/minx = start_turf.x - var/miny = start_turf.y - var/minz = start_turf.z - var/maxx = minx + property.template_x - 1 - var/maxy = miny + property.template_y - 1 - var/maxz = minz + property.template_z - 1 - - for(var/turf/T in block(locate(minx, miny, minz), locate(maxx, maxy, maxz))) - var/has_noop = FALSE - for(var/obj/O in T.contents) - if(istype(O, /obj/effect/abstract/property_noop)) - var/obj/effect/abstract/property_noop/effect = O - if(effect.property_id == property.save_id) - has_noop = TRUE - break - if(!has_noop) - for(var/obj/O in T.contents) - if(istype(O, /obj/effect/landmark)) - continue - qdel(O) - - T.ScrapeAway() - -/datum/controller/subsystem/housing/proc/check_access(mob/user) - if(!has_world_trait(/datum/world_trait/delver)) - return TRUE - if(!user || !user.client) - return FALSE - - for(var/datum/property_controller/controller as anything in property_controllers) - if(controller.check_access(user)) - return TRUE - return FALSE - -/datum/property_controller - var/obj/effect/landmark/house_spot/linked_property - var/list/allowed_list = list() - - var/property_bounds_minx - var/property_bounds_miny - var/property_bounds_minz - var/property_bounds_maxx - var/property_bounds_maxy - var/property_bounds_maxz - -/datum/property_controller/New(obj/effect/landmark/house_spot/property) - linked_property = property - if(!property) - return - - var/turf/start_turf = get_turf(property) - if(!start_turf) - return - - property_bounds_minx = start_turf.x - property_bounds_miny = start_turf.y - property_bounds_minz = start_turf.z - property_bounds_maxx = start_turf.x + property.template_x - 1 - property_bounds_maxy = start_turf.y + property.template_y - 1 - property_bounds_maxz = start_turf.z + property.template_z - 1 - -/datum/property_controller/proc/check_access(mob/user) - if(!linked_property || !user || !user.client) - return FALSE - - // Owner has access - if(user.ckey == linked_property.owner_ckey) - return TRUE - - // Check allow list - if(user.ckey in allowed_list) - return TRUE - - return FALSE - -/datum/property_controller/proc/is_in_property_bounds(atom/A) - if(!linked_property) - return FALSE - - var/turf/T = get_turf(A) - if(!T) - return FALSE - - return (T.x >= property_bounds_minx && T.x <= property_bounds_maxx && \ - T.y >= property_bounds_miny && T.y <= property_bounds_maxy && \ - T.z >= property_bounds_minz && T.z <= property_bounds_maxz) - -/datum/property_controller/proc/add_access(ckey) - if(!(ckey in allowed_list)) - allowed_list += ckey - -/datum/property_controller/proc/remove_access(ckey) - allowed_list -= ckey - -// ===== PROPERTY SIGNS ===== -/obj/structure/sign/property_sign - name = "Property Sign" - desc = "A sign for property management." - icon = 'icons/roguetown/misc/structure.dmi' - icon_state = "questnoti" - - var/obj/effect/landmark/house_spot/linked_property - -/obj/structure/sign/property_sign/proc/setup_property_link(obj/effect/landmark/house_spot/property) - linked_property = property - -/obj/structure/sign/property_sign/proc/check_other_players(mob/user) - if(!linked_property) - return FALSE - - var/turf/start_turf = get_turf(linked_property) - if(!start_turf) - return FALSE - - var/minx = start_turf.x - var/miny = start_turf.y - var/minz = start_turf.z - var/maxx = minx + linked_property.template_x - 1 - var/maxy = miny + linked_property.template_y - 1 - var/maxz = minz + linked_property.template_z - 1 - - for(var/turf/T in block(locate(minx, miny, minz), locate(maxx, maxy, maxz))) - for(var/mob/M in T.contents) - if(M == user) - continue - if(M.client) - return TRUE - return FALSE - -/obj/structure/sign/property_sign/claim - var/claimed = FALSE - -/obj/structure/sign/property_sign/claim/attack_hand(mob/user) - . = ..() - if(!user.client || !linked_property) - return - - // If already claimed by this user, allow saving - if(linked_property?.owner_ckey == user.ckey) - save_property_design(user) - return - - // Check if already claimed/owned - if(SShousing.property_owners[linked_property.property_id] || SShousing.temporary_claims[linked_property.property_id]) - to_chat(user, span_warning("This property is already claimed!")) - return - - // Check if user already owns a property with this save_id - if(SShousing.player_owns_save_id(user.ckey, linked_property.save_id)) - to_chat(user, span_warning("You already have a property of this type!")) - return - - if(check_other_players(user)) - to_chat(user, span_warning("Cannot claim while others are present!")) - return - - // Show slot selection interface - show_slot_selection(user) - -/obj/structure/sign/property_sign/claim/proc/show_slot_selection(mob/user) - if(!user || !user.client || !linked_property) - return - - var/list/available_slots = SShousing.get_player_property_slots(user.ckey, linked_property.save_id) - var/list/options = list() - - // Add existing slots - for(var/slot in available_slots) - options["Load Design [slot]"] = slot - - // Add option to create new slot - var/next_slot = 1 - if(available_slots.len > 0) - next_slot = available_slots[available_slots.len] + 1 - options["Create New Design ([next_slot])"] = next_slot - - options["Cancel"] = null - - var/choice = input(user, "Select a property design slot:", "Property Claim") as null|anything in options - if(!choice || options[choice] == null) - return - - var/selected_slot = options[choice] - - if(check_other_players(user)) - to_chat(user, span_warning("Someone entered the area!")) - return - - if(SShousing.claim_temporary(linked_property, user, selected_slot)) - claimed = TRUE - name = "Claimed Property (Slot [selected_slot])" - desc = "Click to save your current design to slot [selected_slot]." - to_chat(user, span_notice("Property claimed with design slot [selected_slot]! Click again to save changes.")) - else - to_chat(user, span_warning("Failed to claim property!")) - -/obj/structure/sign/property_sign/claim/proc/save_property_design(mob/user) - if(!linked_property || linked_property.owner_ckey != user.ckey) - return - - var/slot = linked_property.owner_property_slot - if(!slot) - to_chat(user, span_warning("No slot assigned to this property!")) - return - - var/confirm = tgui_alert(user, "Save the current state to design slot [slot]?", "Save Property", list("Yes", "No")) - if(confirm != "Yes") - return - - if(SShousing.save_property(linked_property, user.ckey, slot)) - to_chat(user, span_notice("Property saved successfully to slot [slot]!")) - else - to_chat(user, span_warning("Failed to save property!")) - -/obj/structure/sign/property_sign/for_sale - -/obj/structure/sign/property_sign/for_sale/attack_hand(mob/user) - . = ..() - if(!user.client || !linked_property) - return - - // Check if already owned - if(SShousing.property_owners[linked_property.property_id]) - to_chat(user, span_warning("This property is already owned!")) - return - - // Check if user already owns a property with this save_id - if(SShousing.player_owns_save_id(user.ckey, linked_property.save_id)) - to_chat(user, span_warning("You already own a property of this type!")) - return - - // Check if user already owns any property - if(SShousing.player_owns_property(user.ckey)) - to_chat(user, span_warning("You already own a property!")) - return - - var/datum/save_manager/SM = get_save_manager(user.ckey) - var/current_balance = SM.get_data("banking", "persistent_balance", 0) - - if(current_balance < linked_property.rent_cost) - to_chat(user, span_warning("You need [linked_property.rent_cost] credits. You have [current_balance].")) - return - - // Show slot selection for purchase - show_purchase_slot_selection(user) - -/obj/structure/sign/property_sign/for_sale/proc/show_purchase_slot_selection(mob/user) - if(!user || !user.client || !linked_property) - return - - var/list/available_slots = SShousing.get_player_property_slots(user.ckey, linked_property.save_id) - var/list/options = list() - - // Add existing slots - for(var/slot in available_slots) - options["Use Design [slot]"] = slot - - // Add option to create new slot - var/next_slot = 1 - if(available_slots.len > 0) - next_slot = available_slots[available_slots.len] + 1 - options["Start Fresh ([next_slot])"] = next_slot - - options["Cancel"] = null - - var/choice = input(user, "Select a property design slot:", "Property Purchase") as null|anything in options - if(!choice || options[choice] == null) - return - - var/selected_slot = options[choice] - - var/confirm = tgui_alert(user, "Purchase this property for [linked_property.rent_cost] credits using slot [selected_slot]?\n\nRent will be deducted each round.", "Property Purchase", list("Yes", "No")) - if(confirm != "Yes") - return - - if(SShousing.purchase_property(linked_property, user, selected_slot)) - to_chat(user, span_notice("Property purchased successfully with design slot [selected_slot]!")) - qdel(src) - else - to_chat(user, span_warning("Purchase failed!")) diff --git a/vanderlin.dme b/vanderlin.dme index 2c05592dc0e..0f95b2ca9aa 100644 --- a/vanderlin.dme +++ b/vanderlin.dme @@ -513,7 +513,6 @@ #include "code\controllers\subsystem\plexora.dm" #include "code\controllers\subsystem\pollution.dm" #include "code\controllers\subsystem\profiler.dm" -#include "code\controllers\subsystem\property_management.dm" #include "code\controllers\subsystem\putrid.dm" #include "code\controllers\subsystem\questboard.dm" #include "code\controllers\subsystem\radio.dm" @@ -603,6 +602,10 @@ #include "code\controllers\subsystem\processing\tram.dm" #include "code\controllers\subsystem\processing\visual_ui.dm" #include "code\controllers\subsystem\processing\wet_floors.dm" +#include "code\controllers\subsystem\properties\controller.dm" +#include "code\controllers\subsystem\properties\landmarks.dm" +#include "code\controllers\subsystem\properties\property_sign.dm" +#include "code\controllers\subsystem\properties\subsystem.dm" #include "code\controllers\subsystem\role_class_handler\role_class_handler.dm" #include "code\controllers\subsystem\role_class_handler\class_select_handler\class_select_handler.dm" #include "code\controllers\subsystem\triumph\triumph_adjust_procs.dm" From 157e4cf58d3193c4d4b88b4e8cc34fa6b9f54f6b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 7 Aug 2026 07:11:43 -0800 Subject: [PATCH 2/8] they all load in --- .../vanderlin/house_templates/noble_blue.dmm | 1 + .../house_templates/noble_yellow.dmm | 1611 ++++++++++++++ _maps/map_files/vanderlin/vanderlin.dmm | 1869 +++++------------ code/modules/mapping/property_template.dm | 18 + 4 files changed, 2112 insertions(+), 1387 deletions(-) create mode 100644 _maps/map_files/vanderlin/house_templates/noble_yellow.dmm diff --git a/_maps/map_files/vanderlin/house_templates/noble_blue.dmm b/_maps/map_files/vanderlin/house_templates/noble_blue.dmm index a190aa69317..c7d6659c369 100644 --- a/_maps/map_files/vanderlin/house_templates/noble_blue.dmm +++ b/_maps/map_files/vanderlin/house_templates/noble_blue.dmm @@ -1228,6 +1228,7 @@ /turf/open/floor/ruinedwood, /area/indoors/town/noble_manor/blue) "Xm" = ( +/obj/structure/sign/property_sign/claim, /turf/closed/wall/mineral/stone/window/moss, /area/outdoors/town/noble_manor/blue) "Xo" = ( diff --git a/_maps/map_files/vanderlin/house_templates/noble_yellow.dmm b/_maps/map_files/vanderlin/house_templates/noble_yellow.dmm new file mode 100644 index 00000000000..b3c275689e7 --- /dev/null +++ b/_maps/map_files/vanderlin/house_templates/noble_yellow.dmm @@ -0,0 +1,1611 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aF" = ( +/obj/structure/closet/keyrack, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"bh" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/paper/scroll{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/natural/feather{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/structure/carpet/green, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"bB" = ( +/obj/machinery/light/fueled/hearth, +/obj/structure/rack/shelf, +/obj/item/reagent_containers/glass/cup/teacup{ + pixel_x = -7; + pixel_y = 41 + }, +/obj/item/reagent_containers/glass/cup/teacup{ + pixel_x = 7; + pixel_y = 42 + }, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"bH" = ( +/obj/structure/chair/bench/couch/left, +/obj/structure/rack/shelf, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"bM" = ( +/obj/structure/door/fancy{ + name = "Lord's Office" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"bN" = ( +/turf/open/floor/tile, +/area/indoors/town/noble_manor/yellow) +"bQ" = ( +/obj/structure/door/fancy{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/obj/effect/mapping_helpers/access/locker, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"ch" = ( +/obj/structure/chair/bench/couch/right, +/obj/structure/rack/shelf, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"cH" = ( +/obj/structure/bars/cemetery, +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"dd" = ( +/obj/structure/chair/wood/alt/chair_noble, +/obj/structure/carpet/green, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"di" = ( +/obj/structure/bars, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"ea" = ( +/obj/structure/door/fancy{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"ef" = ( +/obj/structure/table/wood/plain_alt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"fq" = ( +/obj/item/bin/water, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"fv" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/flashlight/flare/torch/metal, +/obj/item/flint, +/obj/item/weapon/hammer/iron, +/obj/item/natural/bundle/plank, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"fH" = ( +/obj/structure/rack{ + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"gn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/roguerock, +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"gw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"gJ" = ( +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/yellow) +"gX" = ( +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"hm" = ( +/obj/structure/chair/stool, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"ip" = ( +/obj/machinery/light/fueled/wallfire/candle, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/yellow) +"iC" = ( +/obj/structure/mannequin, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"ja" = ( +/obj/structure/carpet/green, +/obj/structure/table/map{ + dir = 6 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"jy" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueledstreet/orange{ + dir = 1 + }, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"jY" = ( +/obj/structure/table/map{ + dir = 9 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"kq" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"kE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"lx" = ( +/obj/item/clothing/shoes/nobleboot, +/obj/item/clothing/head/courtierhat, +/obj/item/clothing/head/chaperon/colored, +/obj/item/clothing/shirt/tunic/noblecoat, +/obj/structure/closet/crate/crafted_closet/inn/south, +/obj/item/clothing/shirt/dress/gown, +/obj/item/clothing/pants/tights/colored/black, +/obj/item/clothing/pants/skirt/patkilt/colored/green, +/obj/item/clothing/shirt/undershirt/sash/colored/green, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"lA" = ( +/obj/structure/bookcase/random{ + pixel_y = 18; + density = 0; + opacity = 0 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"lY" = ( +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/yellow) +"mp" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/book/manners, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"mq" = ( +/obj/structure/flora/grass, +/obj/machinery/light/fueled/wallfire/candle/lamp{ + pixel_y = -32 + }, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"mB" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"mF" = ( +/turf/closed/wall/mineral/stone, +/area/outdoors/town/noble_manor/yellow) +"mZ" = ( +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"nn" = ( +/obj/structure/door/iron/bars{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"nr" = ( +/obj/structure/door/iron/bars{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/yellow) +"oR" = ( +/obj/structure/flora/tree/dead_bush, +/obj/structure/flora/grass, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"po" = ( +/obj/structure/chair/stool{ + pixel_y = 5 + }, +/obj/item/weapon/knife/villager, +/obj/structure/rack/shelf, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"qe" = ( +/obj/machinery/light/fueled/firebowl/standing, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/yellow) +"qp" = ( +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"qR" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/reagent_containers/food/snacks/produce/grain/oat, +/obj/item/clothing/cloak/apron/cook, +/obj/item/book/yeoldecookingmanual, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/obj/item/reagent_containers/food/snacks/produce/grain/wheat, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"rq" = ( +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"rT" = ( +/obj/effect/landmark/events/haunts, +/obj/structure/carpet/green, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"st" = ( +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/yellow) +"sA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/yellow) +"sR" = ( +/obj/machinery/light/fueled/hearth, +/obj/item/reagent_containers/glass/bucket/pot/stone, +/obj/structure/rack/shelf, +/obj/item/reagent_containers/glass/carafe/teapot{ + pixel_y = 44 + }, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"tQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"uc" = ( +/obj/structure/flora/grass/bush/wall, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"uV" = ( +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/yellow) +"uY" = ( +/obj/structure/flora/grass, +/obj/structure/fake_machine/mail{ + mailtag = "Green" + }, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"vs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/stone, +/area/outdoors/town/noble_manor/yellow) +"vt" = ( +/obj/structure/bookcase/random, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"vK" = ( +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"wE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/openclose/reinforced{ + dir = 4 + }, +/turf/open/floor/wood/nosmooth, +/area/outdoors/town/noble_manor/yellow) +"wK" = ( +/turf/closed/wall/mineral/wooddark/horizontal, +/area/indoors/town/noble_manor/yellow) +"wT" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/grass/herb/salvia, +/obj/structure/fluff/railing/border{ + dir = 4 + }, +/turf/open/floor/grass/cold, +/area/indoors/town/noble_manor/yellow) +"xa" = ( +/obj/structure/flora/starfish, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"xj" = ( +/obj/structure/flora/tree/dead_bush, +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/yellow) +"xk" = ( +/obj/structure/table/map{ + dir = 5 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"xu" = ( +/obj/structure/chair/bench, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"xz" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 8 + }, +/obj/item/clothing/gloves/leather, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/clothing/cloak/stabard/jupon, +/obj/item/flashlight/flare/torch/metal, +/obj/item/plate{ + pixel_x = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"xF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/broom, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/yellow) +"yn" = ( +/obj/machinery/light/fueled/oven{ + pixel_y = 31 + }, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"yL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/yellow) +"yZ" = ( +/obj/item/reagent_containers/glass/bucket/wooden, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/yellow) +"ze" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 1 + }, +/obj/structure/flora/grass, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"zr" = ( +/obj/structure/roguerock, +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"Aa" = ( +/obj/structure/well/fountain{ + pixel_x = -16 + }, +/obj/structure/fluff/statue/small{ + pixel_y = 39 + }, +/turf/open/floor/dirt/road, +/area/outdoors/town/noble_manor/yellow) +"Ae" = ( +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"AG" = ( +/obj/structure/flora/shells, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"AQ" = ( +/obj/structure/table/wood/plain_alt, +/turf/closed/basic, +/area/indoors/town/noble_manor/yellow) +"AV" = ( +/obj/structure/fluff/statue/tdummy, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/yellow) +"Bh" = ( +/obj/structure/carpet/green, +/obj/structure/bookcase/random, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"Bj" = ( +/obj/structure/rack, +/obj/item/storage/fancy/cigarettes/zig, +/obj/item/ore/coal{ + pixel_x = 13; + pixel_y = 1 + }, +/obj/item/flint{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Bl" = ( +/turf/open/water/bath, +/area/indoors/town/noble_manor/yellow) +"BL" = ( +/obj/structure/rack/shelf, +/obj/effect/decal/carpet/square{ + pixel_x = 4; + pixel_y = 17 + }, +/obj/structure/rack/shelf/big, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/yellow) +"BQ" = ( +/obj/structure/flora/grass/bush/wall, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"BV" = ( +/obj/effect/spawner/map_spawner/hauntz_random, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"BW" = ( +/obj/structure/bookcase/random, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Ck" = ( +/turf/closed/wall/mineral/decowood, +/area/indoors/town/noble_manor/yellow) +"Cl" = ( +/turf/closed/wall/mineral/stone, +/area/indoors/town/noble_manor/yellow) +"CA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"CE" = ( +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/yellow) +"CJ" = ( +/obj/machinery/light/fueled/hearth/big_fireplace{ + pixel_x = -50 + }, +/turf/closed/wall/mineral/stone, +/area/indoors/town/noble_manor/yellow) +"CW" = ( +/obj/structure/sign/property_sign/claim, +/turf/closed/wall/mineral/stone, +/area/outdoors/town/noble_manor/yellow) +"Dw" = ( +/obj/structure/rack/shelf, +/obj/structure/chair/stool/bar, +/obj/item/soap{ + pixel_x = 6; + pixel_y = 40 + }, +/obj/structure/rack/shelf/big, +/turf/open/floor/tile/bath, +/area/indoors/town/noble_manor/yellow) +"DP" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"DT" = ( +/turf/closed/wall/mineral/wooddark/end, +/area/indoors/town/noble_manor/yellow) +"DW" = ( +/obj/structure/fermentation_keg/water, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"DZ" = ( +/obj/structure/flora/starfish, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"Ee" = ( +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Eg" = ( +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"EC" = ( +/obj/structure/door/fancy{ + name = "Lord's Quarters" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"EF" = ( +/obj/structure/door/weak/bolt{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/yellow) +"EI" = ( +/obj/structure/bed/hay, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Fa" = ( +/turf/closed/mineral, +/area/indoors/town/noble_manor/yellow) +"Fl" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"FP" = ( +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/obj/effect/mapping_helpers/access/locker, +/obj/structure/door/iron/bars{ + name = "Green Noble Vault" + }, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/yellow) +"FS" = ( +/obj/item/weapon/mace/woodclub/train_sword, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/yellow) +"Hd" = ( +/obj/structure/bed/wool/double, +/obj/item/bedsheet/double_pelt, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Hs" = ( +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"Hw" = ( +/obj/structure/chair/bench/couch/alt, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"HA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/yellow) +"Id" = ( +/obj/structure/fluff/clock, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Ie" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"Iv" = ( +/obj/structure/fluff/walldeco/painting/castle, +/turf/closed/wall/mineral/stone, +/area/indoors/town/noble_manor/yellow) +"Iz" = ( +/turf/closed/mineral, +/area/outdoors/town/noble_manor/yellow) +"IV" = ( +/obj/structure/closet/crate/chest/neu_fancy, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/obj/item/storage/keyring, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Jd" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/clothing/face/cigarette/pipe/westman, +/obj/item/reagent_containers/food/snacks/produce/dry_westleach, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Jh" = ( +/obj/effect/decal/cleanable/dirt/cobweb{ + dir = 4 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Jj" = ( +/obj/structure/carpet/green, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"Jk" = ( +/obj/structure/closet/crate/chest/old_crate, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/yellow) +"Jn" = ( +/obj/structure/mirror/fancy{ + pixel_x = -31; + pixel_y = -2 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Jy" = ( +/obj/structure/flora/grass, +/obj/structure/flora/starfish, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"JA" = ( +/obj/structure/carpet/green, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Kl" = ( +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"KM" = ( +/obj/structure/flora/grass, +/obj/structure/closet/crate/chest/old_crate, +/obj/item/natural/bundle/brick, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"Lc" = ( +/obj/structure/flora/grass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"LL" = ( +/turf/closed/basic, +/area/under/cave) +"Mb" = ( +/obj/structure/closet/crate/chest/gold, +/turf/open/floor/tile, +/area/indoors/town/noble_manor/yellow) +"Mi" = ( +/obj/structure/fluff/wallclock, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Mm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Mz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/carpet/green, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"Nc" = ( +/obj/structure/rack{ + pixel_y = -1 + }, +/obj/item/dice/d6/bone, +/obj/item/dice/d6/ebony, +/obj/item/toy/cards/deck, +/obj/item/dice_cup/wooden/liars_dice, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"No" = ( +/obj/structure/table/wood/reinforced_alter, +/obj/item/reagent_containers/glass/carafe, +/obj/item/reagent_containers/glass/cup{ + pixel_x = -8; + pixel_y = -4 + }, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"Np" = ( +/obj/structure/window/openclose/reinforced{ + dir = 1 + }, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"NO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dirt, +/area/outdoors/town/noble_manor/yellow) +"Ok" = ( +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"Oq" = ( +/obj/structure/flora/sandbrick, +/obj/structure/flora/sandbrick{ + pixel_x = 9 + }, +/obj/structure/flora/sandbrick{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/structure/flora/driftwood, +/turf/open/water/ocean, +/area/outdoors/town/noble_manor/yellow) +"OV" = ( +/turf/closed/basic, +/area/outdoors/beach) +"Pi" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/cooking/pan, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"Pn" = ( +/obj/structure/table/map{ + dir = 10 + }, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Qc" = ( +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/yellow) +"QH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"Ra" = ( +/obj/structure/bed/hay, +/obj/effect/decal/cleanable/dirt/cobweb, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Rg" = ( +/obj/structure/handcart, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/rope, +/obj/machinery/light/fueled/wallfire/candle/lamp, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Ri" = ( +/obj/structure/closet/crate/drawer/inn, +/obj/item/storage/belt/pouch/coins/mid, +/obj/item/servant_bell, +/obj/item/lipstick/green, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"RJ" = ( +/obj/structure/closet/crate/crafted_closet, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/natural/cloth, +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/broom, +/obj/item/flint, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"RR" = ( +/obj/structure/table/wood/fancy/green, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"RX" = ( +/turf/open/floor/ruinedwood/alt, +/area/indoors/town/noble_manor/yellow) +"SM" = ( +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/yellow) +"SR" = ( +/obj/structure/door/fancy{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/ruinedwood/two, +/area/indoors/town/noble_manor/yellow) +"SY" = ( +/obj/structure/closet/crate/chest/old_crate, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/kitchen/spoon/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/reagent_containers/glass/bowl/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/obj/item/kitchen/fork/iron, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"Tc" = ( +/obj/structure/rack/shelf, +/obj/structure/closet/crate/chest/old_crate, +/turf/open/floor/ruinedwood, +/area/indoors/town/noble_manor/yellow) +"Tf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"Tg" = ( +/obj/structure/table/map{ + dir = 9 + }, +/obj/item/book/bibble{ + pixel_x = 1; + pixel_y = -14 + }, +/obj/machinery/light/fueled/wallfire/candle/r, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"Tu" = ( +/obj/structure/bookcase/random, +/obj/machinery/light/fueled/wallfire/candle/l, +/turf/open/floor/herringbone, +/area/indoors/town/noble_manor/yellow) +"TI" = ( +/obj/structure/roguerock, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"TO" = ( +/obj/structure/fluff/walldeco/painting/castle, +/turf/closed/wall/mineral/craftstone, +/area/indoors/town/noble_manor/yellow) +"Uo" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"Uv" = ( +/obj/structure/flora/newtree/palm, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"UF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bookcase/random, +/turf/open/floor/wood, +/area/indoors/town/noble_manor/yellow) +"UX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/cobblerock/alt, +/area/outdoors/town/noble_manor/yellow) +"Vg" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/reagent_containers/peppermill, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"Vh" = ( +/obj/structure/flora/grass/bush_meagre, +/obj/structure/flora/grass, +/turf/open/floor/grass, +/area/outdoors/town/noble_manor/yellow) +"Vo" = ( +/obj/structure/door/fancy{ + name = "Green Noble Manor" + }, +/obj/effect/mapping_helpers/access/locker, +/obj/effect/mapping_helpers/access/keyset/manor/Noble2, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"VF" = ( +/obj/structure/flora/starfish, +/obj/structure/bars/cemetery, +/turf/open/floor/sand, +/area/outdoors/town/noble_manor/yellow) +"Wt" = ( +/obj/structure/fermentation_keg/water, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"Wz" = ( +/obj/structure/chair/wood/alt{ + dir = 1 + }, +/obj/structure/carpet/green, +/turf/open/floor/wood/nosmooth, +/area/indoors/town/noble_manor/yellow) +"Xc" = ( +/turf/open/floor/cobblerock/alt, +/area/indoors/town/noble_manor/yellow) +"Xq" = ( +/obj/machinery/light/fueled/wallfire/candle{ + pixel_y = -32 + }, +/turf/open/water/bath, +/area/indoors/town/noble_manor/yellow) +"XN" = ( +/obj/structure/table/wood/plain_alt, +/obj/item/weapon/knife/villager, +/obj/item/kitchen/rollingpin{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/structure/fluff/millstone, +/turf/open/floor/tile/kitchen, +/area/indoors/town/noble_manor/yellow) +"YM" = ( +/obj/structure/closet/crate/crafted_closet/inn/south, +/turf/open/floor/dirt/road, +/area/indoors/town/noble_manor/yellow) +"YZ" = ( +/turf/open/floor/tile/checker, +/area/indoors/town/noble_manor/yellow) +"ZH" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/grass, +/obj/structure/flora/grass/herb/salvia, +/obj/structure/fluff/railing/border{ + dir = 4 + }, +/turf/open/floor/grass/cold, +/area/indoors/town/noble_manor/yellow) + +(1,1,1) = {" +OV +OV +OV +OV +OV +OV +OV +OV +OV +OV +OV +Uo +Uo +Uo +Uo +Uo +nn +nn +Uo +Uo +VF +Uo +Uo +Uo +OV +"} +(2,1,1) = {" +OV +LL +LL +LL +OV +OV +OV +OV +OV +OV +Uo +Uo +qp +qp +qp +qp +qp +qp +qp +qp +qp +qp +AG +Uo +Uo +"} +(3,1,1) = {" +LL +LL +LL +LL +LL +LL +OV +OV +OV +OV +cH +qp +qp +qp +qp +qp +qp +qp +qp +qp +qp +qp +qp +qp +Uo +"} +(4,1,1) = {" +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +cH +gX +qp +qp +DZ +AV +Qc +qp +qp +AG +qp +qp +qp +qp +Uo +"} +(5,1,1) = {" +LL +LL +LL +LL +LL +Cl +Cl +Cl +Cl +Cl +Cl +gX +gX +qp +qp +st +st +Qc +qp +qp +qp +qp +qp +qp +Fl +"} +(6,1,1) = {" +LL +LL +LL +LL +LL +Cl +bN +bN +bN +bN +Cl +Oq +gX +AG +qp +qp +st +FS +Qc +Qc +DZ +qp +qp +mF +Iz +"} +(7,1,1) = {" +LL +LL +LL +LL +LL +Cl +Mb +YZ +YZ +Mb +Cl +zr +gX +gX +qp +rq +rq +st +st +Qc +qp +rq +rq +uV +uV +"} +(8,1,1) = {" +LL +LL +LL +LL +LL +Cl +Mb +YZ +YZ +Mb +Cl +mF +kE +kE +gn +NO +Tf +Tf +rq +UX +UX +xu +Kl +Kl +Aa +"} +(9,1,1) = {" +LL +LL +LL +LL +LL +Cl +qe +bN +bN +bN +Cl +mF +wE +wE +vs +gJ +st +Tf +QH +qp +Qc +UX +rq +xa +rq +"} +(10,1,1) = {" +SM +SM +SM +SM +SM +Cl +SM +SM +FP +Cl +DT +wK +wT +ZH +HA +SM +SM +SM +SM +oR +BV +UX +Qc +BQ +CW +"} +(11,1,1) = {" +Cl +lx +Jn +iC +SM +SM +SM +Tu +Ee +Cl +Cl +bH +jY +Pn +Eg +UF +CA +Nc +SM +uY +qp +UX +Qc +rq +Fl +"} +(12,1,1) = {" +Cl +Ee +JA +JA +Bj +Cl +Id +JA +JA +Ee +Cl +ch +xk +ja +Wz +Bh +Ie +fH +Np +xj +UX +UX +Qc +Qc +nr +"} +(13,1,1) = {" +Cl +Hw +JA +JA +Ee +bM +JA +JA +Ee +Ee +EC +Ae +Jj +Jj +Jj +rT +Mz +CA +ea +UX +UX +UX +UX +qp +Uo +"} +(14,1,1) = {" +CJ +lA +JA +JA +vK +SM +JA +Ee +Ee +JA +Cl +Mi +Jj +Jj +Jj +Mz +Mz +Mm +Np +Jy +lY +xF +yL +rq +mF +"} +(15,1,1) = {" +Cl +lA +Ri +Hd +Cl +SM +aF +Ee +dd +bh +Cl +BW +mZ +Jj +Jj +Mz +Ie +RR +SM +Uv +qp +yL +yL +uc +mF +"} +(16,1,1) = {" +SM +Cl +Iv +Cl +SM +SM +mp +IV +No +Jd +Cl +vt +Ae +Ae +Tg +Pn +CA +hm +Cl +TI +jy +qp +uc +Vh +mF +"} +(17,1,1) = {" +LL +LL +LL +LL +LL +Cl +Cl +SM +TO +SM +SM +SM +di +Vo +Cl +Cl +SR +Cl +SM +Ck +Ck +EF +Ck +Ck +Cl +"} +(18,1,1) = {" +LL +LL +LL +LL +LL +LL +LL +LL +LL +SM +sR +Ok +Ok +gw +ef +Cl +BL +CE +Cl +YM +Xc +sA +tQ +Jh +Cl +"} +(19,1,1) = {" +LL +LL +LL +LL +LL +LL +LL +LL +LL +Cl +yn +Ok +Pi +gw +qR +Cl +Dw +CE +Cl +KM +tQ +sA +CA +Ae +Cl +"} +(20,1,1) = {" +LL +LL +LL +LL +LL +SM +SM +SM +Cl +Cl +bB +Ok +Vg +gw +SY +Cl +ip +Xq +Cl +ze +DP +mB +Ae +Fa +Cl +"} +(21,1,1) = {" +LL +LL +LL +LL +LL +SM +Tc +Hs +Jk +Cl +XN +Ok +Ok +Ok +AQ +Cl +Bl +Bl +Cl +Fa +Rg +CA +mq +Fa +Cl +"} +(22,1,1) = {" +LL +LL +LL +LL +LL +SM +yZ +RX +RX +bQ +Ok +Ok +DW +Wt +SM +SM +SM +Bl +Cl +Ra +Ae +Lc +CA +fv +Cl +"} +(23,1,1) = {" +LL +LL +LL +LL +LL +Cl +po +kq +RJ +SM +SM +SM +SM +SM +Cl +LL +SM +Cl +Cl +EI +Ae +mB +CA +fq +Cl +"} +(24,1,1) = {" +LL +LL +LL +LL +LL +Cl +Cl +Cl +Cl +Cl +LL +LL +LL +LL +LL +LL +LL +LL +Cl +EI +Ae +sA +CA +xz +Cl +"} +(25,1,1) = {" +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +Cl +Cl +Cl +Cl +Cl +Cl +Cl +"} diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm index bc6c62cd2dd..38c4eaf1bf8 100644 --- a/_maps/map_files/vanderlin/vanderlin.dmm +++ b/_maps/map_files/vanderlin/vanderlin.dmm @@ -134,10 +134,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/outdoors/town) -"adG" = ( -/obj/structure/fluff/clock, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "adO" = ( /obj/structure/fake_machine/hailer, /obj/machinery/light/fueled/wallfire/candle/l, @@ -843,9 +839,6 @@ "avH" = ( /turf/open/floor/cobblerock/alt, /area/outdoors/eora) -"avJ" = ( -/turf/closed/mineral, -/area/indoors/town/noble_manor/yellow) "avL" = ( /mob/living/carbon/human/species/skeleton/npc/ambush, /turf/open/floor/cobble/alt, @@ -1263,10 +1256,6 @@ /obj/structure/fluff/walldeco/mageguild, /turf/closed/wall/mineral/stonebrick, /area/indoors/town/keep/magician) -"aJQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "aJV" = ( /obj/structure/rack, /obj/item/natural/bundle/cloth{ @@ -1302,10 +1291,6 @@ }, /turf/open/floor/carpet/royalblack, /area/indoors/town/keep/garrison) -"aKo" = ( -/obj/machinery/light/fueled/firebowl/standing, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/yellow) "aKv" = ( /obj/structure/fluff/railing/border{ dir = 10 @@ -1611,15 +1596,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/indoors/town) -"aPp" = ( -/obj/structure/rack/shelf, -/obj/effect/decal/carpet/square{ - pixel_x = 4; - pixel_y = 17 - }, -/obj/structure/rack/shelf/big, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/yellow) "aPz" = ( /obj/structure/curtain/bounty{ color = "grey" @@ -2263,10 +2239,6 @@ /obj/effect/mapping_helpers/access/keyset/town/smith, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/smithy) -"bhA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/yellow) "bhL" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -2424,10 +2396,6 @@ /obj/structure/fluff/statue/scare, /turf/open/floor/grass, /area/outdoors/farm) -"bkG" = ( -/obj/machinery/light/fueled/wallfire/candle, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/yellow) "bkJ" = ( /obj/structure/fluff/railing/wood, /obj/effect/landmark/stall, @@ -2930,13 +2898,6 @@ /obj/item/weapon/surgery/scalpel, /turf/open/floor/churchmarble, /area/indoors/town/clinic_large) -"bwW" = ( -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/obj/structure/carpet/green, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "bwX" = ( /obj/structure/flora/grass/bush/wall/tall, /obj/structure/fluff/railing/wood{ @@ -4052,17 +4013,11 @@ "bYD" = ( /turf/open/floor/ruinedwood/turned, /area/outdoors/town) -"bYI" = ( -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "bYJ" = ( /obj/structure/flora/grass, /obj/structure/flora/newtree, /turf/open/floor/grass/red, /area/outdoors/woods_safe) -"bYK" = ( -/turf/open/water/bath, -/area/indoors/town/noble_manor/yellow) "bYP" = ( /turf/open/floor/tile/bath/pool{ dir = 4 @@ -4576,11 +4531,6 @@ /obj/item/needle, /turf/open/floor/blocks/newstone, /area/indoors/town/church) -"coY" = ( -/obj/structure/table/wood/plain_alt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "cpf" = ( /obj/structure/bars, /turf/open/water/sewer, @@ -4843,9 +4793,6 @@ /obj/machinery/light/fueled/torchholder/metal_torch/north, /turf/open/floor/ruinedwood/turned/darker, /area/outdoors/town) -"ctu" = ( -/turf/closed/wall/mineral/stone, -/area/outdoors/town/noble_manor/yellow) "cty" = ( /obj/structure/fluff/railing/border{ dir = 1 @@ -6935,11 +6882,6 @@ "dro" = ( /turf/closed/wall/mineral/stone, /area/indoors/town/keep/servanthead) -"drq" = ( -/obj/structure/bookcase/random, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "drC" = ( /obj/structure/table/wood/plain_alt, /obj/item/reagent_containers/glass/cup/wooden{ @@ -6987,16 +6929,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/indoors/town) -"dsk" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/grass, -/obj/structure/flora/grass/herb/salvia, -/obj/structure/fluff/railing/border{ - dir = 4 - }, -/turf/open/floor/grass/cold, -/area/indoors/town/noble_manor/yellow) "dsp" = ( /obj/structure/chair/stool, /turf/open/floor/wood, @@ -7191,11 +7123,6 @@ /obj/effect/mapping_helpers/access/keyset/manor/mage, /turf/open/floor/blocks, /area/indoors/town/keep/magician) -"dyL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/stool, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "dyW" = ( /turf/open/floor/grass/yel, /area/outdoors/town) @@ -7318,14 +7245,6 @@ /obj/structure/fluff/walldeco/mageguild, /turf/closed/wall/mineral/stone, /area/indoors/town/keep/magician) -"dCq" = ( -/obj/structure/bookcase/random{ - pixel_y = 18; - density = 0; - opacity = 0 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "dCv" = ( /obj/effect/landmark/tram/queued_path/cargo_pre_enter{ next_path_id = "cargo_stop" @@ -7365,10 +7284,6 @@ "dDx" = ( /turf/open/floor/ruinedwood, /area/indoors/town/keep/guest/guest2) -"dDD" = ( -/obj/structure/bars, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "dDJ" = ( /turf/closed/wall/mineral/wooddark/end{ dir = 1 @@ -7932,9 +7847,6 @@ /obj/structure/flora/grass/bush/wall/tall, /turf/open/floor/grass/healthy, /area/under/town/basement) -"dRl" = ( -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/yellow) "dRP" = ( /turf/open/water/clean/dirt, /area/outdoors/town) @@ -8687,10 +8599,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue/r, /turf/open/floor/churchmarble, /area/under/town/basement) -"ekw" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "elc" = ( /obj/structure/table/wood/plain_alt, /obj/machinery/light/fueled/wallfire/candle/r, @@ -8736,15 +8644,6 @@ /obj/structure/flora/grass/bush/wall, /turf/open/floor/twig, /area/indoors/soilsons) -"emD" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/grass/herb/salvia, -/obj/structure/fluff/railing/border{ - dir = 4 - }, -/turf/open/floor/grass/cold, -/area/indoors/town/noble_manor/yellow) "emG" = ( /obj/structure/bookcase/random, /turf/open/floor/blocks/newstone, @@ -9014,10 +8913,6 @@ /obj/structure/closet/crate/chest/neu, /turf/open/floor/wood, /area/indoors/town/train_station) -"esU" = ( -/obj/structure/flora/newtree/palm, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "esZ" = ( /turf/open/floor/cobblerock, /area/under/cavelava) @@ -9075,20 +8970,6 @@ /obj/item/weapon/mace/woodclub, /turf/open/floor/dirt/road, /area/under/cave) -"eup" = ( -/obj/structure/door/fancy{ - name = "Lord's Office" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) -"eux" = ( -/obj/machinery/light/fueled/wallfire/candle{ - pixel_y = -32 - }, -/turf/open/water/bath, -/area/indoors/town/noble_manor/yellow) "euH" = ( /obj/structure/rack/shelf/biggest, /obj/item/paper, @@ -9342,11 +9223,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hexstone, /area/indoors/town) -"eBd" = ( -/obj/structure/chair/wood/alt/chair_noble, -/obj/structure/carpet/green, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "eBC" = ( /turf/closed/wall/mineral/roofwall/outercorner, /area/outdoors/mountains) @@ -9389,11 +9265,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hexstone, /area/indoors/town/clocktower) -"eDD" = ( -/obj/structure/chair/bench/couch/right, -/obj/structure/rack/shelf, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "eDH" = ( /obj/item/candle/yellow/lit{ pixel_x = -9; @@ -9429,17 +9300,6 @@ "eFi" = ( /turf/closed/wall/mineral/stone/window, /area/indoors/town/clinic_large/apothecary) -"eFn" = ( -/obj/structure/door/weak/bolt{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/yellow) -"eFy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "eFK" = ( /obj/effect/decal/borderfall{ dir = 1 @@ -9472,14 +9332,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/cobblerock, /area/indoors/soilsons) -"eGT" = ( -/obj/structure/door/fancy{ - name = "Lord's Quarters" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "eHx" = ( /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/cobblerock, @@ -9572,11 +9424,6 @@ /obj/structure/fluff/walldeco/vinez, /turf/closed/wall/mineral/stone, /area/indoors/town/clinic_large/apothecary) -"eIR" = ( -/obj/structure/flora/grass, -/obj/structure/flora/starfish, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "eIS" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_y = -32 @@ -9873,22 +9720,6 @@ /obj/structure/table/wood/fancy/purple, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town) -"ePk" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/kitchen/spoon/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/reagent_containers/glass/bowl/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/obj/item/kitchen/fork/iron, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "ePo" = ( /obj/structure/fluff/railing/border{ dir = 1 @@ -10149,11 +9980,6 @@ }, /turf/open/floor/herringbone, /area/indoors/town/keep/knight) -"eVd" = ( -/obj/structure/fermentation_keg/water, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "eVx" = ( /obj/structure/flora/grass/water, /turf/open/floor/cobblerock, @@ -10854,10 +10680,6 @@ }, /turf/open/floor/cobble, /area/outdoors/town) -"fmQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "fmS" = ( /obj/structure/stairs/stone/church{ dir = 4 @@ -11193,13 +11015,6 @@ }, /turf/open/floor/wood, /area/indoors/town/keep/garrison) -"fwE" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "fwT" = ( /obj/structure/flora/newtree/scorched, /turf/open/floor/naturalstone, @@ -11709,11 +11524,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/indoors/town) -"fKt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/broom, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/yellow) "fKx" = ( /obj/structure/fluff/railing/border{ dir = 10 @@ -11822,10 +11632,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/outdoors/town) -"fMT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "fMY" = ( /obj/effect/mapping_helpers/secret_door_creator/keep{ redstone_id = "MaintenancePassage" @@ -11891,10 +11697,6 @@ }, /turf/open/floor/tile, /area/indoors/town/shop) -"fOF" = ( -/obj/structure/flora/starfish, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "fOK" = ( /mob/living/simple_animal/pet/cat/inn{ desc = "This old, wrinkled cat demands the utmost respect from his servants. Not even the king of Vanderlin is exempt from his worship."; @@ -12063,13 +11865,6 @@ }, /turf/open/floor/cobblerock, /area/indoors/town/keep/magician) -"fTP" = ( -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 1 - }, -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "fTU" = ( /obj/structure/fluff/walldeco/church/line{ dir = 8 @@ -12383,17 +12178,6 @@ "gby" = ( /turf/open/floor/plank, /area/outdoors/mountains) -"gbA" = ( -/obj/effect/landmark/events/haunts, -/obj/structure/carpet/green, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) -"gbK" = ( -/obj/structure/table/map{ - dir = 5 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "gcf" = ( /obj/structure/flora/grass, /turf/open/floor/dirt, @@ -13562,10 +13346,6 @@ }, /turf/open/floor/church/purple, /area/indoors/town/church/inquisition) -"gIY" = ( -/obj/structure/flora/shells, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "gJq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/fermentation_keg, @@ -13590,11 +13370,6 @@ /obj/structure/rack/shelf/biggest, /turf/open/floor/dirt, /area/under/town/basement) -"gKH" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/book/manners, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "gKO" = ( /obj/structure/stairs/stone, /turf/open/floor/hexstone, @@ -14799,10 +14574,6 @@ }, /turf/open/floor/ruinedwood/turned/alt, /area/outdoors/town) -"hru" = ( -/obj/structure/bars/cemetery, -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "hrv" = ( /obj/item/kitchen/spoon, /obj/structure/fake_machine/scomm/l, @@ -15130,17 +14901,6 @@ "hyT" = ( /turf/open/floor/cobble/alt, /area/outdoors/town) -"hyU" = ( -/obj/structure/closet/crate/crafted_closet, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/broom, -/obj/item/flint, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "hyY" = ( /obj/structure/spider/stickyweb, /turf/open/floor/concrete, @@ -15559,10 +15319,6 @@ }, /turf/open/floor/blocks/stonered/tiny, /area/indoors/town/keep/feast) -"hGI" = ( -/obj/structure/chair/bench/couch/alt, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "hGN" = ( /turf/open/water/swamp, /area/outdoors/town/keep) @@ -15767,10 +15523,6 @@ }, /turf/open/floor/blocks/stonered/tiny, /area/indoors/town/clinic_large/apothecary) -"hNt" = ( -/obj/structure/mannequin, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "hNA" = ( /turf/closed/wall/mineral/stone/window, /area/indoors/town/garrison) @@ -16011,9 +15763,6 @@ /obj/machinery/light/fueled/firebowl, /turf/open/floor/cobblerock, /area/under/cavewet) -"hTA" = ( -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/yellow) "hTH" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/hay, @@ -16613,10 +16362,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/mixyel, /area/indoors/town/church/chapel) -"ijI" = ( -/obj/structure/table/wood/plain_alt, -/turf/closed/basic, -/area/indoors/town/noble_manor/yellow) "ijR" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_x = 32; @@ -16662,12 +16407,6 @@ /obj/effect/landmark/start/vagrant, /turf/open/floor/grass, /area/outdoors/town) -"ila" = ( -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 4 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "ill" = ( /obj/item/ore/copper, /turf/open/floor/cobblerock, @@ -16942,10 +16681,6 @@ }, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/shop) -"iqG" = ( -/obj/structure/bookcase/random, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "irg" = ( /obj/structure/fake_machine/scomm/r, /obj/structure/fluff/walldeco/church/line{ @@ -17866,9 +17601,6 @@ /obj/effect/mapping_helpers/access/keyset/garrison/lieutenant, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/garrison/lieutenant) -"iKO" = ( -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "iLg" = ( /obj/structure/fluff/railing/border{ dir = 8 @@ -17956,10 +17688,6 @@ }, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/tavern) -"iMR" = ( -/obj/structure/table/wood/fancy/green, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "iNg" = ( /obj/structure/rousman_hole, /turf/open/floor/greenstone, @@ -18004,14 +17732,6 @@ }, /turf/open/floor/carpet/lord/left, /area/indoors/town/vault) -"iNV" = ( -/obj/structure/door/iron/bars{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/yellow) "iNY" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/wood, @@ -18054,10 +17774,6 @@ dir = 4 }, /area/indoors/town/keep/throne) -"iOT" = ( -/obj/structure/closet/crate/chest/gold, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/yellow) "iPr" = ( /obj/structure/fluff/walldeco/sign/apothecarysign/left, /turf/open/floor/cobble, @@ -18115,10 +17831,6 @@ }, /turf/open/openspace, /area/outdoors/river) -"iRA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/yellow) "iRF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks, @@ -18803,11 +18515,6 @@ }, /turf/open/floor/cobble, /area/indoors/town/cell) -"jgf" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/reagent_containers/peppermill, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "jgi" = ( /turf/open/floor/grass/eora, /area/outdoors/eora) @@ -19053,13 +18760,6 @@ /obj/effect/decal/cobblerockedge, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) -"jmv" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/openclose/reinforced{ - dir = 4 - }, -/turf/open/floor/wood/nosmooth, -/area/outdoors/town/noble_manor/yellow) "jmB" = ( /obj/machinery/light/fueled/chand, /turf/open/openspace, @@ -19696,10 +19396,6 @@ /obj/structure/chair/stool, /turf/open/floor/cobble/alt, /area/under/town/basement) -"jBn" = ( -/obj/structure/flora/grass/bush/wall, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "jBH" = ( /obj/item/natural/cloth, /obj/item/natural/cloth{ @@ -20909,13 +20605,6 @@ }, /turf/open/floor/dirt, /area/indoors/town/church/inquisition) -"kgf" = ( -/obj/structure/flora/grass, -/obj/machinery/light/fueled/wallfire/candle/lamp{ - pixel_y = -32 - }, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "kgg" = ( /turf/open/floor/carpet/lord/right, /area/indoors/town/keep/throne) @@ -20933,14 +20622,6 @@ /obj/item/candle/skull/lit, /turf/open/floor/woodturned, /area/indoors/town/keep/halls/w) -"kgt" = ( -/obj/structure/door/iron/bars{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "kgu" = ( /obj/effect/decal/cleanable/debris/wood, /turf/open/floor/ruinedwood/alt, @@ -22038,6 +21719,16 @@ /obj/item/toy/cards/deck/syndicate, /turf/open/floor/ruinedwood/darker, /area/indoors/town) +"kIZ" = ( +/obj/effect/landmark/house_spot/noble{ + property_id = "noble_yellow"; + default_template = /datum/map_template/vanderlin_noble_yellow; + save_id = "noble_yellow"; + template_x = 25; + template_y = 25 + }, +/turf/open/floor/sand, +/area/outdoors/beach) "kJa" = ( /obj/structure/bed/wool, /obj/item/bedsheet/fabric, @@ -22192,14 +21883,6 @@ /obj/effect/mapping_helpers/access/keyset/town/apothecary, /turf/open/floor/twig, /area/indoors/town/clinic_large/apothecary) -"kMB" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/flashlight/flare/torch/metal, -/obj/item/flint, -/obj/item/weapon/hammer/iron, -/obj/item/natural/bundle/plank, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "kMN" = ( /obj/structure/fluff/big_chain{ pixel_y = 12 @@ -22259,10 +21942,6 @@ dir = 8 }, /area/under/cavewet) -"kOy" = ( -/obj/structure/fluff/statue/tdummy, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/yellow) "kOK" = ( /obj/item/candle/yellow/lit{ pixel_x = -1; @@ -22505,9 +22184,6 @@ /obj/structure/flora/grass/bush/wall, /turf/closed/mineral, /area/under/cavewet) -"kUV" = ( -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/yellow) "kVf" = ( /obj/structure/pottery_lathe, /obj/machinery/light/fueled/wallfire/candle{ @@ -22523,11 +22199,6 @@ /obj/item/paper/scroll, /turf/open/floor/cobble/alt, /area/under/town/sewer) -"kVz" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "kVP" = ( /obj/structure/chair/wood/alt/chair_noble/red, /turf/open/floor/ruinedwood/spiralfade, @@ -23672,14 +23343,6 @@ }, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/shop) -"lvu" = ( -/obj/structure/door/fancy{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/obj/effect/mapping_helpers/access/locker, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "lvB" = ( /turf/open/openspace, /area/indoors/soilsons) @@ -23913,11 +23576,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/spiral, /area/under/town/basement) -"lCG" = ( -/obj/structure/flora/grass/bush_meagre, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "lCK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/fueled/torchholder{ @@ -24524,19 +24182,12 @@ /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass, /area/outdoors/town) -"lRm" = ( -/obj/structure/carpet/green, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "lRv" = ( /obj/structure/chair/wood/alt/chair_noble{ dir = 1 }, /turf/open/floor/carpet/royalblack, /area/indoors/town/church/inquisition) -"lRy" = ( -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/yellow) "lRC" = ( /obj/structure/flora/grass/thorn_bush, /obj/structure/flora/grass/herb/euphrasia, @@ -24795,11 +24446,6 @@ /obj/effect/landmark/start/sweeper, /turf/open/floor/ruinedwood/turned, /area/indoors/town) -"lWo" = ( -/obj/structure/flora/grass/bush/wall, -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "lWs" = ( /obj/structure/bars{ icon_state = "barsbent"; @@ -24823,10 +24469,6 @@ }, /turf/open/floor/metal/barograte, /area/indoors/town/shop) -"lWx" = ( -/obj/structure/fluff/walldeco/painting/castle, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/yellow) "lWz" = ( /obj/machinery/light/fueled/torchholder{ dir = 1 @@ -25084,10 +24726,6 @@ /obj/structure/fermentation_keg/distiller, /turf/open/floor/cobblerock, /area/under/cave) -"mcT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/yellow) "mcU" = ( /obj/structure/fluff/railing/wood, /obj/structure/flora/grass/herb/calendula, @@ -25103,8 +24741,7 @@ /turf/closed/mineral, /area/under/cave) "mdY" = ( -/obj/structure/bars/cemetery, -/turf/open/floor/sand, +/turf/closed/basic, /area/outdoors/town/noble_manor/yellow) "meo" = ( /obj/structure/fermentation_keg/random/beer, @@ -25162,12 +24799,6 @@ /obj/structure/flora/grass/water, /turf/open/floor/dirt, /area/outdoors/town) -"mga" = ( -/obj/structure/table/map{ - dir = 10 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "mgb" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/blocks, @@ -25205,9 +24836,6 @@ "mgK" = ( /turf/open/floor/hexstone, /area/indoors/town/keep/lord_appt) -"mgZ" = ( -/turf/open/floor/tile/checker, -/area/indoors/town/noble_manor/yellow) "mhk" = ( /obj/effect/mapping_helpers/secret_door_creator/keep{ redstone_id = 606 @@ -25424,10 +25052,6 @@ dir = 4 }, /area/under/cave) -"mnf" = ( -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "mnw" = ( /turf/open/floor/greenstone, /area/indoors/town/keep/library) @@ -25475,10 +25099,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/outdoors/town) -"mok" = ( -/obj/structure/closet/crate/crafted_closet/inn/south, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "moq" = ( /obj/structure/stairs{ dir = 4 @@ -26260,10 +25880,6 @@ "mGE" = ( /turf/closed/wall/mineral/craftstone, /area/indoors/town/steward) -"mGN" = ( -/obj/structure/fluff/walldeco/painting/castle, -/turf/closed/wall/mineral/stone, -/area/indoors/town/noble_manor/yellow) "mHi" = ( /obj/machinery/light/fueledstreet/orange{ dir = 1; @@ -26341,12 +25957,6 @@ /obj/item/natural/feather, /turf/open/floor/tile, /area/indoors/town/keep/halls/s) -"mIK" = ( -/obj/machinery/light/fueledstreet/orange{ - dir = 1 - }, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/yellow) "mIL" = ( /obj/structure/rack/shelf/biggest, /obj/item/reagent_containers/glass/bottle/elfred, @@ -26468,11 +26078,6 @@ /obj/structure/kneestingers, /turf/open/water/clean, /area/under/cavewet) -"mKX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/roguerock, -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "mLl" = ( /obj/structure/ladder, /obj/structure/ladder, @@ -26825,13 +26430,6 @@ /obj/structure/flora/newtree, /turf/open/floor/dirt, /area/outdoors/town/keep) -"mSH" = ( -/obj/structure/closet/crate/drawer/inn, -/obj/item/storage/belt/pouch/coins/mid, -/obj/item/servant_bell, -/obj/item/lipstick/green, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "mSJ" = ( /obj/structure/chair/wood/alt/chair_noble/red, /turf/open/floor/cobble/mossy, @@ -27031,21 +26629,6 @@ }, /turf/open/floor/dirt/road, /area/outdoors/town/keep) -"mZn" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/effect/decal/cleanable/dirt/cobweb{ - dir = 8 - }, -/obj/item/clothing/gloves/leather, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/clothing/cloak/stabard/jupon, -/obj/item/flashlight/flare/torch/metal, -/obj/item/plate{ - pixel_x = 4 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "mZt" = ( /obj/structure/ladder, /obj/machinery/light/fueled/wallfire/candle/blue, @@ -27579,13 +27162,6 @@ }, /turf/open/floor/blocks, /area/under/town/basement) -"nlq" = ( -/obj/structure/flora/grass, -/obj/structure/fake_machine/mail{ - mailtag = "Green" - }, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "nlH" = ( /obj/structure/closet/dirthole/closed, /obj/effect/mapping_helpers/structure/grave_spawner/_tennite, @@ -27639,27 +27215,6 @@ }, /turf/open/floor/cobblerock, /area/indoors/town/church) -"nny" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/paper/scroll{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/natural/feather{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/structure/carpet/green, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "nnF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/cobble, @@ -28582,14 +28137,6 @@ }, /turf/open/floor/wood, /area/outdoors/town) -"nPe" = ( -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/obj/effect/mapping_helpers/access/locker, -/obj/structure/door/iron/bars{ - name = "Green Noble Vault" - }, -/turf/open/floor/tile, -/area/indoors/town/noble_manor/yellow) "nPh" = ( /obj/structure/flora/grass/water/reeds, /obj/structure/fluff/walldeco/vinez, @@ -28628,10 +28175,6 @@ /obj/structure/flora/grass/herb/random, /turf/open/floor/dirt/road, /area/outdoors/basin) -"nQh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "nQn" = ( /obj/machinery/light/fueled/torchholder/r, /obj/structure/table/wood/plain_alt, @@ -28759,17 +28302,6 @@ /obj/structure/fake_machine/scomm/l, /turf/open/floor/church, /area/indoors/town/church/chapel) -"nSX" = ( -/obj/structure/table/map{ - dir = 9 - }, -/obj/item/book/bibble{ - pixel_x = 1; - pixel_y = -14 - }, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "nTm" = ( /obj/structure/underworld/barrier, /turf/open/floor/naturalstone, @@ -28863,10 +28395,6 @@ }, /turf/open/floor/tile, /area/indoors/town/shop) -"nUC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/cobblerock/alt, -/area/outdoors/town/noble_manor/yellow) "nUN" = ( /obj/structure/fluff/walldeco/customflag{ pixel_x = 32 @@ -29805,10 +29333,6 @@ "oqx" = ( /turf/closed/wall/mineral/stone, /area/outdoors/woods_safe) -"oqB" = ( -/obj/structure/flora/starfish, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "oqE" = ( /obj/structure/fluff/railing/wood{ pixel_y = -4 @@ -29949,16 +29473,6 @@ }, /turf/open/floor/wood, /area/indoors/town/tavern) -"osc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) -"osh" = ( -/obj/structure/flora/grass, -/obj/structure/closet/crate/chest/old_crate, -/obj/item/natural/bundle/brick, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "osk" = ( /obj/structure/table/wood/reinf_long, /obj/item/dice, @@ -30020,10 +29534,6 @@ /obj/structure/closet/crate/chest/wicker, /turf/open/floor/twig, /area/outdoors/basin/safe) -"otI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "otV" = ( /obj/structure/chair/bench/church/r{ dir = 1 @@ -30458,11 +29968,6 @@ }, /turf/open/floor/hay, /area/indoors/town/cell) -"oDK" = ( -/obj/structure/bookcase/random, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "oDW" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass/eora, @@ -30521,13 +30026,6 @@ dir = 8 }, /area/outdoors/mountains) -"oEY" = ( -/obj/structure/handcart, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/rope, -/obj/machinery/light/fueled/wallfire/candle/lamp, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "oFb" = ( /obj/structure/closet/crate/crafted_closet, /obj/item/candle/yellow, @@ -30713,12 +30211,6 @@ /obj/structure/minecart_rail, /turf/open/floor/naturalstone, /area/outdoors/town) -"oIk" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/clothing/face/cigarette/pipe/westman, -/obj/item/reagent_containers/food/snacks/produce/dry_westleach, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "oIx" = ( /obj/structure/fluff/railing/wood, /obj/structure/flora/grass, @@ -31077,9 +30569,6 @@ /obj/item/natural/stone, /turf/open/floor/blocks, /area/under/dungeon) -"oSd" = ( -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "oSg" = ( /obj/structure/door/iron/bars, /obj/effect/mapping_helpers/access/locker, @@ -31337,9 +30826,6 @@ "oXW" = ( /turf/open/floor/wood, /area/outdoors/basin/safe) -"oYh" = ( -/turf/closed/mineral, -/area/outdoors/town/noble_manor/yellow) "oYt" = ( /obj/machinery/light/fueled/torchholder{ dir = 1 @@ -31359,11 +30845,6 @@ /obj/structure/bookcase/random/thesis, /turf/open/floor/metal/alt, /area/indoors/town/keep/magician) -"oZd" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/cooking/pan, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "oZj" = ( /obj/item/natural/rock/random, /obj/structure/minecart_rail, @@ -31409,10 +30890,6 @@ /obj/effect/landmark/events/haunts, /turf/open/floor/cobblerock, /area/outdoors/town) -"pao" = ( -/obj/structure/flora/grass, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "pax" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, /turf/open/openspace, @@ -31511,9 +30988,6 @@ dir = 1 }, /area/outdoors/river) -"pcP" = ( -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "pcT" = ( /obj/structure/fluff/railing/wood{ dir = 4 @@ -31590,10 +31064,6 @@ "pef" = ( /turf/closed/wall/mineral/stone/window/moss, /area/outdoors/basin) -"peh" = ( -/obj/structure/bars/cemetery, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "pei" = ( /obj/structure/fermentation_keg/random/water, /turf/open/floor/woodturned, @@ -32262,9 +31732,6 @@ /obj/structure/fluff/railing/border, /turf/open/floor/greenstone, /area/under/town/sewer) -"pvl" = ( -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/yellow) "pvy" = ( /obj/item/bin/water/gross, /turf/open/floor/tile/kitchen, @@ -32504,10 +31971,6 @@ }, /turf/closed/wall/mineral/stone/window/moss, /area/indoors/town/clinic_large/apothecary) -"pBb" = ( -/obj/item/weapon/mace/woodclub/train_sword, -/turf/open/floor/dirt, -/area/outdoors/town/noble_manor/yellow) "pBm" = ( /obj/structure/fluff/railing/border{ dir = 1 @@ -32728,18 +32191,6 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/town/roofs) -"pGk" = ( -/obj/item/clothing/shoes/nobleboot, -/obj/item/clothing/head/courtierhat, -/obj/item/clothing/head/chaperon/colored, -/obj/item/clothing/shirt/tunic/noblecoat, -/obj/structure/closet/crate/crafted_closet/inn/south, -/obj/item/clothing/shirt/dress/gown, -/obj/item/clothing/pants/tights/colored/black, -/obj/item/clothing/pants/skirt/patkilt/colored/green, -/obj/item/clothing/shirt/undershirt/sash/colored/green, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "pGp" = ( /turf/closed/mineral, /area/under/town/sewer) @@ -32879,18 +32330,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue/r, /turf/open/floor/blocks, /area/indoors/town/keep/magician) -"pJY" = ( -/obj/structure/flora/sandbrick, -/obj/structure/flora/sandbrick{ - pixel_x = 9 - }, -/obj/structure/flora/sandbrick{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/structure/flora/driftwood, -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "pKd" = ( /obj/structure/table/wood/counter/end{ dir = 1 @@ -33070,16 +32509,6 @@ }, /turf/open/openspace, /area/outdoors/river) -"pOI" = ( -/obj/structure/table/wood/plain_alt, -/obj/item/weapon/knife/villager, -/obj/item/kitchen/rollingpin{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/structure/fluff/millstone, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "pOV" = ( /obj/structure/flora/grass/water, /obj/structure/flora/grass/water, @@ -33195,14 +32624,6 @@ /obj/item/bedsheet/wool, /turf/open/floor/wood, /area/indoors/town) -"pRk" = ( -/obj/structure/door/fancy{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "pRI" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -34168,10 +33589,6 @@ /obj/structure/chair/wood/alt, /turf/open/floor/blocks, /area/indoors/town/cell) -"qrs" = ( -/obj/item/bin/water, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "qrG" = ( /obj/structure/fluff/walldeco/church/line, /obj/structure/fluff/walldeco/church/line{ @@ -35169,10 +34586,6 @@ /obj/structure/fluff/statue/gargoyle, /turf/open/floor/cobble, /area/indoors/town/church) -"qOl" = ( -/obj/effect/spawner/map_spawner/hauntz_random, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "qOq" = ( /turf/closed/wall/mineral/stone, /area/indoors/town) @@ -35337,15 +34750,6 @@ "qRG" = ( /turf/closed/wall/mineral/stonebrick, /area/indoors/town/keep/magician) -"qRJ" = ( -/obj/structure/table/wood/reinforced_alter, -/obj/item/reagent_containers/glass/carafe, -/obj/item/reagent_containers/glass/cup{ - pixel_x = -8; - pixel_y = -4 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "qRO" = ( /obj/structure/curtain/bounty/dir, /turf/closed/wall/mineral/wooddark/window, @@ -35630,11 +35034,6 @@ /obj/structure/flora/grass/bush, /turf/open/floor/dirt, /area/outdoors/woods_safe) -"qYN" = ( -/obj/structure/carpet/green, -/obj/structure/bookcase/random, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "qYO" = ( /obj/structure/flora/newleaf/corner{ dir = 5 @@ -35796,7 +35195,7 @@ "rdl" = ( /obj/effect/landmark/house_spot/noble{ save_id = "noble_red"; - property_id = "lodge_two"; + property_id = "noble_red"; default_template = /datum/map_template/vanderlin_noble_red; template_x = 29; template_y = 26 @@ -35994,12 +35393,6 @@ /obj/structure/door/stone, /turf/open/floor/cobble, /area/indoors/dungeon) -"rig" = ( -/obj/structure/table/map{ - dir = 9 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "rii" = ( /obj/structure/chair/wood/alt{ dir = 8 @@ -36160,15 +35553,6 @@ "rln" = ( /turf/closed/wall/mineral/decorstone, /area/indoors/town/keep/halls/e) -"rlw" = ( -/obj/structure/door/fancy{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "rlC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/spider/stickyweb, @@ -36710,9 +36094,6 @@ }, /turf/open/floor/tile, /area/indoors/town/keep/servant) -"rzd" = ( -/turf/open/floor/cobblerock/alt, -/area/indoors/town/noble_manor/yellow) "rzg" = ( /turf/closed/wall/mineral/stone, /area/indoors/town/garrison) @@ -36821,16 +36202,6 @@ }, /turf/open/floor/woodturned, /area/indoors/soilsons) -"rBc" = ( -/obj/structure/chair/stool, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) -"rBf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bookcase/random, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "rBp" = ( /obj/structure/table/wood{ dir = 4; @@ -37077,11 +36448,6 @@ "rGL" = ( /turf/open/floor/metal, /area/indoors/town/shop) -"rHa" = ( -/obj/structure/rack/shelf, -/obj/structure/closet/crate/chest/old_crate, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/yellow) "rHl" = ( /obj/structure/flora/grass{ icon_state = "grass2" @@ -37127,10 +36493,6 @@ }, /turf/open/floor/wood, /area/indoors/town/cell) -"rIu" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "rIA" = ( /obj/structure/chair/stool, /obj/structure/fluff/walldeco/church/line{ @@ -37971,17 +37333,6 @@ /obj/machinery/light/fueled/wallfire/candle/lamp, /turf/open/floor/cobble, /area/under/town/basement) -"sau" = ( -/obj/structure/rack{ - pixel_y = -1 - }, -/obj/item/dice/d6/bone, -/obj/item/dice/d6/ebony, -/obj/item/toy/cards/deck, -/obj/item/dice_cup/wooden/liars_dice, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "saB" = ( /obj/structure/fake_machine/mail/r{ mailtag = "Keep Guest Room 2" @@ -38671,11 +38022,6 @@ }, /turf/open/floor/ruinedwood/two, /area/indoors/town/shop) -"srs" = ( -/obj/structure/flora/tree/dead_bush, -/obj/structure/flora/grass, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "srv" = ( /obj/structure/fake_machine/scomm/l, /turf/open/floor/metal/barograte, @@ -39757,23 +39103,6 @@ }, /turf/open/floor/blocks/newstone/alt, /area/indoors/town/adv_guild) -"sQG" = ( -/obj/structure/rack/shelf, -/obj/structure/chair/stool/bar, -/obj/item/soap{ - pixel_x = 6; - pixel_y = 40 - }, -/obj/structure/rack/shelf/big, -/turf/open/floor/tile/bath, -/area/indoors/town/noble_manor/yellow) -"sQK" = ( -/obj/structure/mirror/fancy{ - pixel_x = -31; - pixel_y = -2 - }, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "sRe" = ( /obj/structure/table/wood/reinforced_alter, /obj/structure/bars{ @@ -39787,17 +39116,6 @@ /obj/effect/decal/carpet, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/clinic_large/feldsher) -"sRD" = ( -/obj/structure/chair/bench/couch/left, -/obj/structure/rack/shelf, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) -"sRI" = ( -/obj/structure/closet/keyrack, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "sRP" = ( /obj/structure/fluff/walldeco/church/line{ dir = 4 @@ -40222,10 +39540,6 @@ /obj/machinery/light/fueled/chand, /turf/open/openspace, /area/indoors/town/keep/halls/w) -"tez" = ( -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/yellow) "teU" = ( /obj/structure/mirror{ pixel_x = -32; @@ -40489,10 +39803,6 @@ /obj/item/reagent_containers/glass/bottle/water, /turf/open/floor/churchbrick, /area/indoors/town/clinic_large/feldsher) -"tkL" = ( -/obj/structure/roguerock, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "tlF" = ( /obj/structure/fluff/railing/border{ dir = 6 @@ -40528,11 +39838,6 @@ /obj/structure/fluff/railing/border, /turf/open/floor/tile/kitchen, /area/indoors/town) -"tmj" = ( -/obj/structure/flora/tree/dead_bush, -/obj/structure/flora/grass, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/yellow) "tmo" = ( /obj/machinery/essence/research_matrix, /turf/open/floor/blocks/stonered/tiny, @@ -40597,10 +39902,6 @@ /obj/structure/bars/cemetery, /turf/open/floor/dirt, /area/outdoors/farm) -"tnM" = ( -/obj/structure/roguerock, -/turf/open/water/ocean, -/area/outdoors/town/noble_manor/yellow) "tnU" = ( /obj/structure/table/wood/plain, /obj/item/kitchen/fork/iron{ @@ -40821,9 +40122,6 @@ /obj/structure/rack, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/merc_guild) -"tuw" = ( -/turf/open/floor/tile, -/area/indoors/town/noble_manor/yellow) "tuC" = ( /obj/structure/fake_machine/scomm/r, /turf/open/floor/ruinedwood/turned/darker, @@ -40993,10 +40291,6 @@ /obj/item/natural/cloth, /turf/open/floor/cobble, /area/under/town/basement) -"tyB" = ( -/obj/item/reagent_containers/glass/bucket/wooden, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/yellow) "tyF" = ( /obj/structure/fluff/railing/wood{ pixel_y = -4 @@ -41100,11 +40394,6 @@ /obj/structure/fluff/wallclock/l, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/merc_guild) -"tBe" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/carpet/green, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "tBi" = ( /obj/structure/water_pipe{ name = "keep line" @@ -41373,19 +40662,6 @@ "tHF" = ( /turf/closed/mineral/bedrock, /area/indoors/town/noble_manor/red) -"tHI" = ( -/obj/machinery/light/fueled/hearth, -/obj/structure/rack/shelf, -/obj/item/reagent_containers/glass/cup/teacup{ - pixel_x = -7; - pixel_y = 41 - }, -/obj/item/reagent_containers/glass/cup/teacup{ - pixel_x = 7; - pixel_y = 42 - }, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "tHJ" = ( /obj/structure/carpet/purple, /turf/open/floor/wood, @@ -41834,10 +41110,6 @@ /obj/item/reagent_containers/food/snacks/hardtack, /turf/open/floor/dirt, /area/under/town/basement) -"tQc" = ( -/obj/structure/chair/bench, -/turf/open/floor/grass, -/area/outdoors/town/noble_manor/yellow) "tQf" = ( /turf/closed/mineral, /area/indoors/town/merc_guild) @@ -42589,9 +41861,6 @@ }, /turf/open/floor/cobble, /area/indoors/town/church) -"ujR" = ( -/turf/closed/wall/mineral/decowood, -/area/indoors/town/noble_manor/yellow) "uke" = ( /turf/open/floor/wood, /area/outdoors/mountains) @@ -42731,11 +42000,6 @@ /obj/structure/flora/grass, /turf/open/floor/dirt, /area/outdoors/basin) -"uoI" = ( -/obj/structure/bed/hay, -/obj/effect/decal/cleanable/dirt/cobweb, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "uoM" = ( /obj/structure/bookcase/random_recipes, /obj/item/recipe_book/blacksmithing, @@ -42779,10 +42043,6 @@ }, /turf/open/floor/grass/eora, /area/outdoors/eora) -"upM" = ( -/obj/structure/closet/crate/chest/old_crate, -/turf/open/floor/ruinedwood, -/area/indoors/town/noble_manor/yellow) "upR" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass/red, @@ -43044,15 +42304,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/soilsons) -"uvp" = ( -/obj/structure/well/fountain{ - pixel_x = -16 - }, -/obj/structure/fluff/statue/small{ - pixel_y = 39 - }, -/turf/open/floor/dirt/road, -/area/outdoors/town/noble_manor/yellow) "uvF" = ( /obj/structure/table/wood/fancy/purple, /obj/item/bouquet/salvia, @@ -43159,6 +42410,9 @@ /obj/structure/fermentation_keg, /turf/open/floor/woodturned, /area/outdoors/beach/boat) +"uxt" = ( +/turf/closed/basic, +/area/indoors/town/noble_manor/yellow) "uxF" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -43312,20 +42566,6 @@ }, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/adv_guild) -"uAt" = ( -/obj/structure/rack, -/obj/item/storage/fancy/cigarettes/zig, -/obj/item/ore/coal{ - pixel_x = 13; - pixel_y = 1 - }, -/obj/item/flint{ - pixel_x = 9; - pixel_y = -4 - }, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "uAC" = ( /obj/structure/stairs{ dir = 4 @@ -43927,20 +43167,10 @@ }, /turf/open/floor/ruinedwood/alt, /area/outdoors/town) -"uOw" = ( -/obj/structure/window/openclose/reinforced{ - dir = 1 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "uOx" = ( /obj/structure/chair/stool, /turf/open/floor/metal/barograte, /area/under/town/basement) -"uOB" = ( -/obj/structure/bed/hay, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "uOO" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/ruinedwood/spiral, @@ -43960,18 +43190,6 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/blocks, /area/under/town/basement) -"uPt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/stone, -/area/outdoors/town/noble_manor/yellow) -"uPF" = ( -/obj/structure/closet/crate/chest/neu_fancy, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/obj/item/storage/keyring, -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "uPM" = ( /obj/machinery/light/fueled/firebowl/standing/blue, /turf/open/floor/dirt/road, @@ -44151,9 +43369,6 @@ /obj/machinery/light/fueled/wallfire/candle/blue, /turf/open/floor/blocks/stonered/tiny, /area/indoors/town/clinic_large/apothecary) -"uTx" = ( -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "uTB" = ( /obj/machinery/light/fueled/wallfire/candle{ pixel_y = -32 @@ -44207,10 +43422,6 @@ /obj/structure/flora/newtree, /turf/open/floor/dirt, /area/outdoors/town) -"uVx" = ( -/obj/structure/fermentation_keg/water, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "uVD" = ( /obj/machinery/light/fueled/wallfire/candle/l, /turf/open/floor/ruinedwood/spiral, @@ -44249,13 +43460,6 @@ /obj/item/reagent_containers/food/snacks/smallrat, /turf/open/floor/metal/barograte, /area/indoors/town/cell) -"uWF" = ( -/obj/structure/carpet/green, -/obj/structure/table/map{ - dir = 6 - }, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "uWQ" = ( /obj/structure/rack/shelf/biggest, /obj/item/tent_kit, @@ -45617,15 +44821,6 @@ /obj/structure/chair/wood/alt/chair_noble/purple, /turf/open/floor/ruinedwood/chevron, /area/indoors/town/steward) -"vyE" = ( -/obj/machinery/light/fueled/hearth, -/obj/item/reagent_containers/glass/bucket/pot/stone, -/obj/structure/rack/shelf, -/obj/item/reagent_containers/glass/carafe/teapot{ - pixel_y = 44 - }, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "vyF" = ( /obj/structure/table/wood/reinf_long, /obj/item/soap{ @@ -45741,10 +44936,6 @@ "vAr" = ( /turf/closed/wall/mineral/stone/moss, /area/indoors/town/keep/magician) -"vAE" = ( -/obj/structure/carpet/green, -/turf/open/floor/wood/nosmooth, -/area/indoors/town/noble_manor/yellow) "vAN" = ( /obj/structure/table/wood/reinforced_alt{ dir = 8 @@ -46042,11 +45233,6 @@ /obj/effect/decal/cobblerockedge/alt, /turf/open/floor/grass/eora, /area/outdoors/eora) -"vIb" = ( -/obj/structure/flora/grass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dirt/road, -/area/indoors/town/noble_manor/yellow) "vIe" = ( /turf/open/floor/naturalstone, /area/indoors/town/train_station) @@ -46307,9 +45493,6 @@ /obj/structure/carpet/blue, /turf/open/floor/cobblerock, /area/indoors/town/keep/magician) -"vNl" = ( -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "vNq" = ( /turf/open/floor/churchmarble/violet, /area/under/cave) @@ -46337,9 +45520,6 @@ }, /turf/open/floor/wood, /area/indoors/town/tavern) -"vNQ" = ( -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "vOa" = ( /turf/closed/wall/mineral/stone/moss, /area/indoors/town/adv_guild) @@ -46982,14 +46162,6 @@ /obj/structure/chair/bench/coucha/r, /turf/open/floor/ruinedwood/spiral, /area/indoors/town/keep/library) -"wdd" = ( -/obj/structure/door/fancy{ - name = "Green Noble Manor" - }, -/obj/effect/mapping_helpers/access/locker, -/obj/effect/mapping_helpers/access/keyset/manor/Noble2, -/turf/open/floor/ruinedwood/two, -/area/indoors/town/noble_manor/yellow) "wdh" = ( /turf/open/floor/churchrough, /area/indoors/town/church/chapel) @@ -48132,10 +47304,6 @@ }, /turf/open/floor/naturalstone, /area/under/cavewet) -"wCN" = ( -/obj/structure/fluff/wallclock, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "wCO" = ( /obj/structure/table/wood/counter/end{ dir = 1 @@ -48156,12 +47324,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hexstone, /area/indoors/town/garrison) -"wCQ" = ( -/obj/machinery/light/fueled/hearth/big_fireplace{ - pixel_x = -50 - }, -/turf/closed/wall/mineral/stone, -/area/indoors/town/noble_manor/yellow) "wDg" = ( /obj/structure/flora/grass/bush_meagre, /obj/structure/fluff/railing/wood{ @@ -48241,12 +47403,6 @@ }, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/town/tavern) -"wEj" = ( -/obj/structure/rack{ - pixel_y = -1 - }, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "wEl" = ( /obj/structure/closet/crate/chest/old_crate, /obj/item/reagent_containers/food/snacks/hardtack, @@ -48868,13 +48024,6 @@ }, /turf/open/floor/carpet/royalblack, /area/indoors/town/church) -"wRu" = ( -/obj/structure/chair/wood/alt{ - dir = 1 - }, -/obj/machinery/light/fueled/wallfire/candle/l, -/turf/open/floor/wood, -/area/indoors/town/noble_manor/yellow) "wRz" = ( /obj/machinery/light/fueled/torchholder/l, /obj/structure/fluff/walldeco/church/line{ @@ -49086,11 +48235,6 @@ "wVN" = ( /turf/closed/mineral/bedrock, /area/outdoors/river) -"wVP" = ( -/obj/structure/bed/wool/double, -/obj/item/bedsheet/double_pelt, -/turf/open/floor/herringbone, -/area/indoors/town/noble_manor/yellow) "wVT" = ( /turf/open/floor/dirt, /area/outdoors/woods_safe) @@ -49501,10 +48645,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/outdoors/beach/boat) -"xcL" = ( -/obj/machinery/light/fueled/wallfire/candle/r, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "xcN" = ( /obj/structure/stairs{ dir = 1 @@ -49904,10 +49044,6 @@ }, /turf/open/floor/churchbrick, /area/indoors/town/keep/guest/meeting) -"xmr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/craftstone, -/area/indoors/town/noble_manor/yellow) "xmy" = ( /obj/structure/flora/grass, /obj/structure/flora/grass/bush_meagre, @@ -50146,9 +49282,6 @@ "xso" = ( /turf/open/floor/cobble/mossy, /area/under/cavewet) -"xsp" = ( -/turf/closed/wall/mineral/wooddark/horizontal, -/area/indoors/town/noble_manor/yellow) "xsq" = ( /turf/closed/mineral, /area/outdoors/mountains) @@ -50435,11 +49568,6 @@ }, /turf/open/floor/cobble, /area/indoors/soilsons) -"xxy" = ( -/obj/structure/flora/starfish, -/obj/structure/bars/cemetery, -/turf/open/floor/sand, -/area/outdoors/town/noble_manor/yellow) "xxA" = ( /turf/open/floor/tile, /area/indoors/town/keep/garrison) @@ -51346,9 +50474,6 @@ }, /turf/open/floor/tile, /area/indoors/town/keep/throne) -"xUE" = ( -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "xUS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -51620,12 +50745,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/indoors/town) -"yeB" = ( -/obj/machinery/light/fueled/oven{ - pixel_y = 31 - }, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "yeP" = ( /obj/structure/bed/hay, /turf/open/floor/herringbone, @@ -51729,14 +50848,6 @@ /obj/item/fishingrod/fisher, /turf/open/floor/dirt, /area/outdoors/exposed/cell) -"yhx" = ( -/obj/structure/chair/stool{ - pixel_y = 5 - }, -/obj/item/weapon/knife/villager, -/obj/structure/rack/shelf, -/turf/open/floor/ruinedwood/alt, -/area/indoors/town/noble_manor/yellow) "yhX" = ( /obj/structure/chair/wood/alt/chair_noble/red{ dir = 8 @@ -51936,26 +51047,10 @@ }, /turf/open/floor/churchmarble, /area/indoors/town/church) -"ylP" = ( -/turf/closed/wall/mineral/wooddark/end, -/area/indoors/town/noble_manor/yellow) "ylS" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, /turf/open/floor/carpet/lord/left, /area/indoors/town/vault) -"ylV" = ( -/obj/structure/closet/crate/chest/old_crate, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/reagent_containers/food/snacks/produce/grain/oat, -/obj/item/clothing/cloak/apron/cook, -/obj/item/book/yeoldecookingmanual, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/obj/item/reagent_containers/food/snacks/produce/grain/wheat, -/turf/open/floor/tile/kitchen, -/area/indoors/town/noble_manor/yellow) "ylW" = ( /obj/structure/fluff/railing/wood{ dir = 1 @@ -58258,15 +57353,15 @@ mdY mdY mdY mdY -kgt -kgt mdY mdY -xxy mdY mdY mdY -bTp +mdY +mdY +mdY +kIZ bTp uRa bTp @@ -58456,17 +57551,17 @@ hzM hzM mdY mdY -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -gIY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mdY mdY bTp @@ -58656,20 +57751,20 @@ slS hzM hzM hzM -hru -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mdY bTp bTp @@ -58858,20 +57953,20 @@ qFx qFx qFx qFx -hru -pcP -vNQ -vNQ -fOF -kOy -lRy -vNQ -vNQ -gIY -vNQ -vNQ -vNQ -vNQ +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mdY bTp bTp @@ -59055,26 +58150,26 @@ qFx qFx qFx qFx -eRI -eRI -eRI -eRI -eRI -eRI -pcP -pcP -vNQ -vNQ -dRl -dRl -lRy -vNQ -vNQ -vNQ -vNQ -vNQ -vNQ -peh +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY qAA npN npN @@ -59257,26 +58352,26 @@ qFx qFx qFx qFx -eRI -tuw -tuw -tuw -tuw -eRI -pJY -pcP -gIY -vNQ -vNQ -dRl -pBb -lRy -lRy -fOF -vNQ -vNQ -ctu -oYh +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY vJR qAA npN @@ -59459,26 +58554,26 @@ qFx qFx qFx qFx -eRI -iOT -mgZ -mgZ -iOT -eRI -tnM -pcP -pcP -vNQ -bYI -bYI -dRl -dRl -lRy -vNQ -bYI -bYI -tez -tez +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mIW mIW beL @@ -59661,26 +58756,26 @@ qFx qFx qFx qFx -eRI -iOT -mgZ -mgZ -iOT -eRI -ctu -nQh -nQh -mKX -bhA -osc -osc -bYI -nUC -nUC -tQc -pao -pao -uvp +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mIW nTH qAA @@ -59863,26 +58958,26 @@ qFx qFx qFx qFx -eRI -aKo -tuw -tuw -tuw -eRI -ctu -jmv -jmv -uPt -mIK -dRl -osc -eFy -vNQ -lRy -nUC -bYI -oqB -bYI +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY +mdY mIW bGd npN @@ -60060,31 +59155,31 @@ dID qFx qFx qFx -hTA -hTA -hTA -hTA -hTA -eRI -hTA -hTA -nPe -eRI -ylP -xsp -emD -dsk -xmr -hTA -hTA -hTA -hTA -srs -qOl -nUC -lRy -jBn -ctu +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY hbf npN joS @@ -60262,31 +59357,31 @@ dID qFx qFx qFx -eRI -pGk -sQK -hNt -hTA -hTA -hTA -drq -vNl -eRI -eRI -sRD -rig -mga -wRu -rBf -otI -sau -hTA -nlq -vNQ -nUC -lRy -bYI -peh +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY npN joS joS @@ -60464,31 +59559,31 @@ dID qFx qFx qFx -eRI -vNl -lRm -lRm -uAt -eRI -adG -lRm -lRm -vNl -eRI -eDD -gbK -uWF -bwW -qYN -fMT -wEj -uOw -tmj -nUC -nUC -lRy -lRy -iNV +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY joS fQm fKM @@ -60666,30 +59761,30 @@ dID qFx qFx qFx -eRI -hGI -lRm -lRm -vNl -eup -lRm -lRm -vNl -vNl -eGT -iKO -vAE -vAE -vAE -gbA -tBe -otI -rlw -nUC -nUC -nUC -nUC -vNQ +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY mdY bTp xQK @@ -60868,31 +59963,31 @@ dID qFx qFx qFx -wCQ -dCq -lRm -lRm -ekw -hTA -lRm -vNl -vNl -lRm -eRI -wCN -vAE -vAE -vAE -tBe -tBe -dyL -uOw -eIR -kUV -fKt -mcT -bYI -ctu +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY oRb vUb mIW @@ -61070,31 +60165,31 @@ dID qFx qFx qFx -eRI -dCq -mSH -wVP -eRI -hTA -sRI -vNl -eBd -nny -eRI -iqG -oSd -vAE -vAE -tBe -fMT -iMR -hTA -esU -vNQ -mcT -mcT -lWo -ctu +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY mIW mIW qFx @@ -61272,31 +60367,31 @@ dID qFx qFx qFx -hTA -eRI -mGN -eRI -hTA -hTA -gKH -uPF -qRJ -oIk -eRI -oDK -iKO -iKO -nSX -mga -otI -rBc -eRI -tkL -fwE -vNQ -lWo -lCG -ctu +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +mdY +mdY +mdY +mdY +mdY +mdY mIW qFx qFx @@ -61479,26 +60574,26 @@ qFx qFx qFx qFx -eRI -eRI -hTA -lWx -hTA -hTA -hTA -dDD -pRk -eRI -eRI -wdd -eRI -hTA -ujR -ujR -eFn -ujR -ujR -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt eRI qFx qFx @@ -61685,22 +60780,22 @@ qFx qFx qFx qFx -hTA -vyE -uTx -uTx -fmQ -coY -eRI -aPp -pvl -eRI -mok -rzd -iRA -aJQ -ila -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -61887,22 +60982,22 @@ qFx qFx qFx qFx -eRI -yeB -uTx -oZd -fmQ -ylV -eRI -sQG -pvl -eRI -osh -aJQ -iRA -otI -iKO -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62085,26 +61180,26 @@ qFx qFx qFx qFx -hTA -hTA -hTA -eRI -eRI -tHI -uTx -jgf -fmQ -ePk -eRI -bkG -eux -eRI -fTP -kVz -rIu -iKO -avJ -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62287,26 +61382,26 @@ qFx qFx qFx qFx -hTA -rHa -mnf -upM -eRI -pOI -uTx -uTx -uTx -ijI -eRI -bYK -bYK -eRI -avJ -oEY -otI -kgf -avJ -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62489,26 +61584,26 @@ qFx qFx qFx qFx -hTA -tyB -xUE -xUE -lvu -uTx -uTx -eVd -uVx -hTA -hTA -hTA -bYK -eRI -uoI -iKO -vIb -otI -kMB -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62691,26 +61786,26 @@ qFx qFx qFx qFx -eRI -yhx -xcL -hyU -hTA -hTA -hTA -hTA -hTA -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx -hTA -eRI -eRI -uOB -iKO -rIu -otI -qrs -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62893,11 +61988,11 @@ qFx qFx qFx qFx -eRI -eRI -eRI -eRI -eRI +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -62906,13 +62001,13 @@ qFx qFx qFx qFx -eRI -uOB -iKO -iRA -otI -mZn -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx @@ -63108,13 +62203,13 @@ qFx qFx qFx qFx -eRI -eRI -eRI -eRI -eRI -eRI -eRI +uxt +uxt +uxt +uxt +uxt +uxt +uxt qFx qFx qFx diff --git a/code/modules/mapping/property_template.dm b/code/modules/mapping/property_template.dm index cb8a7f6ecb5..a5c3d994146 100644 --- a/code/modules/mapping/property_template.dm +++ b/code/modules/mapping/property_template.dm @@ -153,3 +153,21 @@ mappath = "_maps/map_files/vanderlin/house_templates/adv6.dmm" width = 3 height = 4 + +/datum/map_template/vanderlin_noble_yellow + name = "Vanderlin Noble Yellow" + mappath = "_maps/map_files/vanderlin/house_templates/noble_yellow.dmm" + width = 25 + height = 25 + +/datum/map_template/vanderlin_noble_red + name = "Vanderlin Noble Red" + mappath = "_maps/map_files/vanderlin/house_templates/noble_red.dmm" + width = 29 + height = 26 + +/datum/map_template/vanderlin_noble_blue + name = "Vanderlin Noble Blue" + mappath = "_maps/map_files/vanderlin/house_templates/noble_blue.dmm" + width = 24 + height = 34 From 0ab046f9223d209c58442127418a6c3f0acae57b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 7 Aug 2026 13:33:26 -0800 Subject: [PATCH 3/8] guild and patronage --- _maps/map_files/debug/minimal.dmm | 5313 ++++++++++++++++- _maps/map_files/vanderlin/vanderlin.dmm | 9 +- .../__DEFINES/dcs/signals/signals_factions.dm | 2 + .../subsystem/properties/landmarks.dm | 19 + .../subsystem/properties/subsystem.dm | 2 + code/datums/attributes/_APPRENTICE.dm | 10 +- code/datums/mind.dm | 2 + code/datums/noble_factions/_base.dm | 84 + code/datums/noble_factions/guilds/_base.dm | 128 + code/datums/noble_factions/negotiation.dm | 135 + code/modules/jobs/job_types/_job.dm | 35 + .../jobs/job_types/apprentices/bapprentice.dm | 1 + .../job_types/apprentices/clinicapprentice.dm | 1 + .../jobs/job_types/apprentices/shophand.dm | 1 + .../jobs/job_types/apprentices/wapprentice.dm | 1 + .../jobs/job_types/nobility/magician.dm | 2 + .../jobs/job_types/nobility/merchant.dm | 2 + .../jobs/job_types/nobility/minor_noble.dm | 54 + .../modules/jobs/job_types/other/mercenary.dm | 1 + .../jobs/job_types/peasants/butcher.dm | 1 + code/modules/jobs/job_types/peasants/cook.dm | 1 + .../modules/jobs/job_types/peasants/fisher.dm | 2 + .../jobs/job_types/peasants/grabber.dm | 1 + .../modules/jobs/job_types/peasants/hunter.dm | 2 + code/modules/jobs/job_types/peasants/miner.dm | 1 + .../jobs/job_types/peasants/soilson.dm | 2 + .../jobs/job_types/serfs/apothecary.dm | 2 + .../modules/jobs/job_types/serfs/artificer.dm | 2 + .../jobs/job_types/serfs/blacksmith.dm | 2 + .../modules/jobs/job_types/serfs/carpenter.dm | 2 + code/modules/jobs/job_types/serfs/feldsher.dm | 2 + code/modules/jobs/job_types/serfs/innkeep.dm | 2 + code/modules/jobs/job_types/serfs/mason.dm | 2 + code/modules/jobs/job_types/serfs/matron.dm | 2 + code/modules/jobs/job_types/serfs/tailor.dm | 2 + .../jobs/job_types/youngfolk/innkeepchild.dm | 1 + .../jobs/job_types/youngfolk/orphan.dm | 1 + vanderlin.dme | 4 + 38 files changed, 5606 insertions(+), 230 deletions(-) create mode 100644 code/__DEFINES/dcs/signals/signals_factions.dm create mode 100644 code/datums/noble_factions/_base.dm create mode 100644 code/datums/noble_factions/guilds/_base.dm create mode 100644 code/datums/noble_factions/negotiation.dm diff --git a/_maps/map_files/debug/minimal.dmm b/_maps/map_files/debug/minimal.dmm index 5cbe9142a27..bb399bb10a6 100644 --- a/_maps/map_files/debug/minimal.dmm +++ b/_maps/map_files/debug/minimal.dmm @@ -33,6 +33,17 @@ "u" = ( /turf/open/floor/cobblerock, /area) +"v" = ( +/obj/effect/landmark/house_spot/noble{ + save_id = "noble_red"; + property_id = "noble_red"; + default_template = /datum/map_template/vanderlin_noble_red; + template_x = 29; + template_y = 26; + faction_type = /datum/noble_faction/vanderlin_red + }, +/turf/open/floor/cobblerock, +/area) "x" = ( /obj/structure/stockpile_storage/food, /turf/open/floor/cobblerock, @@ -86,9 +97,6 @@ a a a a -"} -(2,1,1) = {" -a a a a @@ -123,15 +131,14 @@ a a a a -"} -(3,1,1) = {" -a a a a a a a +"} +(2,1,1) = {" a a a @@ -160,8 +167,6 @@ a a a a -"} -(4,1,1) = {" a a a @@ -197,8 +202,6 @@ a a a a -"} -(5,1,1) = {" a a a @@ -211,6 +214,8 @@ a a a a +"} +(3,1,1) = {" a a a @@ -234,8 +239,6 @@ a a a a -"} -(6,1,1) = {" a a a @@ -247,19 +250,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -271,8 +261,6 @@ a a a a -"} -(7,1,1) = {" a a a @@ -284,19 +272,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -308,8 +283,6 @@ a a a a -"} -(8,1,1) = {" a a a @@ -318,22 +291,11 @@ a a a a +"} +(4,1,1) = {" a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -345,8 +307,6 @@ a a a a -"} -(9,1,1) = {" a a a @@ -358,19 +318,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -382,8 +329,6 @@ a a a a -"} -(10,1,1) = {" a a a @@ -395,19 +340,6 @@ a a a a -u -u -u -u -u -u -u -u -u -H -u -u -u a a a @@ -419,8 +351,6 @@ a a a a -"} -(11,1,1) = {" a a a @@ -432,32 +362,19 @@ a a a a -u -u -u -u -u -u -k -G -u -u -u -u -u a a a a a a +"} +(5,1,1) = {" a a a a a -"} -(12,1,1) = {" a a a @@ -469,19 +386,6 @@ a a a a -u -u -t -u -u -u -u -u -u -u -u -u -u a a a @@ -493,8 +397,6 @@ a a a a -"} -(13,1,1) = {" a a a @@ -506,19 +408,6 @@ a a a a -u -u -u -u -u -u -d -u -u -u -u -u -u a a a @@ -530,8 +419,6 @@ a a a a -"} -(14,1,1) = {" a a a @@ -543,19 +430,6 @@ a a a a -u -u -u -u -u -e -u -u -u -u -u -u -u a a a @@ -567,12 +441,12 @@ a a a a -"} -(15,1,1) = {" a a a a +"} +(6,1,1) = {" a a a @@ -580,19 +454,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -604,8 +465,6 @@ a a a a -"} -(16,1,1) = {" a a a @@ -617,19 +476,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -641,8 +487,6 @@ a a a a -"} -(17,1,1) = {" a a a @@ -654,7 +498,7 @@ a a a a -u +v u u u @@ -679,11 +523,7 @@ a a a "} -(18,1,1) = {" -a -a -a -a +(7,1,1) = {" a a a @@ -691,19 +531,6 @@ a a a a -u -u -g -u -u -u -x -u -u -u -c -u -u a a a @@ -715,8 +542,6 @@ a a a a -"} -(19,1,1) = {" a a a @@ -728,19 +553,6 @@ a a a a -u -u -u -u -u -u -u -u -u -u -u -u -u a a a @@ -752,8 +564,6 @@ a a a a -"} -(20,1,1) = {" a a a @@ -768,7 +578,7 @@ a u u u -u +d u u u @@ -790,11 +600,7 @@ a a a "} -(21,1,1) = {" -a -a -a -a +(8,1,1) = {" a a a @@ -826,8 +632,6 @@ a a a a -"} -(22,1,1) = {" a a a @@ -848,6 +652,4809 @@ a a a a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +H +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +d +k +G +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +t +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +d +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +e +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +g +u +u +u +x +u +u +u +c +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +u +u +u +u +u +u +u +u +u +u +u +u +u +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(46,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(47,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(48,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(49,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(50,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(51,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(52,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(53,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(54,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(55,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(56,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(57,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(58,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(59,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(60,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(61,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(62,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(63,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(64,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(65,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(66,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(67,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(68,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(69,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(70,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(71,1,1) = {" +a +a +a a a a @@ -863,8 +5470,6 @@ a a a a -"} -(23,1,1) = {" a a a @@ -900,8 +5505,70 @@ a a a a -"} -(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(72,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a a a a @@ -938,7 +5605,201 @@ a a a "} -(25,1,1) = {" +(73,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(74,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(75,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a a a a diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm index 38c4eaf1bf8..2149a654e76 100644 --- a/_maps/map_files/vanderlin/vanderlin.dmm +++ b/_maps/map_files/vanderlin/vanderlin.dmm @@ -664,7 +664,8 @@ save_id = "noble_blue"; template_x = 24; template_y = 34; - default_template = /datum/map_template/vanderlin_noble_blue + default_template = /datum/map_template/vanderlin_noble_blue; + faction_type = /datum/noble_faction/vanderlin_blue }, /turf/closed/mineral, /area/under/cave) @@ -21725,7 +21726,8 @@ default_template = /datum/map_template/vanderlin_noble_yellow; save_id = "noble_yellow"; template_x = 25; - template_y = 25 + template_y = 25; + faction_type = /datum/noble_faction/vanderlin_yellow }, /turf/open/floor/sand, /area/outdoors/beach) @@ -35198,7 +35200,8 @@ property_id = "noble_red"; default_template = /datum/map_template/vanderlin_noble_red; template_x = 29; - template_y = 26 + template_y = 26; + faction_type = /datum/noble_faction/vanderlin_red }, /turf/open/openspace, /area/outdoors/town/noble_manor/red) diff --git a/code/__DEFINES/dcs/signals/signals_factions.dm b/code/__DEFINES/dcs/signals/signals_factions.dm new file mode 100644 index 00000000000..8afcaea1c03 --- /dev/null +++ b/code/__DEFINES/dcs/signals/signals_factions.dm @@ -0,0 +1,2 @@ +#define COMSIG_NOBLE_FACTION_SIZE_CHANGED "noble_faction_size_changed" +#define COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE "noble_faction_aspirant_eligible" diff --git a/code/controllers/subsystem/properties/landmarks.dm b/code/controllers/subsystem/properties/landmarks.dm index 09c976b200c..afad17cca6b 100644 --- a/code/controllers/subsystem/properties/landmarks.dm +++ b/code/controllers/subsystem/properties/landmarks.dm @@ -1,3 +1,5 @@ +GLOBAL_LIST_EMPTY(noble_points) + /obj/effect/abstract/property_noop invisibility = INVISIBILITY_ABSTRACT var/property_id @@ -42,5 +44,22 @@ titles += initial(job.title) return jointext(titles, ", ") +/obj/effect/landmark/house_spot/proc/on_claim(mob/user) + return + /obj/effect/landmark/house_spot/noble required_jobs = list(/datum/job/minor_noble) + var/datum/noble_faction/faction_type + +/obj/effect/landmark/house_spot/noble/Initialize(mapload) + . = ..() + if(!ispath(faction_type) && !isnull(faction_type)) + faction_type = text2path(faction_type) //someone map editting + LAZYADD(GLOB.noble_points, src) + +/obj/effect/landmark/house_spot/noble/on_claim(mob/user) + user.create_new_faction(faction_type) + LAZYREMOVE(GLOB.noble_points, src) + +/mob/proc/create_new_faction(datum/noble_faction/faction_type) + new faction_type(src) diff --git a/code/controllers/subsystem/properties/subsystem.dm b/code/controllers/subsystem/properties/subsystem.dm index 5fb0df5d811..f10799dff86 100644 --- a/code/controllers/subsystem/properties/subsystem.dm +++ b/code/controllers/subsystem/properties/subsystem.dm @@ -135,6 +135,8 @@ SUBSYSTEM_DEF(housing) load_property(property, ckey, slot) create_property_controller(property) + property.on_claim(user) + return TRUE /datum/controller/subsystem/housing/proc/get_player_property_slots(ckey, save_id) diff --git a/code/datums/attributes/_APPRENTICE.dm b/code/datums/attributes/_APPRENTICE.dm index 7e2083bcf4f..051153076a4 100644 --- a/code/datums/attributes/_APPRENTICE.dm +++ b/code/datums/attributes/_APPRENTICE.dm @@ -46,12 +46,20 @@ LAZYADD(apprentices, WEAKREF(youngling)) youngling.attributes.is_apprentice = TRUE + var/datum/job/youngling_job = SSjob.GetJob(youngling.job) + var/datum/guild/youngling_guild = get_or_create_guild(youngling_job.guild_type) + youngling_guild?.remove_member(youngling) + + var/mob/living/owner = parent + var/datum/job/job = SSjob.GetJob(owner.job) + var/datum/guild/guild = get_or_create_guild(job.guild_type) + guild?.add_member(youngling) + // Build the apprentice title var/title if(apprentice_name) title = apprentice_name // Advanced class override else - var/datum/job/job = SSjob.GetJob(parent:job) title = "[job.get_informed_title(youngling)] Apprentice" youngling.attributes.our_apprentice_name = "[parent.real_name]'s [title]" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 555acd26b70..e78e62a4ab6 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -73,6 +73,8 @@ GLOBAL_LIST_EMPTY(personal_objective_minds) var/memory /// Job datum indicating the mind's role. This should always exist after initialization, as a reference to a singleton. var/datum/job/assigned_role + ///our noble faction + var/datum/noble_faction/noble_faction /// special role of this mind var/special_role /// list of roles this mind cannot roll diff --git a/code/datums/noble_factions/_base.dm b/code/datums/noble_factions/_base.dm new file mode 100644 index 00000000000..71bab0924c6 --- /dev/null +++ b/code/datums/noble_factions/_base.dm @@ -0,0 +1,84 @@ +GLOBAL_LIST_EMPTY(current_noble_factions) + +/datum/noble_faction + var/name = "Unnamed House" + var/mob/living/carbon/human/head // the patron/founder + var/list/mob/living/carbon/human/members = list() + /// One alt-appearance instance per member, keyed by member, so we can refresh the "seers" list on roster change + var/list/mob/living/carbon/human/member_tags = list() + var/aspirant_threshold = 14 + +/datum/noble_faction/New(mob/living/carbon/human/founder, faction_name) + . = ..() + head = founder + founder.mind?.noble_faction = src + if(faction_name) + name = faction_name + add_member(founder) + founder.add_spell(/datum/action/cooldown/offer_patronage) + LAZYADD(GLOB.current_noble_factions, src) + +/datum/noble_faction/Destroy(force) + for(var/mob/living/carbon/human/member as anything in member_tags) + remove_faction_tag(member) + members = null + member_tags = null + head = null + return ..() + +/datum/noble_faction/proc/add_member(mob/living/carbon/human/new_member) + if(!new_member || (new_member in members)) + return FALSE + members += new_member + apply_faction_tag(new_member) + refresh_all_tags() // everyone's seer list needs the new guy added + SEND_SIGNAL(src, COMSIG_NOBLE_FACTION_SIZE_CHANGED, length(members)) + check_aspirant_threshold() + return TRUE + +/datum/noble_faction/proc/remove_member(mob/living/carbon/human/member) + if(!(member in members)) + return FALSE + members -= member + remove_faction_tag(member) + refresh_all_tags() + SEND_SIGNAL(src, COMSIG_NOBLE_FACTION_SIZE_CHANGED, length(members)) + return TRUE + +/datum/noble_faction/proc/apply_faction_tag(mob/living/carbon/human/member) + var/image/marker = image(icon = 'icons/mob/hud.dmi', icon_state = "hog-blue-2", loc = member) + member_tags[member] = new /datum/atom_hud/alternate_appearance/basic/people( + "nobleFaction_[REF(src)]_[REF(member)]", + marker, + NONE, + members.Copy(), + ) + +/datum/noble_faction/proc/remove_faction_tag(mob/living/carbon/human/member) + var/datum/atom_hud/alternate_appearance/basic/people/tag = member_tags[member] + if(tag) + qdel(tag) + member_tags -= member + +/// everything is stale fuck my chud life. +/datum/noble_faction/proc/refresh_all_tags() + for(var/mob/living/carbon/human/member as anything in member_tags) + var/datum/atom_hud/alternate_appearance/basic/people/tag = member_tags[member] + tag.seers = list() + for(var/mob/living/carbon/human/seer as anything in members) + tag.seers += WEAKREF(seer) + for(var/mob/viewer in GLOB.player_list) + tag.apply_to_new_mob(viewer) + +/datum/noble_faction/proc/check_aspirant_threshold() + if(length(members) >= aspirant_threshold) + SEND_SIGNAL(head, COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, src) + +/datum/noble_faction/vanderlin_red + name = "Red Faction" + +/datum/noble_faction/vanderlin_yellow + name = "Green Faction" //the great switchup + +/datum/noble_faction/vanderlin_blue + name = "Blue Faction" diff --git a/code/datums/noble_factions/guilds/_base.dm b/code/datums/noble_factions/guilds/_base.dm new file mode 100644 index 00000000000..4813cbb221a --- /dev/null +++ b/code/datums/noble_factions/guilds/_base.dm @@ -0,0 +1,128 @@ +GLOBAL_LIST_EMPTY(guilds) // keyed by guild id (a type path or string, see below) + +/proc/get_or_create_guild(datum/guild/guild_type) + if(!guild_type) + return null + . = GLOB.guilds[guild_type] + if(!.) + . = new guild_type + +/datum/guild + var/name = "Unnamed Guild" + var/id // e.g. /datum/guild/blacksmiths + var/list/mob/living/carbon/human/members = list() + + /// The guild's own coffer + var/datum/bank_account/guild_account + + /// Set once a noble successfully patronizes this guild. Null = independent. + var/datum/noble_faction/patron_faction + var/patronage_wage = 0 + +/datum/guild/New(guild_name, guild_id) + . = ..() + id = guild_id + if(guild_name) + name = guild_name + GLOB.guilds[type] = src + +/datum/guild/Destroy(force) + GLOB.guilds -= id + members = null + patron_faction = null + return ..() + +/datum/guild/proc/add_member(mob/living/carbon/human/member) + if(!member || (member in members)) + return FALSE + members += member + // A guild that already has a patron auto-enrolls new members under the same terms + if(patron_faction) + patron_faction.add_member(member) + return TRUE + +/datum/guild/proc/remove_member(mob/living/carbon/human/member) + if(!(member in members)) + return FALSE + members -= member + if(patron_faction) + patron_faction.remove_member(member) + return TRUE + +/// Called once, when a patronage negotiation with the guild's head succeeds. +/// Brings every current member into the noble's faction, not just the negotiator. +/datum/guild/proc/apply_patronage(datum/noble_faction/faction, wage) + patron_faction = faction + patronage_wage = wage + for(var/mob/living/carbon/human/member as anything in members) + faction.add_member(member) + +/datum/guild/proc/break_patronage() + if(!patron_faction) + return + for(var/mob/living/carbon/human/member as anything in members) + patron_faction.remove_member(member) + patron_faction = null + patronage_wage = 0 + +///IK we wanted a makers guild as an overarching guild but we can make these subguilds of it because giving someone executive power over like 40 jobs is to much +/datum/guild/blacksmith + name = "Smith's Guild" + id = "smith" + +/datum/guild/tailor + name = "Tailor's Guild" + id = "tailor" + +/datum/guild/inn + name = "Innkeeper's Guild" + id = "inn" + +/datum/guild/merc + name = "Mercenary Guild" + id = "merc" + +/datum/guild/adv_guild + name = "Adventurer's Guild" + id = "adv_guild" + +/datum/guild/thieves + name = "Thieves Guild" + id = "thieves" + +/datum/guild/clinic + name = "Medic's Guild" + id = "clinic" + +/datum/guild/mage + name = "Magician's College" + id = "mage" + +/datum/guild/constructors + name = "Carpenter's Guild" + id = "builder" + +/datum/guild/alchemy + name = "Alchemist's Guild" + id = "alchemy" + +/datum/guild/mason + name = "Stone-Mason's Guild" + id = "stone" + +/datum/guild/artificer + name = "Artificer's Guild" + id = "artificer" + +/datum/guild/food + name = "Farmer's Guild" + id = "farmer" + +/datum/guild/hunter + name = "Hunter's Guild" + id = "hunter" + +/datum/guild/merchant + name = "Merchant's Guild" + id = "merchant" + diff --git a/code/datums/noble_factions/negotiation.dm b/code/datums/noble_factions/negotiation.dm new file mode 100644 index 00000000000..7fa30832889 --- /dev/null +++ b/code/datums/noble_factions/negotiation.dm @@ -0,0 +1,135 @@ +#define PATRONAGE_MAX_ROUNDS 6 + +/datum/patronage_negotiation + var/mob/living/carbon/human/noble + var/mob/living/carbon/human/target + var/rounds_used = 0 + +/datum/patronage_negotiation/New(mob/noble, mob/target) + . = ..() + src.noble = noble + src.target = target + +/datum/patronage_negotiation/proc/start() + if(!validate_parties()) + return + + var/opening_offer = tgui_input_number(noble, "Daily wage to offer [target.real_name]?", "Offer Patronage", 0, 1000, 0) + if(!can_still_negotiate() || isnull(opening_offer)) + cancel("[noble.real_name] never made an offer.") + return + + negotiate(responder = target, proposer = noble, offer = opening_offer) + +/// responder is being asked to accept/counter/decline the proposer's offer +/datum/patronage_negotiation/proc/negotiate(mob/living/carbon/human/responder, mob/living/carbon/human/proposer, offer) + if(!can_still_negotiate()) + return + + rounds_used++ + if(rounds_used > PATRONAGE_MAX_ROUNDS) + cancel("Negotiations between [noble.real_name] and [target.real_name] broke down.") + return + + var/choice = tgui_alert(responder, "[proposer.real_name] offers [offer] mammon/day in patronage. Accept?", "Patronage Offer", list("Accept", "Counter-offer", "Decline")) + + if(!can_still_negotiate()) + return + + switch(choice) + if("Accept") + finalize(offer) + if("Decline") + cancel("[responder.real_name] declined [proposer.real_name]'s offer.") + if("Counter-offer") + var/counter = tgui_input_number(responder, "Counter-offer (daily wage)?", "Patronage Offer", 0, 1000, offer) + if(!can_still_negotiate()) + return + if(isnull(counter)) + cancel("[responder.real_name] didn't respond. Negotiations ended.") + return + // roles flip: the responder is now the proposer + negotiate(responder = proposer, proposer = responder, offer = counter) + else + cancel("Negotiations timed out.") + +/datum/patronage_negotiation/proc/validate_parties() + if(!noble?.client || !target?.client) + return FALSE + + var/datum/job/noble_job = SSjob.GetJob(noble.job) + var/datum/job/target_job = SSjob.GetJob(target.job) + + if(!target_job?.is_guild_head) + to_chat(noble, span_warning("[target.real_name] isn't in a position to accept patronage.")) + return FALSE + + if(target.mind?.noble_faction) + to_chat(noble, span_warning("[target.real_name] already answers to a patron.")) + return FALSE + + return TRUE + +/// Re-checked before every step in case someone died/disconnected/got patronized elsewhere mid-negotiation +/datum/patronage_negotiation/proc/can_still_negotiate() + if(!noble?.client || !target?.client) + return FALSE + var/datum/job/job = SSjob.GetJob(target.job) + var/datum/guild/guild = get_or_create_guild(job?.guild_type) + if(guild?.patron_faction) // someone else beat us to it + return FALSE + return TRUE + +/datum/patronage_negotiation/proc/finalize(wage) + var/datum/noble_faction/faction = noble.mind?.noble_faction + if(!faction) + faction = new /datum/noble_faction(noble) + noble.mind.noble_faction = faction + + var/datum/job/job = SSjob.GetJob(target.job) + var/datum/guild/guild = get_or_create_guild(job?.guild_type) + + guild?.apply_patronage(faction, wage) + + to_chat(noble, span_notice("[guild.name] has accepted your patronage at [wage] mammon/day.")) + for(var/mob/living/carbon/human/member as anything in guild.members) + to_chat(member, span_notice("Your guild is now patronized by [noble.real_name] at [wage] mammon/day.")) + +/datum/patronage_negotiation/proc/cancel(reason) + if(noble) + to_chat(noble, span_warning(reason)) + if(target) + to_chat(target, span_warning(reason)) + +#undef PATRONAGE_MAX_ROUNDS + +/datum/action/cooldown/offer_patronage + name = "Offer Patronage" + desc = "Offer your patronage to a guild, negotiating a daily wage with its head." + button_icon_state = "patronage" + click_to_activate = TRUE + cooldown_time = 10 MINUTES + retrigger_after_cooldown = FALSE + +/datum/action/cooldown/offer_patronage/Activate(atom/target) + var/mob/living/carbon/human/noble = owner + if(!ishuman(target)) + return FALSE + + var/mob/living/carbon/human/head = target + var/datum/job/job = SSjob.GetJob(head.job) + var/datum/guild/guild = get_or_create_guild(job?.guild_type) + if(!guild) + to_chat(noble, span_warning("[head.real_name] belongs to no guild.")) + return FALSE + if(!job.is_guild_head) + to_chat(noble, span_warning("[head.real_name] doesn't speak for their guild.")) + return FALSE + if(guild.patron_faction) + to_chat(noble, span_warning("[guild.name] already answers to a patron.")) + return FALSE + + var/datum/patronage_negotiation/negotiation = new(noble, head) + negotiation.start() + StartCooldown() + return TRUE diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index de691c0d90c..5a85713fa81 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -250,6 +250,15 @@ ///this is our book path given on middle clicking ui var/obj/item/recipe_book/book_type = /obj/item/recipe_book/survival + /// Can this job's holder be offered patronage/employment by a noble faction? + var/can_select_noble_faction = FALSE + /// If set, this job's holder is added to the matching global guild on spawn. + /// Use the guild's id (a type path works well as a stable key), NOT an instance. + var/datum/guild/guild_type + /// Is this job the guild's head (i.e. the one a noble negotiates with for patronage)? + var/is_guild_head = FALSE + + /datum/job/New() . = ..() if(knows_the_town) @@ -476,6 +485,12 @@ if(job_flags & JOB_SHOW_IN_CREDITS) START_PROCESSING(SScrediticons, player_client) + if(can_select_noble_faction) + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/job, select_noble_faction), spawned, GLOB.current_noble_factions) + if(guild_type) + var/datum/guild/G = get_or_create_guild(guild_type) + G.add_member(spawned) + /// Callback for anything that sleeps, called after roundstart or async during EquipRank /datum/job/proc/on_roundstart(mob/living/spawned, client/player_client) SHOULD_CALL_PARENT(TRUE) @@ -488,6 +503,26 @@ for(var/datum/atom_hud/alternate_appearance/basic/traits/alt_hud in GLOB.active_alternate_appearances) alt_hud.apply_to_new_mob(spawned) +/datum/job/proc/select_noble_faction(mob/living/carbon/human/applicant, list/datum/noble_faction/available_factions) + if(!can_select_noble_faction || !length(available_factions)) + return null + + var/list/choices = list("None") + var/list/faction_by_name = list() + for(var/datum/noble_faction/faction as anything in available_factions) + var/label = "[faction.name] (led by [faction.head?.real_name || "Unknown"])" + choices += label + faction_by_name[label] = faction + + var/picked = tgui_input_list(applicant, "Take patronage from a noble house?", "Patronage", choices) + if(!picked || picked == "None") + return null + + var/datum/noble_faction/chosen = faction_by_name[picked] + if(chosen) + chosen.add_member(applicant) + return chosen + /// this "mostly" removes the existence of a job from someone. /// the unfortunately reality is that even this is still a flawed removal /datum/job/proc/remove_job(mob/living/carbon/human/spawned) diff --git a/code/modules/jobs/job_types/apprentices/bapprentice.dm b/code/modules/jobs/job_types/apprentices/bapprentice.dm index 3c16e900a27..7807244cfa5 100644 --- a/code/modules/jobs/job_types/apprentices/bapprentice.dm +++ b/code/modules/jobs/job_types/apprentices/bapprentice.dm @@ -36,6 +36,7 @@ allowed_ages = list(AGE_CHILD, AGE_ADULT) outfit = /datum/outfit/bapprentice + guild_type = /datum/guild/blacksmith can_be_apprentice = TRUE attribute_sheet = /datum/attribute_holder/sheet/job/bapprentice diff --git a/code/modules/jobs/job_types/apprentices/clinicapprentice.dm b/code/modules/jobs/job_types/apprentices/clinicapprentice.dm index 3444f7cf840..79496dc7f0e 100644 --- a/code/modules/jobs/job_types/apprentices/clinicapprentice.dm +++ b/code/modules/jobs/job_types/apprentices/clinicapprentice.dm @@ -50,6 +50,7 @@ allowed_races = RACES_PLAYER_ALL cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' outfit = /datum/outfit/clinicapprentice + guild_type = /datum/guild/clinic job_bitflag = BITFLAG_CONSTRUCTOR can_be_apprentice = TRUE diff --git a/code/modules/jobs/job_types/apprentices/shophand.dm b/code/modules/jobs/job_types/apprentices/shophand.dm index 1b17f9a72f9..004f806a56c 100644 --- a/code/modules/jobs/job_types/apprentices/shophand.dm +++ b/code/modules/jobs/job_types/apprentices/shophand.dm @@ -51,6 +51,7 @@ allowed_ages = list(AGE_CHILD, AGE_ADULT) outfit = /datum/outfit/shophand + guild_type = /datum/guild/merchant cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' exp_types_granted = list(EXP_TYPE_MERCHANT_COMPANY) can_be_apprentice = TRUE diff --git a/code/modules/jobs/job_types/apprentices/wapprentice.dm b/code/modules/jobs/job_types/apprentices/wapprentice.dm index 2953491cf6e..9cc16122139 100644 --- a/code/modules/jobs/job_types/apprentices/wapprentice.dm +++ b/code/modules/jobs/job_types/apprentices/wapprentice.dm @@ -40,6 +40,7 @@ allowed_sexes = list(MALE, FEMALE) cmode_music = "sound/music/cmode/adventurer/CombatSorcerer.ogg" outfit = /datum/outfit/mageapprentice + guild_type = /datum/guild/mage display_order = JDO_WAPP give_bank_account = TRUE knows_the_town = TRUE diff --git a/code/modules/jobs/job_types/nobility/magician.dm b/code/modules/jobs/job_types/nobility/magician.dm index 0657222eadb..bd4ebac1527 100644 --- a/code/modules/jobs/job_types/nobility/magician.dm +++ b/code/modules/jobs/job_types/nobility/magician.dm @@ -70,6 +70,8 @@ max_apprentices = 2 honorary = "Archmage" book_type = /obj/item/recipe_book/arcyne + guild_type = /datum/guild/mage + is_guild_head = TRUE spells = list( /datum/action/cooldown/spell/aoe/knock, diff --git a/code/modules/jobs/job_types/nobility/merchant.dm b/code/modules/jobs/job_types/nobility/merchant.dm index ef22ab9bf84..d1e5a00584d 100644 --- a/code/modules/jobs/job_types/nobility/merchant.dm +++ b/code/modules/jobs/job_types/nobility/merchant.dm @@ -32,6 +32,8 @@ cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/merchant + guild_type = /datum/guild/merchant + is_guild_head = TRUE give_bank_account = 200 knows_the_town = TRUE exp_type = list(EXP_TYPE_LIVING, EXP_TYPE_MERCHANT_COMPANY) diff --git a/code/modules/jobs/job_types/nobility/minor_noble.dm b/code/modules/jobs/job_types/nobility/minor_noble.dm index 4357cf50ba5..6801fef62f6 100644 --- a/code/modules/jobs/job_types/nobility/minor_noble.dm +++ b/code/modules/jobs/job_types/nobility/minor_noble.dm @@ -318,6 +318,60 @@ spawned.attributes?.add_sheet(/datum/attribute_holder/sheet/job/minor_bows) spawned.equip_to_appropriate_slot(new /obj/item/ammo_holder/quiver/arrows(), TRUE) + offer_noble_house(spawned, player_client) + +/datum/job/minor_noble/proc/offer_noble_house(mob/living/carbon/human/spawned, client/player_client) + if(!length(GLOB.noble_points)) + return + + //we sleep waiting for a pick and roundstart choices means it could be bad so we check later. + var/list/options = list() + for(var/obj/effect/landmark/house_spot/noble/candidate as anything in GLOB.noble_points) + var/datum/noble_faction/faction = candidate.faction_type + var/display_name = candidate.faction_type ? initial(faction.name) : candidate.property_id + options[display_name] = candidate + + options["None"] = null + + var/choice = tgui_input_list(spawned, "Claim a noble house?", "Noble House", options, "None") + if(!choice || choice == "None") + return + + var/obj/effect/landmark/house_spot/noble/chosen = options[choice] + + //another noble may have beaten us to it, + if(!istype(chosen) || QDELETED(chosen)) + to_chat(spawned, span_warning("That house is no longer available.")) + offer_noble_house(spawned, player_client) + return + + if(!(chosen in GLOB.noble_points)) + to_chat(spawned, span_warning("That house has already been claimed.")) + return + + if(SShousing.temporary_claims[chosen.property_id]) + to_chat(spawned, span_warning("That house has already been claimed.")) + return + + if(!spawned.client) + return // disconnected mid-pick + + if(!chosen.check_job_requirement(spawned)) + to_chat(spawned, span_warning("You no longer qualify to claim that house.")) + return + + if(SShousing.player_owns_save_id(spawned.ckey, chosen.save_id)) + to_chat(spawned, span_warning("You already own a property of this type.")) + return + + if(!SShousing.claim_temporary(chosen, spawned, 1)) + to_chat(spawned, span_warning("Failed to claim that house.")) + return + + var/claimed_name = chosen.faction_type ? initial(chosen.faction_type.name) : chosen.property_id + chosen.on_claim(spawned) + to_chat(spawned, span_notice("You have claimed the [claimed_name] estate as your noble house.")) + /datum/outfit/noble name = "Noble Base" shoes = /obj/item/clothing/shoes/boots diff --git a/code/modules/jobs/job_types/other/mercenary.dm b/code/modules/jobs/job_types/other/mercenary.dm index cd78adc1b52..4b3ebde083a 100644 --- a/code/modules/jobs/job_types/other/mercenary.dm +++ b/code/modules/jobs/job_types/other/mercenary.dm @@ -16,6 +16,7 @@ can_have_apprentices = FALSE allowed_races = RACES_PLAYER_ALL + guild_type = /datum/guild/merc outfit = null outfit_female = null diff --git a/code/modules/jobs/job_types/peasants/butcher.dm b/code/modules/jobs/job_types/peasants/butcher.dm index 1f0a47f17f5..822f3102b59 100644 --- a/code/modules/jobs/job_types/peasants/butcher.dm +++ b/code/modules/jobs/job_types/peasants/butcher.dm @@ -30,6 +30,7 @@ allowed_races = RACES_PLAYER_ALL attribute_sheet = /datum/attribute_holder/sheet/job/butcher + guild_type = /datum/guild/food outfit = /datum/outfit/beastmaster give_bank_account = TRUE knows_the_town = TRUE diff --git a/code/modules/jobs/job_types/peasants/cook.dm b/code/modules/jobs/job_types/peasants/cook.dm index 68b6d866338..09aeb6ff94d 100644 --- a/code/modules/jobs/job_types/peasants/cook.dm +++ b/code/modules/jobs/job_types/peasants/cook.dm @@ -44,6 +44,7 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/cook + guild_type = /datum/guild/inn display_order = JDO_COOK give_bank_account = 8 knows_the_town = TRUE diff --git a/code/modules/jobs/job_types/peasants/fisher.dm b/code/modules/jobs/job_types/peasants/fisher.dm index bd27e5c61e3..08e70b21471 100644 --- a/code/modules/jobs/job_types/peasants/fisher.dm +++ b/code/modules/jobs/job_types/peasants/fisher.dm @@ -49,6 +49,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/fisher + guild_type = /datum/guild/food + is_guild_head = TRUE give_bank_account = 8 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' diff --git a/code/modules/jobs/job_types/peasants/grabber.dm b/code/modules/jobs/job_types/peasants/grabber.dm index 3630acb88ea..61c677e25e2 100644 --- a/code/modules/jobs/job_types/peasants/grabber.dm +++ b/code/modules/jobs/job_types/peasants/grabber.dm @@ -35,6 +35,7 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/grabber + guild_type = /datum/guild/merchant knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' exp_types_granted = list(EXP_TYPE_MERCHANT_COMPANY) diff --git a/code/modules/jobs/job_types/peasants/hunter.dm b/code/modules/jobs/job_types/peasants/hunter.dm index 9fae34b17f9..948ba1bb6df 100644 --- a/code/modules/jobs/job_types/peasants/hunter.dm +++ b/code/modules/jobs/job_types/peasants/hunter.dm @@ -67,6 +67,8 @@ can_be_apprentice = TRUE job_bitflag = BITFLAG_CONSTRUCTOR + guild_type = /datum/guild/hunter + is_guild_head = TRUE attribute_sheet = /datum/attribute_holder/sheet/job/hunter attribute_sheet_old = /datum/attribute_holder/sheet/job/hunter/old diff --git a/code/modules/jobs/job_types/peasants/miner.dm b/code/modules/jobs/job_types/peasants/miner.dm index 3d08ff39319..b0597ce0379 100644 --- a/code/modules/jobs/job_types/peasants/miner.dm +++ b/code/modules/jobs/job_types/peasants/miner.dm @@ -39,6 +39,7 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/miner + guild_type = /datum/guild/mason give_bank_account = 6 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' diff --git a/code/modules/jobs/job_types/peasants/soilson.dm b/code/modules/jobs/job_types/peasants/soilson.dm index 8986e60123c..3f3ab1430ba 100644 --- a/code/modules/jobs/job_types/peasants/soilson.dm +++ b/code/modules/jobs/job_types/peasants/soilson.dm @@ -44,6 +44,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/farmer + guild_type = /datum/guild/food + is_guild_head = TRUE give_bank_account = 20 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner.ogg' diff --git a/code/modules/jobs/job_types/serfs/apothecary.dm b/code/modules/jobs/job_types/serfs/apothecary.dm index 534b1fb909e..6a72f64d451 100644 --- a/code/modules/jobs/job_types/serfs/apothecary.dm +++ b/code/modules/jobs/job_types/serfs/apothecary.dm @@ -52,6 +52,8 @@ trainable_skills = list(/datum/attribute/skill/craft/alchemy = 0.1) max_apprentices = 2 + guild_type = /datum/guild/alchemy + is_guild_head = TRUE apprentice_name = "Apothecary-in-training" can_have_apprentices = TRUE diff --git a/code/modules/jobs/job_types/serfs/artificer.dm b/code/modules/jobs/job_types/serfs/artificer.dm index d17dfa6cba3..8c1737ae4be 100644 --- a/code/modules/jobs/job_types/serfs/artificer.dm +++ b/code/modules/jobs/job_types/serfs/artificer.dm @@ -60,6 +60,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/artificer + guild_type = /datum/guild/artificer + is_guild_head = TRUE give_bank_account = 8 knows_the_town = TRUE cmode_music = 'sound/music/cmode/adventurer/CombatDream.ogg' diff --git a/code/modules/jobs/job_types/serfs/blacksmith.dm b/code/modules/jobs/job_types/serfs/blacksmith.dm index fbaf53b06d2..f58b925ec41 100644 --- a/code/modules/jobs/job_types/serfs/blacksmith.dm +++ b/code/modules/jobs/job_types/serfs/blacksmith.dm @@ -41,6 +41,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/blacksmith + guild_type = /datum/guild/blacksmith + is_guild_head = TRUE display_order = JDO_BLACKSMITH give_bank_account = 30 knows_the_town = TRUE diff --git a/code/modules/jobs/job_types/serfs/carpenter.dm b/code/modules/jobs/job_types/serfs/carpenter.dm index 935f643dc89..65e2e6d46b8 100644 --- a/code/modules/jobs/job_types/serfs/carpenter.dm +++ b/code/modules/jobs/job_types/serfs/carpenter.dm @@ -38,6 +38,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/carpenter + guild_type = /datum/guild/constructors + is_guild_head = TRUE give_bank_account = 8 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner.ogg' diff --git a/code/modules/jobs/job_types/serfs/feldsher.dm b/code/modules/jobs/job_types/serfs/feldsher.dm index e6fb061f9d2..7f759b13463 100644 --- a/code/modules/jobs/job_types/serfs/feldsher.dm +++ b/code/modules/jobs/job_types/serfs/feldsher.dm @@ -71,6 +71,8 @@ ) outfit = /datum/outfit/feldsher + guild_type = /datum/guild/clinic + is_guild_head = TRUE give_bank_account = 100 knows_the_town = TRUE cmode_music = 'sound/music/cmode/nobility/combat_physician.ogg' diff --git a/code/modules/jobs/job_types/serfs/innkeep.dm b/code/modules/jobs/job_types/serfs/innkeep.dm index cf61af55af0..dc9ca0586b1 100644 --- a/code/modules/jobs/job_types/serfs/innkeep.dm +++ b/code/modules/jobs/job_types/serfs/innkeep.dm @@ -29,6 +29,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/innkeep + guild_type = /datum/guild/inn + is_guild_head = TRUE give_bank_account = 60 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatInn.ogg' diff --git a/code/modules/jobs/job_types/serfs/mason.dm b/code/modules/jobs/job_types/serfs/mason.dm index 76e32d82596..dcbe97fddfa 100644 --- a/code/modules/jobs/job_types/serfs/mason.dm +++ b/code/modules/jobs/job_types/serfs/mason.dm @@ -34,6 +34,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/mason + guild_type = /datum/guild/mason + is_guild_head = TRUE give_bank_account = 8 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' diff --git a/code/modules/jobs/job_types/serfs/matron.dm b/code/modules/jobs/job_types/serfs/matron.dm index dc2fc41d2b1..a0a4b56e621 100644 --- a/code/modules/jobs/job_types/serfs/matron.dm +++ b/code/modules/jobs/job_types/serfs/matron.dm @@ -61,6 +61,8 @@ blacklisted_species = list(SPEC_ID_HALFLING) outfit = /datum/outfit/matron + guild_type = /datum/guild/thieves + is_guild_head = TRUE give_bank_account = 35 knows_the_town = TRUE can_have_apprentices = TRUE diff --git a/code/modules/jobs/job_types/serfs/tailor.dm b/code/modules/jobs/job_types/serfs/tailor.dm index 590a0aa0de6..dea00ffe5ca 100644 --- a/code/modules/jobs/job_types/serfs/tailor.dm +++ b/code/modules/jobs/job_types/serfs/tailor.dm @@ -39,6 +39,8 @@ allowed_races = RACES_PLAYER_ALL outfit = /datum/outfit/tailor + guild_type = /datum/guild/tailor + is_guild_head = TRUE give_bank_account = 25 knows_the_town = TRUE cmode_music = 'sound/music/cmode/towner/CombatTowner2.ogg' diff --git a/code/modules/jobs/job_types/youngfolk/innkeepchild.dm b/code/modules/jobs/job_types/youngfolk/innkeepchild.dm index 53c602bb59d..a36f0279349 100644 --- a/code/modules/jobs/job_types/youngfolk/innkeepchild.dm +++ b/code/modules/jobs/job_types/youngfolk/innkeepchild.dm @@ -31,6 +31,7 @@ knows_the_town = TRUE outfit = /datum/outfit/innkeep_son + guild_type = /datum/guild/inn can_have_apprentices = FALSE can_be_apprentice = TRUE cmode_music = 'sound/music/cmode/towner/CombatInn.ogg' diff --git a/code/modules/jobs/job_types/youngfolk/orphan.dm b/code/modules/jobs/job_types/youngfolk/orphan.dm index 35ddf49c30e..73bc51a21db 100644 --- a/code/modules/jobs/job_types/youngfolk/orphan.dm +++ b/code/modules/jobs/job_types/youngfolk/orphan.dm @@ -16,6 +16,7 @@ cmode_music = 'sound/music/cmode/towner/CombatTowner.ogg' advclass_cat_rolls = list(CTAG_ORPHAN = 7) outfit = /datum/outfit/orphan + guild_type = /datum/guild/thieves knows_the_town = TRUE spells = list( diff --git a/vanderlin.dme b/vanderlin.dme index 0f95b2ca9aa..4d96ccde2bb 100644 --- a/vanderlin.dme +++ b/vanderlin.dme @@ -239,6 +239,7 @@ #include "code\__DEFINES\dcs\signals\signals_coven_powers.dm" #include "code\__DEFINES\dcs\signals\signals_datum.dm" #include "code\__DEFINES\dcs\signals\signals_divine.dm" +#include "code\__DEFINES\dcs\signals\signals_factions.dm" #include "code\__DEFINES\dcs\signals\signals_fov.dm" #include "code\__DEFINES\dcs\signals\signals_global.dm" #include "code\__DEFINES\dcs\signals\signals_hud.dm" @@ -1538,6 +1539,9 @@ #include "code\datums\mob_descriptors\descriptors\skin.dm" #include "code\datums\mob_descriptors\descriptors\stature.dm" #include "code\datums\mob_descriptors\descriptors\voice.dm" +#include "code\datums\noble_factions\_base.dm" +#include "code\datums\noble_factions\negotiation.dm" +#include "code\datums\noble_factions\guilds\_base.dm" #include "code\datums\particle_weathers\_base.dm" #include "code\datums\particle_weathers\datum_types\fall_leaves.dm" #include "code\datums\particle_weathers\datum_types\fog.dm" From cb22ec0895c0df0fb04cb85edad809b7b5a97f1a Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 9 Aug 2026 06:14:55 -0800 Subject: [PATCH 4/8] some misc things --- code/_globalvars/lists/factions.dm | 10 ++ code/controllers/subsystem/economy.dm | 39 ------- .../subsystem/properties/landmarks.dm | 2 - .../subsystem/properties/property_sign.dm | 6 +- .../subsystem/properties/subsystem.dm | 2 +- code/controllers/subsystem/treasury.dm | 19 +++ code/datums/noble_factions/_base.dm | 10 +- code/datums/noble_factions/guilds/_base.dm | 32 +---- code/datums/noble_factions/negotiation.dm | 1 - code/modules/admin/secrets.dm | 11 -- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 - code/modules/cargo/supply_packs/_pack.dm | 12 -- code/modules/economy/_economy.dm | 3 - code/modules/economy/account.dm | 109 ------------------ code/modules/jobs/job_types/_job.dm | 3 +- code/modules/jobs/jobs.dm | 2 + vanderlin.dme | 4 +- 17 files changed, 44 insertions(+), 223 deletions(-) create mode 100644 code/_globalvars/lists/factions.dm delete mode 100644 code/controllers/subsystem/economy.dm delete mode 100644 code/modules/economy/_economy.dm delete mode 100644 code/modules/economy/account.dm diff --git a/code/_globalvars/lists/factions.dm b/code/_globalvars/lists/factions.dm new file mode 100644 index 00000000000..2e3b037f6e6 --- /dev/null +++ b/code/_globalvars/lists/factions.dm @@ -0,0 +1,10 @@ +GLOBAL_LIST_EMPTY(guilds) // keyed by guild id (a type path or string, see below) + +/proc/get_or_create_guild(datum/guild/guild_type) + if(!guild_type) + return null + . = GLOB.guilds[guild_type] + if(!.) + . = new guild_type + +GLOBAL_LIST_EMPTY(current_noble_factions) diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm deleted file mode 100644 index c744612a0cd..00000000000 --- a/code/controllers/subsystem/economy.dm +++ /dev/null @@ -1,39 +0,0 @@ -SUBSYSTEM_DEF(economy) - name = "Economy" - wait = 5 MINUTES - init_order = INIT_ORDER_ECONOMY - runlevels = RUNLEVEL_GAME - var/roundstart_paychecks = 5 - var/budget_pool = 35000 - var/list/department_accounts = list(ACCOUNT_CIV = ACCOUNT_CIV_NAME, - ACCOUNT_ENG = ACCOUNT_ENG_NAME, - ACCOUNT_SCI = ACCOUNT_SCI_NAME, - ACCOUNT_MED = ACCOUNT_MED_NAME, - ACCOUNT_SRV = ACCOUNT_SRV_NAME, - ACCOUNT_CAR = ACCOUNT_CAR_NAME, - ACCOUNT_SEC = ACCOUNT_SEC_NAME) - var/list/generated_accounts = list() - var/full_ancap = FALSE // Enables extra money charges for things that normally would be free, such as sleepers/cryo/cloning. - //Take care when enabling, as players will NOT respond well if the economy is set up for low cash flows. - var/alive_humans_bounty = 100 - var/crew_safety_bounty = 1500 - var/monster_bounty = 150 - var/mood_bounty = 100 - var/techweb_bounty = 250 - - var/list/bank_accounts = list() //List of normal accounts (not department accounts) - var/list/dep_cards = list() - -/datum/controller/subsystem/economy/Initialize(timeofday) - var/budget_to_hand_out = round(budget_pool / department_accounts.len) - for(var/A in department_accounts) - new /datum/bank_account/department(A, budget_to_hand_out) - return ..() - -/datum/controller/subsystem/economy/fire(resumed = 0) - return - -/datum/controller/subsystem/economy/proc/get_dep_account(dep_id) - for(var/datum/bank_account/department/D in generated_accounts) - if(D.department_id == dep_id) - return D diff --git a/code/controllers/subsystem/properties/landmarks.dm b/code/controllers/subsystem/properties/landmarks.dm index afad17cca6b..9116929ba3e 100644 --- a/code/controllers/subsystem/properties/landmarks.dm +++ b/code/controllers/subsystem/properties/landmarks.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY(noble_points) - /obj/effect/abstract/property_noop invisibility = INVISIBILITY_ABSTRACT var/property_id diff --git a/code/controllers/subsystem/properties/property_sign.dm b/code/controllers/subsystem/properties/property_sign.dm index f4ccbfcb541..05c9f67013c 100644 --- a/code/controllers/subsystem/properties/property_sign.dm +++ b/code/controllers/subsystem/properties/property_sign.dm @@ -79,10 +79,10 @@ for(var/slot in available_slots) options["Load Design [slot]"] = slot - // Add option to create new slot + //create new option var/next_slot = 1 - if(available_slots.len > 0) - next_slot = available_slots[available_slots.len] + 1 + if(length(available_slots) > 0) + next_slot = available_slots[length(available_slots)] + 1 options["Create New Design ([next_slot])"] = next_slot options["Cancel"] = null diff --git a/code/controllers/subsystem/properties/subsystem.dm b/code/controllers/subsystem/properties/subsystem.dm index f10799dff86..17173e9fe46 100644 --- a/code/controllers/subsystem/properties/subsystem.dm +++ b/code/controllers/subsystem/properties/subsystem.dm @@ -198,7 +198,7 @@ SUBSYSTEM_DEF(housing) // Check if user has any saved designs for this template type var/list/available_slots = get_player_property_slots(ckey, property.save_id) - if(available_slots.len > 0) + if(length(available_slots) > 0) // Auto-claim with first available slot if(claim_temporary(property, user, available_slots[1])) return property diff --git a/code/controllers/subsystem/treasury.dm b/code/controllers/subsystem/treasury.dm index bd1cc883062..3108a7433c9 100644 --- a/code/controllers/subsystem/treasury.dm +++ b/code/controllers/subsystem/treasury.dm @@ -37,10 +37,13 @@ SUBSYSTEM_DEF(treasury) var/tax_value = 0.1 var/queens_tax = 0.15 var/treasury_value = 0 + ///list of player bank accounts. var/list/bank_accounts = list() var/list/untaxed_deposits = list() var/list/noble_incomes = list() var/list/stockpile_datums = list() + ///list of guild accounts + var/list/guild_account = list() var/multiple_item_penalty = 0.7 var/interest_rate = 0.15 var/next_treasury_check = 0 @@ -82,6 +85,8 @@ SUBSYSTEM_DEF(treasury) job_wages[job_title] = max(0, amount) return TRUE +/datum/controller/subsystem/treasury/proc/create_guild_account(datum/guild/new_guild) + guild_account[new_guild.type] = 0 /* * Pays every human whose current job has a nonzero * wage set. Runs off treasury_value directly, same as @@ -103,6 +108,20 @@ SUBSYSTEM_DEF(treasury) for(var/cat in category_totals) log_to_steward("Paid [category_totals[cat]] total in daily wages to [cat]") + for(var/datum/guild/type as anything in GLOB.guilds) + var/datum/guild/real_type = GLOB.guilds[type] + if(!real_type.patron_faction || !real_type.patronage_wage) + continue + var/mob/head = real_type.patron_faction.head_ref?.resolve() + if(!head) + real_type.break_patronage() + continue + var/money = bank_accounts[head] + if(money < real_type.patronage_wage) + real_type.break_patronage() + continue + give_money_account(-real_type.patronage_wage, head, "Patronage for the [real_type.name].") + /datum/controller/subsystem/treasury/proc/check_time_of_day(tod) if(tod != "dawn") return diff --git a/code/datums/noble_factions/_base.dm b/code/datums/noble_factions/_base.dm index 71bab0924c6..42a52b39a83 100644 --- a/code/datums/noble_factions/_base.dm +++ b/code/datums/noble_factions/_base.dm @@ -1,8 +1,6 @@ -GLOBAL_LIST_EMPTY(current_noble_factions) - /datum/noble_faction var/name = "Unnamed House" - var/mob/living/carbon/human/head // the patron/founder + var/datum/weakref/head_ref var/list/mob/living/carbon/human/members = list() /// One alt-appearance instance per member, keyed by member, so we can refresh the "seers" list on roster change var/list/mob/living/carbon/human/member_tags = list() @@ -10,7 +8,7 @@ GLOBAL_LIST_EMPTY(current_noble_factions) /datum/noble_faction/New(mob/living/carbon/human/founder, faction_name) . = ..() - head = founder + head_ref = WEAKREF(founder) founder.mind?.noble_faction = src if(faction_name) name = faction_name @@ -23,7 +21,7 @@ GLOBAL_LIST_EMPTY(current_noble_factions) remove_faction_tag(member) members = null member_tags = null - head = null + head_ref = null return ..() /datum/noble_faction/proc/add_member(mob/living/carbon/human/new_member) @@ -72,7 +70,7 @@ GLOBAL_LIST_EMPTY(current_noble_factions) /datum/noble_faction/proc/check_aspirant_threshold() if(length(members) >= aspirant_threshold) - SEND_SIGNAL(head, COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, src) + SEND_SIGNAL(SSdcs, COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, src) /datum/noble_faction/vanderlin_red name = "Red Faction" diff --git a/code/datums/noble_factions/guilds/_base.dm b/code/datums/noble_factions/guilds/_base.dm index 4813cbb221a..5fbb0bf79bb 100644 --- a/code/datums/noble_factions/guilds/_base.dm +++ b/code/datums/noble_factions/guilds/_base.dm @@ -1,33 +1,20 @@ -GLOBAL_LIST_EMPTY(guilds) // keyed by guild id (a type path or string, see below) - -/proc/get_or_create_guild(datum/guild/guild_type) - if(!guild_type) - return null - . = GLOB.guilds[guild_type] - if(!.) - . = new guild_type - /datum/guild var/name = "Unnamed Guild" - var/id // e.g. /datum/guild/blacksmiths var/list/mob/living/carbon/human/members = list() - /// The guild's own coffer - var/datum/bank_account/guild_account - /// Set once a noble successfully patronizes this guild. Null = independent. var/datum/noble_faction/patron_faction var/patronage_wage = 0 /datum/guild/New(guild_name, guild_id) . = ..() - id = guild_id if(guild_name) name = guild_name GLOB.guilds[type] = src + SStreasury.create_guild_account(src) /datum/guild/Destroy(force) - GLOB.guilds -= id + GLOB.guilds -= type members = null patron_faction = null return ..() @@ -68,61 +55,46 @@ GLOBAL_LIST_EMPTY(guilds) // keyed by guild id (a type path or string, see below ///IK we wanted a makers guild as an overarching guild but we can make these subguilds of it because giving someone executive power over like 40 jobs is to much /datum/guild/blacksmith name = "Smith's Guild" - id = "smith" /datum/guild/tailor name = "Tailor's Guild" - id = "tailor" /datum/guild/inn name = "Innkeeper's Guild" - id = "inn" /datum/guild/merc name = "Mercenary Guild" - id = "merc" /datum/guild/adv_guild name = "Adventurer's Guild" - id = "adv_guild" /datum/guild/thieves name = "Thieves Guild" - id = "thieves" /datum/guild/clinic name = "Medic's Guild" - id = "clinic" /datum/guild/mage name = "Magician's College" - id = "mage" /datum/guild/constructors name = "Carpenter's Guild" - id = "builder" /datum/guild/alchemy name = "Alchemist's Guild" - id = "alchemy" /datum/guild/mason name = "Stone-Mason's Guild" - id = "stone" /datum/guild/artificer name = "Artificer's Guild" - id = "artificer" /datum/guild/food name = "Farmer's Guild" - id = "farmer" /datum/guild/hunter name = "Hunter's Guild" - id = "hunter" /datum/guild/merchant name = "Merchant's Guild" - id = "merchant" diff --git a/code/datums/noble_factions/negotiation.dm b/code/datums/noble_factions/negotiation.dm index 7fa30832889..6af7dce7b5f 100644 --- a/code/datums/noble_factions/negotiation.dm +++ b/code/datums/noble_factions/negotiation.dm @@ -57,7 +57,6 @@ if(!noble?.client || !target?.client) return FALSE - var/datum/job/noble_job = SSjob.GetJob(noble.job) var/datum/job/target_job = SSjob.GetJob(target.job) if(!target_job?.is_guild_head) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 8e662b29f24..538d1d88769 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -248,17 +248,6 @@ H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) message_admins("[key_name_admin(usr)] made everybody stupid (Mass Braindamage)") - if("ancap") - if(!check_rights(R_FUN)) - return - SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Anarcho-capitalist Station")) - SSeconomy.full_ancap = !SSeconomy.full_ancap - message_admins("[key_name_admin(usr)] toggled Anarcho-capitalist mode") - if(SSeconomy.full_ancap) - priority_announce("The NAP is now in full effect.", null, 'sound/blank.ogg') - else - priority_announce("The NAP has been revoked.", null, 'sound/blank.ogg') - if(E) E.processing = FALSE if(E.announceWhen>0) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 4424716bba1..d088aa3fc66 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -1088,8 +1088,6 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null v = SSmapping if("SSevents") v = SSevents - if("SSeconomy") - v = SSeconomy //End else return null diff --git a/code/modules/cargo/supply_packs/_pack.dm b/code/modules/cargo/supply_packs/_pack.dm index 52f6bd33382..06b37eeb7e4 100644 --- a/code/modules/cargo/supply_packs/_pack.dm +++ b/code/modules/cargo/supply_packs/_pack.dm @@ -49,18 +49,6 @@ record_cost_history() baseline_price = cost -/datum/supply_pack/proc/generate(atom/A, datum/bank_account/paying_account) - var/obj/structure/closet/crate/C - if(paying_account) - C = new /obj/structure/closet/crate(A) - C.name = "[crate_name] - Purchased by [paying_account.account_holder]" - else - C = new crate_type(A) - C.name = "[crate_name] of [LOWER_TEXT(name)]" - - fill(C) - return C - /datum/supply_pack/proc/fill(obj/structure/closet/crate/C) if (admin_spawned) for(var/item in contains) diff --git a/code/modules/economy/_economy.dm b/code/modules/economy/_economy.dm deleted file mode 100644 index e421a939a88..00000000000 --- a/code/modules/economy/_economy.dm +++ /dev/null @@ -1,3 +0,0 @@ - -/obj/item/proc/get_item_credit_value() - return diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm deleted file mode 100644 index 739e55d68ea..00000000000 --- a/code/modules/economy/account.dm +++ /dev/null @@ -1,109 +0,0 @@ -#define DUMPTIME 3000 - -/datum/bank_account - var/account_holder = "Rusty Venture" - var/account_balance = 0 - var/datum/job/account_job - var/list/bank_cards = list() - var/add_to_accounts = TRUE - var/account_id - var/being_dumped = FALSE //pink levels are rising - var/withdrawDelay = 0 - -/datum/bank_account/New(newname, job) - if(add_to_accounts) - SSeconomy.bank_accounts += src - account_holder = newname - account_job = job - account_id = rand(111111,999999) - -/datum/bank_account/Destroy() - if(add_to_accounts) - SSeconomy.bank_accounts -= src - return ..() - -/datum/bank_account/proc/dumpeet() - being_dumped = TRUE - withdrawDelay = world.time + DUMPTIME - -/datum/bank_account/proc/_adjust_money(amt) - account_balance += amt - if(account_balance < 0) - account_balance = 0 - -/datum/bank_account/proc/has_money(amt) - return account_balance >= amt - -/datum/bank_account/proc/adjust_money(amt) - if((amt < 0 && has_money(-amt)) || amt > 0) - _adjust_money(amt) - return TRUE - return FALSE - -/datum/bank_account/proc/transfer_money(datum/bank_account/from, amount) - if(from.has_money(amount)) - adjust_money(amount) - from.adjust_money(-amount) - return TRUE - return FALSE - -/datum/bank_account/proc/payday(amt_of_paychecks, free = FALSE) - var/money_to_transfer = account_job.paycheck * amt_of_paychecks - if(free) - adjust_money(money_to_transfer*10) - else - var/datum/bank_account/D = SSeconomy.get_dep_account(account_job.paycheck_department) - if(D) - if(!transfer_money(D, round(money_to_transfer*(D.account_balance*0.01),1))) - bank_card_talk("ERROR: Payday aborted, departmental funds insufficient.") - return FALSE - else - bank_card_talk("Payday processed, account now holds $[account_balance].") - return TRUE - bank_card_talk("ERROR: Payday aborted, unable to contact departmental account.") - return FALSE - -/datum/bank_account/proc/bank_card_talk(message, force) - if(!message || !bank_cards.len) - return - for(var/obj/A in bank_cards) - var/icon_source = A - var/mob/card_holder = recursive_loc_check(A, /mob) - if(ismob(card_holder)) //If on a mob - if(card_holder.client && !(card_holder.client.prefs.read_preference(/datum/preference/bitwise/chat_toggles) & CHAT_BANKCARD) && !force) - continue - if(HAS_TRAIT(card_holder, TRAIT_DEAF)) - continue - card_holder.playsound_local(get_turf(card_holder), 'sound/blank.ogg', 50, TRUE) - to_chat(card_holder, "[icon2html(icon_source, card_holder)] *[message]*") - else if(isturf(A.loc)) //If on the ground - for(var/mob/M in hearers(1,get_turf(A))) - if(M.client && !(M.client.prefs.read_preference(/datum/preference/bitwise/chat_toggles) & CHAT_BANKCARD) && !force) - continue - playsound(A, 'sound/blank.ogg', 50, TRUE) - A.audible_message("[icon2html(icon_source, hearers(A))] *[message]*", null, 1) - break - else - for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker) - if(M.client && !(M.client.prefs.read_preference(/datum/preference/bitwise/chat_toggles) & CHAT_BANKCARD) && !force) - continue - if(HAS_TRAIT(M, TRAIT_DEAF)) - continue - M.playsound_local(get_turf(M), 'sound/blank.ogg', 50, TRUE) - to_chat(M, "[icon2html(icon_source, M)] *[message]*") - -/datum/bank_account/department - account_holder = "Guild Credit Agency" - var/department_id = "REPLACE_ME" - add_to_accounts = FALSE - -/datum/bank_account/department/New(dep_id, budget) - department_id = dep_id - account_balance = budget - account_holder = SSeconomy.department_accounts[dep_id] - SSeconomy.generated_accounts += src - -/datum/bank_account/remote // Bank account not belonging to the local station - add_to_accounts = FALSE - -#undef DUMPTIME diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 6694ee34b47..cd46a275380 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -512,7 +512,8 @@ var/list/choices = list("None") var/list/faction_by_name = list() for(var/datum/noble_faction/faction as anything in available_factions) - var/label = "[faction.name] (led by [faction.head?.real_name || "Unknown"])" + var/mob/living/carbon/human/head = faction.head_ref?.resolve() + var/label = "[faction.name] (led by [head?.real_name || "Unknown"])" choices += label faction_by_name[label] = faction diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 19cc3aa5256..01d0e90c026 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -183,3 +183,5 @@ GLOBAL_LIST_INIT(exp_specialmap, list( EXP_TYPE_GHOST = list(), // dead people, observers )) GLOBAL_PROTECT(exp_specialmap) + +GLOBAL_LIST_EMPTY(noble_points) diff --git a/vanderlin.dme b/vanderlin.dme index bb2f66437a1..57828383f82 100644 --- a/vanderlin.dme +++ b/vanderlin.dme @@ -389,6 +389,7 @@ #include "code\_globalvars\lists\attributes.dm" #include "code\_globalvars\lists\client.dm" #include "code\_globalvars\lists\emote.dm" +#include "code\_globalvars\lists\factions.dm" #include "code\_globalvars\lists\flavor_misc.dm" #include "code\_globalvars\lists\icons.dm" #include "code\_globalvars\lists\import.dm" @@ -476,7 +477,6 @@ #include "code\controllers\subsystem\death_arena.dm" #include "code\controllers\subsystem\discord.dm" #include "code\controllers\subsystem\dungeon_generator.dm" -#include "code\controllers\subsystem\economy.dm" #include "code\controllers\subsystem\events.dm" #include "code\controllers\subsystem\familytree.dm" #include "code\controllers\subsystem\fire_burning.dm" @@ -3149,8 +3149,6 @@ #include "code\modules\discord\accountlink.dm" #include "code\modules\discord\discord_link_record.dm" #include "code\modules\discord\manipulation.dm" -#include "code\modules\economy\_economy.dm" -#include "code\modules\economy\account.dm" #include "code\modules\emoji\emoji_parse.dm" #include "code\modules\error_handler\error_handler.dm" #include "code\modules\error_handler\error_viewer.dm" From e2088a2dc020246996aaf127277852120ee19e93 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 9 Aug 2026 06:21:49 -0800 Subject: [PATCH 5/8] stuff --- code/controllers/subsystem/properties/landmarks.dm | 4 ++++ code/datums/noble_factions/_base.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/properties/landmarks.dm b/code/controllers/subsystem/properties/landmarks.dm index 9116929ba3e..8300e9ec6fd 100644 --- a/code/controllers/subsystem/properties/landmarks.dm +++ b/code/controllers/subsystem/properties/landmarks.dm @@ -49,6 +49,10 @@ required_jobs = list(/datum/job/minor_noble) var/datum/noble_faction/faction_type +/obj/effect/landmark/house_spot/noble/Destroy(force) + . = ..() + LAZYREMOVE(GLOB.noble_points, src) + /obj/effect/landmark/house_spot/noble/Initialize(mapload) . = ..() if(!ispath(faction_type) && !isnull(faction_type)) diff --git a/code/datums/noble_factions/_base.dm b/code/datums/noble_factions/_base.dm index 42a52b39a83..3556e24644b 100644 --- a/code/datums/noble_factions/_base.dm +++ b/code/datums/noble_factions/_base.dm @@ -70,7 +70,7 @@ /datum/noble_faction/proc/check_aspirant_threshold() if(length(members) >= aspirant_threshold) - SEND_SIGNAL(SSdcs, COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, src) + SEND_GLOBAL_SIGNAL(COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, src) /datum/noble_faction/vanderlin_red name = "Red Faction" From 7da2ea7c64f88c99db708d7a6956d9ffffd6538b Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 9 Aug 2026 06:57:44 -0800 Subject: [PATCH 6/8] aspirant redo into a midround with non invasive supporters --- code/__DEFINES/traits/definitions.dm | 3 +- code/datums/hover_data/aspirant_insight.dm | 22 +++++ code/datums/noble_factions/_base.dm | 19 +++- code/modules/antagonists/villain/aspirant.dm | 78 ++++++++++++++++ .../events/antagonist/solo/minor/aspirant.dm | 88 +++++++++---------- vanderlin.dme | 1 + 6 files changed, 162 insertions(+), 49 deletions(-) create mode 100644 code/datums/hover_data/aspirant_insight.dm diff --git a/code/__DEFINES/traits/definitions.dm b/code/__DEFINES/traits/definitions.dm index c9805d9e0b1..740592c2805 100644 --- a/code/__DEFINES/traits/definitions.dm +++ b/code/__DEFINES/traits/definitions.dm @@ -360,7 +360,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Given to a mob that can throw to make them not able to throw #define TRAIT_NO_THROWING "no_throwing" - +/// Granted to the Aspirant, lets them see noble_faction hover info on faction heads. +#define TRAIT_ASPIRANT_INSIGHT "aspirant_insight" /// Hides the SSD indicator. Used with scrying. #define TRAIT_NOSSDINDICATOR "nossdindicator" /// Instant grabs on someone else. diff --git a/code/datums/hover_data/aspirant_insight.dm b/code/datums/hover_data/aspirant_insight.dm new file mode 100644 index 00000000000..12a5bee6eaa --- /dev/null +++ b/code/datums/hover_data/aspirant_insight.dm @@ -0,0 +1,22 @@ +/datum/hover_data/noble_faction_head + var/pixel_y_offset = 32 + +/datum/hover_data/noble_faction_head/setup_data(atom/source, mob/enterer) + if(!ishuman(source)) + return + var/mob/living/carbon/human/head = source + var/datum/noble_faction/faction = head.mind?.noble_faction + if(!faction) + return + if(faction.head_ref?.resolve() != head) + return // only show for the actual current head, not rank-and-file members + if(!enterer.client) + return + + var/image/hover_image = image(/obj/effect/overlay/hover, loc = source) + hover_image.pixel_y = pixel_y_offset + hover_image.maptext_height = 64 + hover_image.maptext_width = 128 + hover_image.maptext = MAPTEXT("[faction.name]\n[length(faction.members)] member[length(faction.members) == 1 ? "" : "s"]") + + add_client_image(hover_image, enterer.client) diff --git a/code/datums/noble_factions/_base.dm b/code/datums/noble_factions/_base.dm index 3556e24644b..e9aca9409cc 100644 --- a/code/datums/noble_factions/_base.dm +++ b/code/datums/noble_factions/_base.dm @@ -1,6 +1,8 @@ /datum/noble_faction var/name = "Unnamed House" var/datum/weakref/head_ref + ///ref to aspirant + var/datum/weakref/backing_aspirant_ref var/list/mob/living/carbon/human/members = list() /// One alt-appearance instance per member, keyed by member, so we can refresh the "seers" list on roster change var/list/mob/living/carbon/human/member_tags = list() @@ -14,6 +16,7 @@ name = faction_name add_member(founder) founder.add_spell(/datum/action/cooldown/offer_patronage) + founder.AddComponent(/datum/component/hovering_information, /datum/hover_data/noble_faction_head, TRAIT_ASPIRANT_INSIGHT) LAZYADD(GLOB.current_noble_factions, src) /datum/noble_faction/Destroy(force) @@ -22,9 +25,21 @@ members = null member_tags = null head_ref = null + backing_aspirant_ref = null return ..() -/datum/noble_faction/proc/add_member(mob/living/carbon/human/new_member) +/datum/noble_faction/proc/set_backing_aspirant(mob/living/carbon/human/new_aspirant) + var/mob/living/carbon/human/old_aspirant = backing_aspirant_ref?.resolve() + if(old_aspirant && old_aspirant != new_aspirant) + remove_member(old_aspirant) + to_chat(old_aspirant, span_userdanger("[name] has abandoned your cause!")) + var/datum/antagonist/aspirant/old_datum = locate(/datum/antagonist/aspirant) in old_aspirant.mind?.antag_datums + old_datum?.backing_faction_ref = null + + backing_aspirant_ref = WEAKREF(new_aspirant) + add_member(new_aspirant) + +/datum/noble_faction/proc/add_member(mob/living/carbon/human/new_member, aspirant = FALSE) if(!new_member || (new_member in members)) return FALSE members += new_member @@ -44,7 +59,7 @@ return TRUE /datum/noble_faction/proc/apply_faction_tag(mob/living/carbon/human/member) - var/image/marker = image(icon = 'icons/mob/hud.dmi', icon_state = "hog-blue-2", loc = member) + var/image/marker = image(icon = 'icons/mob/hud.dmi', icon_state = (member == backing_aspirant_ref?.resolve()) ? "hog-red-0" : "hog-blue-2", loc = member) member_tags[member] = new /datum/atom_hud/alternate_appearance/basic/people( "nobleFaction_[REF(src)]_[REF(member)]", marker, diff --git a/code/modules/antagonists/villain/aspirant.dm b/code/modules/antagonists/villain/aspirant.dm index 89f693eb39a..2503c782222 100644 --- a/code/modules/antagonists/villain/aspirant.dm +++ b/code/modules/antagonists/villain/aspirant.dm @@ -30,6 +30,8 @@ "Gun" = CHOICE_GUN, "Bomb" = CHOICE_BOMB, ) + ///faction we got backing from + var/datum/weakref/backing_faction_ref /datum/antagonist/aspirant/proc/give_equipment_prompt() var/chosen = browser_input_list(owner.current, "How shall I rise to power?", "YOUR ADVANTAGE", equipment_selection, default = CHOICE_POISON) @@ -79,6 +81,9 @@ show_name_in_check_antagonists = TRUE show_in_roundend = FALSE increase_votepwr = FALSE + innate_traits = list( + TRAIT_ASPIRANT_INSIGHT + ) /datum/antagonist/aspirant/on_gain() . = ..() @@ -98,6 +103,7 @@ /datum/antagonist/aspirant/ruler/on_gain() SHOULD_CALL_PARENT(FALSE) create_objectives() + owner.current.add_spell(/datum/action/cooldown/sway_faction_head) /datum/antagonist/aspirant/greet() to_chat(owner, span_redtextbig("I have grown weary of being near the throne, but never on it. I have decided that it is time I ruled [SSmapping.config.map_name].")) @@ -275,3 +281,75 @@ #undef CHOICE_POISON #undef CHOICE_GUN #undef CHOICE_BOMB + +/datum/action/cooldown/sway_faction_head + name = "Sway Faction Head" + desc = "Convince the head of a noble house to back your claim to the throne." + button_icon_state = "patronage" + click_to_activate = TRUE + cooldown_time = 5 MINUTES + retrigger_after_cooldown = TRUE + +/datum/action/cooldown/sway_faction_head/Activate(atom/target) + var/mob/living/carbon/human/aspirant_mob = owner + if(!ishuman(target)) + return FALSE + + var/mob/living/carbon/human/head = target + var/datum/noble_faction/faction = head.mind?.noble_faction + if(!faction) + to_chat(aspirant_mob, span_warning("[head.real_name] leads no house.")) + return FALSE + if(faction.head_ref?.resolve() != head) + to_chat(aspirant_mob, span_warning("[head.real_name] doesn't speak for [faction.name].")) + return FALSE + if(faction.backing_aspirant_ref?.resolve() == aspirant_mob) + to_chat(aspirant_mob, span_warning("[faction.name] already stands with you.")) + return FALSE + + var/datum/antagonist/aspirant/aspirant_datum = locate(/datum/antagonist/aspirant) in aspirant_mob.mind?.antag_datums + if(!aspirant_datum) + return FALSE + + var/prompt_text = "[aspirant_mob.real_name] asks [faction.name] to back their claim to the throne." + var/mob/living/carbon/human/current_claimant = faction.backing_aspirant_ref?.resolve() + if(current_claimant) + prompt_text += " Doing so breaks your house's allegiance to [current_claimant.real_name]." + + var/answer = tgui_alert(head, prompt_text, "A Proposition", list("Accept", "Decline")) + if(answer != "Accept") + to_chat(aspirant_mob, span_warning("[head.real_name] refuses to hear you out.")) + StartCooldown() + return FALSE + + faction.set_backing_aspirant(aspirant_mob) + aspirant_datum.backing_faction_ref = WEAKREF(faction) + + to_chat(aspirant_mob, span_notice("[head.real_name] has pledged [faction.name] to your cause.")) + to_chat(head, span_notice("You have pledged [faction.name] to [aspirant_mob.real_name]'s cause.")) + head.add_spell(new /datum/action/cooldown/rally_house(head, faction)) + + StartCooldown() + return TRUE + +/datum/action/cooldown/rally_house + name = "Rally the House" + desc = "Tell your house who they now serve." + button_icon_state = "patronage" + click_to_activate = TRUE + cooldown_time = 0 + retrigger_after_cooldown = FALSE + var/datum/noble_faction/faction + +/datum/action/cooldown/rally_house/New(Target, datum/noble_faction/faction) + . = ..() + src.faction = faction + +/datum/action/cooldown/rally_house/Activate(atom/target) + if(!faction) + return FALSE + for(var/mob/living/carbon/human/member as anything in faction.members) + to_chat(member, span_reallybighypnophrase("[faction.name] now stands behind a claimant to the throne.")) + member.mind?.add_antag_datum(/datum/antagonist/aspirant/supporter) + Remove(owner) + return TRUE diff --git a/code/modules/events/antagonist/solo/minor/aspirant.dm b/code/modules/events/antagonist/solo/minor/aspirant.dm index c506f9e3398..f9d4da39ec5 100644 --- a/code/modules/events/antagonist/solo/minor/aspirant.dm +++ b/code/modules/events/antagonist/solo/minor/aspirant.dm @@ -7,7 +7,8 @@ TAG_CORRUPTION, ) antag_datum = /datum/antagonist/aspirant - roundstart = TRUE + roundstart = FALSE + can_call_midround = TRUE antag_flag = ROLE_ASPIRANT shared_occurence_type = SHARED_MINOR_THREAT minor_roleset = TRUE @@ -25,6 +26,18 @@ /datum/job/tomb_warden, ) + exclusive_roles = list( + /datum/job/consort, + /datum/job/hand, + /datum/job/prince, + /datum/job/captain, + /datum/job/steward, + /datum/job/magician, + /datum/job/courtphys, + /datum/job/archivist, + /datum/job/tomb_warden, + ) + restricted_roles = list( /datum/job/lord, ) @@ -32,67 +45,50 @@ base_antags = 1 maximum_antags = 1 min_players = (LOWPOP_THRESHOLD*0.8) * READYUP_AVG + denominator = (LOWPOP_THRESHOLD*0.8) * READYUP_AVG cost = 0.8 earliest_start = 0 SECONDS - weight = 8 - - secondary_events = list( - /datum/round_event_control/antagonist/solo/wretch = 1, - ) - secondary_prob = 40 + weight = 0 + max_occurrences = 1 - preferred_events = list( - /datum/round_event_control/antagonist/solo/wretch = 1, - ) + secondary_prob = 0 typepath = /datum/round_event/antagonist/solo/aspirant + /// weakrefs to /datum/noble_faction that have crossed threshold. Purely a firing gate — + /// does NOT restrict who can become the Aspirant, since the Aspirant starts unaligned + /// and recruits a house via sway_faction_head after being chosen. + var/list/pending_factions = list() + +/datum/round_event_control/antagonist/solo/aspirant/New() + . = ..() + RegisterSignal(SSdcs, COMSIG_NOBLE_FACTION_ASPIRANT_ELIGIBLE, PROC_REF(on_faction_eligible)) + +/datum/round_event_control/antagonist/solo/aspirant/proc/on_faction_eligible(datum/source, datum/noble_faction/faction) + SIGNAL_HANDLER + var/datum/weakref/faction_ref = WEAKREF(faction) + if(faction_ref in pending_factions) + return + pending_factions += faction_ref + weight = 6 + /datum/round_event_control/antagonist/solo/aspirant/valid_for_map() if(SSmapping.config.map_name != "Voyage") return TRUE return FALSE +/datum/round_event_control/antagonist/solo/aspirant/canSpawnEvent(players_amt, gamemode, fake_check) + if(length(SSmapping.retainer.aspirants)) // already have one this round + return FALSE + if(!length(pending_factions)) + return FALSE + . = ..() + /datum/round_event/antagonist/solo/aspirant /datum/round_event/antagonist/solo/aspirant/start() . = ..() - var/static/list/helping = list( - /datum/job/consort, - /datum/job/hand, - /datum/job/prince, - /datum/job/captain, - /datum/job/steward, - /datum/job/magician, - /datum/job/courtphys, - /datum/job/archivist, - /datum/job/minor_noble, - /datum/job/jester, - /datum/job/dungeoneer, - /datum/job/men_at_arms, - /datum/job/gatemaster, - /datum/job/butler, - /datum/job/servant, - ) - var/list/possible_helpers = list() - - for(var/mob/living/carbon/human/helper in GLOB.player_list) - if(!helper.client || !helper.mind) - continue - if(is_antag_banned(helper.client.ckey, ROLE_ASPIRANT)) - continue - if(!is_type_in_list(helper.mind.assigned_role, helping)) - continue - if(helper.mind in setup_minds) - continue - possible_helpers |= helper - - var/num_helpers = min(rand(1, 3), length(possible_helpers)) - - for(var/i in 1 to num_helpers) - var/mob/living/helper = pick_n_take(possible_helpers) - helper.mind.add_antag_datum(/datum/antagonist/aspirant/supporter) - if(SSticker.rulermob?.mind) SSticker.rulermob.mind.add_antag_datum(/datum/antagonist/aspirant/ruler) diff --git a/vanderlin.dme b/vanderlin.dme index 57828383f82..1ad1661d8b9 100644 --- a/vanderlin.dme +++ b/vanderlin.dme @@ -1405,6 +1405,7 @@ #include "code\datums\helper_datums\teleport.dm" #include "code\datums\heritage\family_curse.dm" #include "code\datums\heritage\heritage.dm" +#include "code\datums\hover_data\aspirant_insight.dm" #include "code\datums\hover_data\gnome_hover.dm" #include "code\datums\injury\_injury.dm" #include "code\datums\injury\bodypart_injury.dm" From ca255fd174274daa2d153f2df8f52f3ddcb722db Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sun, 9 Aug 2026 07:02:10 -0800 Subject: [PATCH 7/8] my vscode is fucked holy --- code/datums/noble_factions/_base.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/noble_factions/_base.dm b/code/datums/noble_factions/_base.dm index e9aca9409cc..539ef767ce0 100644 --- a/code/datums/noble_factions/_base.dm +++ b/code/datums/noble_factions/_base.dm @@ -29,15 +29,15 @@ return ..() /datum/noble_faction/proc/set_backing_aspirant(mob/living/carbon/human/new_aspirant) - var/mob/living/carbon/human/old_aspirant = backing_aspirant_ref?.resolve() - if(old_aspirant && old_aspirant != new_aspirant) - remove_member(old_aspirant) - to_chat(old_aspirant, span_userdanger("[name] has abandoned your cause!")) - var/datum/antagonist/aspirant/old_datum = locate(/datum/antagonist/aspirant) in old_aspirant.mind?.antag_datums - old_datum?.backing_faction_ref = null + var/mob/living/carbon/human/old_aspirant = backing_aspirant_ref?.resolve() + if(old_aspirant && old_aspirant != new_aspirant) + remove_member(old_aspirant) + to_chat(old_aspirant, span_userdanger("[name] has abandoned your cause!")) + var/datum/antagonist/aspirant/old_datum = locate(/datum/antagonist/aspirant) in old_aspirant.mind?.antag_datums + old_datum?.backing_faction_ref = null - backing_aspirant_ref = WEAKREF(new_aspirant) - add_member(new_aspirant) + backing_aspirant_ref = WEAKREF(new_aspirant) + add_member(new_aspirant) /datum/noble_faction/proc/add_member(mob/living/carbon/human/new_member, aspirant = FALSE) if(!new_member || (new_member in members)) From 42dd998d758d6dddeee7f90d0696e774392c535f Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:47:22 -0800 Subject: [PATCH 8/8] Update vanderlin.dmm --- _maps/map_files/vanderlin/vanderlin.dmm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm index 31ce982d7ea..6b81831008b 100644 --- a/_maps/map_files/vanderlin/vanderlin.dmm +++ b/_maps/map_files/vanderlin/vanderlin.dmm @@ -38232,25 +38232,6 @@ }, /turf/open/floor/grass, /area/outdoors/town) -"rxg" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/closet/crate/crafted_closet, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/natural/cloth, -/obj/item/reagent_containers/glass/bucket/wooden, -/obj/item/broom, -/obj/item/flint, -/obj/structure/flora/grass{ - icon_state = "grass3" - }, -/turf/open/openspace, -/area/indoors/town/noble_manor/red) "rxj" = ( /obj/structure/closet/crate/chest/wicker, /obj/item/reagent_containers/food/snacks/meat/steak, @@ -172389,7 +172370,7 @@ sMC rvw rvw rvw -rxg +rvw rvw rvw rvw