diff --git a/_maps/map_files/roguetown/roguetown.dmm b/_maps/map_files/roguetown/roguetown.dmm
index 801366c76d..344d88ec3d 100644
--- a/_maps/map_files/roguetown/roguetown.dmm
+++ b/_maps/map_files/roguetown/roguetown.dmm
@@ -23,6 +23,9 @@
 /area/rogue/indoors/town/church)
 "aaF" = (
 /obj/machinery/light/rogue/wallfire/candle/blue/r,
+/obj/structure/chair/wood/rogue/chair_noble{
+	dir = 8
+	},
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -924,11 +927,7 @@
 /turf/open/floor/rogue/dirt/road,
 /area/rogue/outdoors/town)
 "bcl" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random/archive,
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/manor)
 "bcs" = (
@@ -1083,8 +1082,7 @@
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/indoors/town/tavern)
 "bjd" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/bibble,
+/obj/structure/bookcase/random/legends,
 /turf/open/floor/rogue/carpet,
 /area/rogue/indoors/town/manor)
 "bjg" = (
@@ -1284,10 +1282,7 @@
 /turf/open/floor/rogue/dirt/road,
 /area/rogue/outdoors/rtfield)
 "bvQ" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/rogue/nitebeast,
+/obj/structure/bookcase/random/apocrypha,
 /turf/open/floor/carpet/purple,
 /area/rogue/indoors/town/church)
 "bwc" = (
@@ -1512,6 +1507,10 @@
 	},
 /turf/closed/wall/mineral/rogue/wooddark/end,
 /area/rogue/indoors/town/dwarfin)
+"bEN" = (
+/obj/item/roguestatue/iron,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "bFc" = (
 /obj/structure/closet/crate/coffin,
 /obj/structure/fluff/walldeco/maidendrape,
@@ -2004,14 +2003,7 @@
 	},
 /area/rogue/indoors)
 "cfF" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random/legends,
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/church/chapel)
 "cfK" = (
@@ -2657,6 +2649,10 @@
 	},
 /turf/open/floor/rogue/tile/tilerg,
 /area/rogue/indoors/town/manor)
+"cRD" = (
+/obj/structure/roguewindow,
+/turf/closed/wall/mineral/rogue/roofwall/middle,
+/area/rogue/indoors/town)
 "cSy" = (
 /obj/structure/closet/crate/chest/neu_fancy,
 /obj/item/roguecoin/gold/pile,
@@ -2976,12 +2972,13 @@
 /turf/open/floor/rogue/blocks/stonered,
 /area/rogue/outdoors/town)
 "djr" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/cardgame,
-/obj/item/book/rogue/festus,
-/obj/item/book/rogue/fishing,
-/turf/open/floor/rogue/wood,
-/area/rogue/indoors/town/manor)
+/obj/structure/mineral_door/wood{
+	locked = 1;
+	lockid = "nightmaiden";
+	name = "Attic"
+	},
+/turf/open/floor/rogue/blocks/stonered,
+/area/rogue/indoors/town/bath)
 "djC" = (
 /obj/structure/lever/wall{
 	pixel_x = 32;
@@ -3276,7 +3273,10 @@
 	},
 /area/rogue/outdoors/town/roofs)
 "dBV" = (
-/obj/structure/mineral_door/wood,
+/obj/structure/mineral_door/wood{
+	lockid = "walls";
+	name = "Archer's Lookout"
+	},
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -3582,6 +3582,12 @@
 	},
 /turf/open/floor/rogue/carpet/green,
 /area/rogue/indoors/town/tavern)
+"dRW" = (
+/obj/structure/bookcase/random/myths,
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "horzw"
+	},
+/area/rogue/indoors/town/magician)
 "dSa" = (
 /obj/structure/closet/crate/chest/neu_fancy,
 /obj/item/roguegem/green,
@@ -3696,6 +3702,11 @@
 /area/rogue/indoors/town/manor)
 "dXO" = (
 /obj/structure/closet/crate/chest/neu,
+/obj/item/candle/yellow,
+/obj/item/candle/yellow,
+/obj/item/candle/yellow,
+/obj/item/candle/yellow,
+/obj/item/flashlight/flare/torch/lantern,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -3985,6 +3996,14 @@
 /obj/structure/table/wood,
 /turf/open/floor/rogue/carpet/lord/right,
 /area/rogue/indoors/town/manor)
+"eoy" = (
+/obj/structure/chair/wood/rogue{
+	dir = 8
+	},
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "weird1"
+	},
+/area/rogue/indoors/town/manor)
 "eoz" = (
 /obj/structure/rack/rogue/shelf/biggest,
 /obj/structure/rack/rogue/shelf,
@@ -4197,6 +4216,10 @@
 	},
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/church)
+"ezR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/ruinedwood/darker,
+/area/rogue/indoors/town)
 "eAe" = (
 /obj/structure/stairs{
 	dir = 4
@@ -4261,6 +4284,12 @@
 /obj/structure/fluff/walldeco/rpainting/forest,
 /turf/closed/wall/mineral/rogue/decowood,
 /area/rogue/indoors/town/tavern)
+"eDp" = (
+/obj/structure/fluff/walldeco/painting/queen{
+	pixel_y = 32
+	},
+/turf/open/floor/rogue/ruinedwood,
+/area/rogue/indoors/town/magician)
 "eDt" = (
 /obj/structure/fluff/railing/wood,
 /turf/open/transparent/openspace,
@@ -4979,6 +5008,10 @@
 	icon_state = "bfloorz"
 	},
 /area/rogue/indoors/town/manor)
+"fqS" = (
+/obj/structure/roguemachine/scomm,
+/turf/open/floor/rogue/blocks,
+/area/rogue/indoors/town/manor)
 "fqV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/rogue/torchholder{
@@ -5134,6 +5167,12 @@
 	icon_state = "weird1"
 	},
 /area/rogue/indoors/town/shop)
+"fCI" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "fCN" = (
 /obj/machinery/light/rogue/firebowl/standing/blue,
 /turf/open/floor/rogue/ruinedwood/darker,
@@ -5326,9 +5365,24 @@
 /turf/closed/wall/mineral/rogue/wooddark/horizontal,
 /area/rogue/under/cave)
 "fLx" = (
-/obj/structure/roguemachine/scomm,
-/turf/closed/wall/mineral/rogue/craftstone,
-/area/rogue/indoors/town)
+/obj/structure/closet/crate/chest/neu,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper/scroll,
+/obj/item/paper/scroll,
+/obj/item/paper/scroll,
+/obj/item/paper/scroll,
+/obj/item/paper/scroll,
+/obj/item/paper/scroll,
+/obj/item/natural/feather,
+/obj/item/natural/feather,
+/obj/item/natural/feather,
+/obj/item/natural/feather,
+/turf/open/floor/rogue/carpet,
+/area/rogue/indoors/town/manor)
 "fLG" = (
 /turf/closed/wall/mineral/rogue/roofwall/middle,
 /area/rogue/indoors)
@@ -5387,7 +5441,8 @@
 /area/rogue/indoors/town/dwarfin)
 "fPW" = (
 /obj/structure/mineral_door/wood{
-	lockid = "nightmaiden"
+	lockid = "nightmaiden";
+	name = "Balcony"
 	},
 /turf/open/floor/rogue/woodturned/nosmooth,
 /area/rogue/indoors/town/bath)
@@ -6074,6 +6129,7 @@
 /obj/machinery/light/rogue/wallfire/candle/blue{
 	pixel_y = -32
 	},
+/obj/structure/bookcase/random/legends,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -6323,6 +6379,7 @@
 /obj/item/roguekey/mercenary,
 /obj/item/roguekey/tavern,
 /obj/item/roguekey/doctor,
+/obj/item/roguekey/vault,
 /turf/open/floor/rogue/tile/tilerg,
 /area/rogue/indoors/town)
 "gMl" = (
@@ -6499,10 +6556,7 @@
 /turf/open/floor/rogue/blocks,
 /area/rogue/under/town/basement)
 "gUA" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random,
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/magician)
 "gUQ" = (
@@ -6640,9 +6694,6 @@
 	},
 /area/rogue/indoors/town/shop)
 "heq" = (
-/obj/structure/fluff/wallclock{
-	dir = 3
-	},
 /obj/structure/chair/bench/couch,
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/manor)
@@ -6706,11 +6757,10 @@
 	},
 /area/rogue/indoors/town/shop)
 "hiy" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/nitebeast,
-/obj/item/book/rogue/noc,
-/turf/open/floor/rogue/carpet,
-/area/rogue/indoors/town/manor)
+/obj/structure/bed/rogue/shit,
+/obj/item/bedsheet/rogue/cloth,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "hiS" = (
 /obj/effect/decal/cobbleedge/alt{
 	dir = 6
@@ -6748,11 +6798,10 @@
 /turf/open/floor/rogue/cobble,
 /area/rogue/outdoors/town)
 "hkQ" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/nitebeast,
-/obj/item/book/rogue/law,
-/turf/open/floor/rogue/carpet,
-/area/rogue/indoors/town/manor)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/mannequin,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "hmg" = (
 /turf/open/floor/rogue/tile,
 /area/rogue/indoors/town/garrison)
@@ -6762,9 +6811,7 @@
 /turf/open/floor/rogue/tile,
 /area/rogue/under/town/basement)
 "hmS" = (
-/obj/machinery/light/rogue/torchholder{
-	pixel_y = 26
-	},
+/obj/machinery/light/rogue/wallfire/candle/blue,
 /obj/structure/chair/bench/couchablack/r,
 /turf/open/floor/carpet/inn,
 /area/rogue/under/town/basement)
@@ -7535,7 +7582,7 @@
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/garrison)
 "icd" = (
-/obj/structure/rack/rogue,
+/obj/structure/bookcase/random/apocrypha,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -7685,6 +7732,10 @@
 	},
 /turf/open/floor/rogue/wood/nosmooth/saiga,
 /area/rogue/indoors/town/tavern)
+"ilU" = (
+/obj/structure/bookcase/random/eoratica,
+/turf/open/floor/rogue/carpet,
+/area/rogue/indoors/town/manor)
 "imw" = (
 /obj/structure/flora/roguetree,
 /turf/open/floor/rogue/dirt,
@@ -7830,7 +7881,7 @@
 /turf/open/floor/rogue/blocks/paving,
 /area/rogue/indoors/town/dwarfin)
 "iuK" = (
-/obj/structure/roguemachine/vendor,
+/obj/structure/roguemachine/vendor/steward,
 /turf/closed/wall/mineral/rogue/craftstone,
 /area/rogue/indoors/town/bath)
 "ivy" = (
@@ -8410,6 +8461,7 @@
 "jfK" = (
 /obj/structure/rack/rogue,
 /obj/item/roguegem/blue,
+/obj/item/rogueweapon/knife/dagger/silver,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -8637,7 +8689,8 @@
 /area/rogue/under/town/sewer)
 "jvw" = (
 /obj/structure/mineral_door/wood{
-	lockid = "nightmaiden"
+	lockid = "nightmaiden";
+	name = "Balcony"
 	},
 /turf/open/floor/rogue/wood/nosmooth,
 /area/rogue/indoors/town/bath)
@@ -9116,6 +9169,7 @@
 "jYf" = (
 /obj/structure/rack/rogue,
 /obj/item/reagent_containers/glass/bottle/rogue/healthpot,
+/obj/item/reagent_containers/glass/bottle/rogue/strongmanapot,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -9130,6 +9184,14 @@
 /obj/machinery/light/rogue/torchholder/c,
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/garrison)
+"jYG" = (
+/obj/structure/chair/wood/rogue{
+	dir = 4
+	},
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "weird1"
+	},
+/area/rogue/indoors/town/manor)
 "jYL" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/natural/worms/leech/propaganda,
@@ -9385,12 +9447,12 @@
 /obj/item/reagent_containers/food/snacks/produce/onion,
 /obj/item/reagent_containers/food/snacks/produce/cabbage,
 /obj/item/reagent_containers/food/snacks/rogue/cheddar,
-/obj/item/reagent_containers/honeycomb,
 /obj/item/reagent_containers/food/snacks/produce/potato,
 /obj/item/reagent_containers/food/snacks/produce/potato,
 /obj/item/reagent_containers/food/snacks/rogue/truffles,
 /obj/item/reagent_containers/food/snacks/rogue/truffles,
 /obj/item/reagent_containers/food/snacks/produce/onion,
+/obj/item/reagent_containers/food/snacks/rogue/honey,
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town/manor)
 "kjw" = (
@@ -9583,6 +9645,11 @@
 /obj/structure/roguemachine/atm,
 /turf/open/floor/rogue/hexstone,
 /area/rogue/indoors/town)
+"kvF" = (
+/obj/structure/chair/wood/rogue/chair_noble,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "kvI" = (
 /obj/structure/table/wood/plain,
 /turf/open/floor/rogue/carpet,
@@ -9835,10 +9902,7 @@
 /turf/open/floor/rogue/cobble,
 /area/rogue/outdoors/town)
 "kFU" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/knowledge1,
-/obj/item/book/rogue/law,
-/obj/item/book/rogue/necra,
+/obj/structure/fluff/clock/dense,
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/manor)
 "kGu" = (
@@ -9891,6 +9955,13 @@
 /obj/machinery/light/rogue/firebowl/stump,
 /turf/open/floor/rogue/cobble,
 /area/rogue/indoors/town/manor)
+"kIR" = (
+/obj/machinery/light/rogue/wallfire/candle/blue{
+	pixel_x = 32;
+	pixel_y = 0
+	},
+/turf/open/floor/rogue/hexstone,
+/area/rogue/under/town/basement)
 "kJd" = (
 /obj/structure/handcart{
 	dir = 4
@@ -10432,6 +10503,15 @@
 /obj/structure/ladder,
 /turf/open/floor/rogue/cobble,
 /area/rogue/indoors/town/manor)
+"lod" = (
+/obj/structure/mineral_door/wood/donjon{
+	dir = 8;
+	locked = 1;
+	lockid = "walls";
+	name = "Gatehouse"
+	},
+/turf/open/floor/rogue/woodturned,
+/area/rogue/indoors/town/manor)
 "lor" = (
 /obj/machinery/light/rogue/wallfire/candle,
 /turf/open/floor/carpet/purple,
@@ -10563,7 +10643,10 @@
 /turf/closed/wall/mineral/rogue/wooddark/vertical,
 /area/rogue/indoors/town/garrison)
 "lvx" = (
-/obj/structure/mineral_door/wood,
+/obj/structure/mineral_door/wood{
+	lockid = "walls";
+	name = "Archer's Lookout"
+	},
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -11106,14 +11189,7 @@
 	},
 /area/rogue/indoors)
 "mcA" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random/thesis,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -11317,9 +11393,7 @@
 /turf/open/floor/rogue/churchmarble,
 /area/rogue/indoors/town/church/chapel)
 "mmx" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random/myths,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -11562,9 +11636,7 @@
 /turf/open/floor/rogue/cobble,
 /area/rogue/outdoors/town)
 "mxO" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/blackmountain,
-/obj/item/book/rogue/bookofpriests,
+/obj/structure/bookcase/random/myths,
 /turf/open/floor/rogue/carpet,
 /area/rogue/indoors/town/manor)
 "myx" = (
@@ -13001,9 +13073,11 @@
 /turf/open/floor/rogue/dirt/road,
 /area/rogue/outdoors/town)
 "nWB" = (
-/obj/machinery/light/rogue/wallfire/candle/r,
-/turf/open/floor/rogue/hexstone,
-/area/rogue/under/town/basement)
+/obj/machinery/light/rogue/wallfire/candle{
+	pixel_y = -32
+	},
+/turf/open/floor/carpet/royalblack,
+/area/rogue/indoors/town/manor)
 "nWC" = (
 /obj/structure/roguemachine/submission,
 /turf/open/floor/rogue/blocks,
@@ -13039,6 +13113,10 @@
 	},
 /turf/open/floor/rogue/blocks/stonered/tiny,
 /area/rogue/indoors/town/tavern)
+"nXw" = (
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "nYn" = (
 /obj/structure/bed/rogue/shit,
 /turf/open/floor/rogue/blocks,
@@ -14055,6 +14133,10 @@
 /obj/machinery/light/rogue/wallfire/candle/r,
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/indoors/town)
+"pah" = (
+/obj/effect/decal/cleanable/dirt/cobweb,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "pbd" = (
 /turf/open/floor/rogue/blocks/stonered/tiny,
 /area/rogue/indoors/town/tavern)
@@ -14391,16 +14473,9 @@
 /turf/open/floor/carpet/red,
 /area/rogue/indoors/shelter/town/sargoth)
 "ptj" = (
-/obj/machinery/light/rogue/wallfire/candle/blue,
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/turf/open/floor/rogue/ruinedwood,
-/area/rogue/indoors/town/magician)
+/obj/machinery/printingpress,
+/turf/open/floor/rogue/carpet,
+/area/rogue/indoors/town/manor)
 "ptC" = (
 /turf/open/floor/rogue/dirt,
 /area/rogue/outdoors/river)
@@ -14586,7 +14661,8 @@
 "pDR" = (
 /obj/structure/mineral_door/wood/fancywood{
 	dir = 1;
-	lockid = "soilson"
+	lockid = "soilson";
+	name = "Farm"
 	},
 /turf/open/floor/rogue/cobblerock,
 /area/rogue/outdoors/town)
@@ -14667,6 +14743,14 @@
 	icon_state = "horzw"
 	},
 /area/rogue/indoors/town/shop)
+"pKt" = (
+/obj/structure/table/wood/plain/alt,
+/obj/item/toy/cards/deck,
+/obj/item/dice,
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "weird1"
+	},
+/area/rogue/indoors/town/manor)
 "pLi" = (
 /obj/structure/closet/crate/roguecloset,
 /obj/item/gun/ballistic/revolver/grenadelauncher/bow,
@@ -14699,6 +14783,12 @@
 	},
 /turf/open/floor/rogue/dirt,
 /area/rogue/outdoors/rtfield)
+"pLR" = (
+/obj/structure/chair/wood/rogue{
+	dir = 8
+	},
+/turf/open/floor/rogue/cobble,
+/area/rogue/indoors/town/manor)
 "pLU" = (
 /obj/structure/fluff/railing/border{
 	dir = 1
@@ -14740,11 +14830,14 @@
 /turf/open/floor/rogue/concrete,
 /area/rogue/indoors/town/garrison)
 "pNT" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/tales1,
-/obj/item/book/rogue/tales3,
-/turf/open/floor/rogue/carpet,
-/area/rogue/indoors/town/manor)
+/obj/structure/roguemachine/scomm{
+	pixel_y = 0;
+	pixel_x = 32
+	},
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "weird1"
+	},
+/area/rogue/indoors/town)
 "pNY" = (
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/dwarfin)
@@ -14863,7 +14956,8 @@
 "pUw" = (
 /obj/structure/mineral_door/wood{
 	locked = 1;
-	lockid = "nightman"
+	lockid = "nightman";
+	name = "Nitemaster's Chambers"
 	},
 /turf/open/floor/rogue/woodturned/nosmooth,
 /area/rogue/indoors/town/bath)
@@ -14932,10 +15026,7 @@
 	},
 /area/rogue/indoors/town)
 "qaz" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/ledger,
-/obj/item/book/rogue/magicaltheory,
-/obj/item/book/rogue/yeoldecookingmanual,
+/obj/structure/bookcase/random/thesis,
 /turf/open/floor/rogue/carpet,
 /area/rogue/indoors/town/manor)
 "qaC" = (
@@ -14946,6 +15037,8 @@
 /obj/machinery/light/rogue/wallfire/candle/blue/l,
 /obj/structure/rack/rogue,
 /obj/item/reagent_containers/glass/bottle/rogue/manapot,
+/obj/item/reagent_containers/glass/bottle/rogue/stronghealthpot,
+/obj/item/reagent_containers/glass/bottle/vial/intpot,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "horzw"
 	},
@@ -15294,6 +15387,12 @@
 "qwE" = (
 /turf/open/floor/rogue/herringbone,
 /area/rogue/under/town/basement)
+"qxi" = (
+/obj/structure/chair/wood/rogue{
+	dir = 1
+	},
+/turf/open/floor/rogue/cobble,
+/area/rogue/indoors/town/manor)
 "qxk" = (
 /obj/structure/roguewindow/openclose,
 /turf/open/floor/rogue/ruinedwood,
@@ -15524,11 +15623,13 @@
 	},
 /area/rogue/indoors/town/tavern)
 "qHq" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/robber,
-/obj/item/book/rogue/sword,
-/turf/open/floor/rogue/carpet,
-/area/rogue/indoors/town/manor)
+/obj/item/reagent_containers/food/snacks/crow{
+	dir = 8
+	},
+/turf/open/floor/rogue/rooftop{
+	dir = 8
+	},
+/area/rogue/outdoors/mountains)
 "qHC" = (
 /obj/structure/chair/wood/rogue{
 	dir = 4
@@ -15661,15 +15762,7 @@
 	},
 /area/rogue/outdoors/mountains)
 "qQU" = (
-/obj/machinery/light/rogue/wallfire/candle/blue,
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random/eoratica,
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/magician)
 "qQY" = (
@@ -15743,6 +15836,12 @@
 /obj/machinery/light/rogue/wallfire/candle/blue,
 /turf/open/floor/rogue/cobble,
 /area/rogue/indoors/town)
+"qUQ" = (
+/obj/effect/decal/cleanable/dirt/cobweb{
+	dir = 8
+	},
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "qUS" = (
 /obj/structure/fluff/walldeco/customflag,
 /turf/closed/wall/mineral/rogue/craftstone,
@@ -16184,9 +16283,9 @@
 /area/rogue/indoors/town/shop)
 "rzh" = (
 /obj/structure/bookcase,
-/obj/item/book/random,
 /obj/item/book/rogue/manners,
 /obj/item/book/rogue/law,
+/obj/item/book/rogue/nitebeast,
 /turf/open/floor/rogue/ruinedwood/darker,
 /area/rogue/indoors/town/church)
 "rzk" = (
@@ -16710,10 +16809,7 @@
 /turf/open/floor/rogue/woodturned,
 /area/rogue/indoors/town)
 "ser" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
+/obj/structure/bookcase/random,
 /turf/open/floor/rogue/wood/nosmooth,
 /area/rogue/indoors/town)
 "sev" = (
@@ -16758,6 +16854,10 @@
 	},
 /turf/closed/wall/mineral/rogue/stone,
 /area/rogue/outdoors/town)
+"siA" = (
+/obj/item/rogue/painting,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "siS" = (
 /obj/item/natural/poo,
 /turf/open/water/sewer,
@@ -16962,6 +17062,7 @@
 /area/rogue/under/town/basement)
 "suC" = (
 /obj/item/roguemachine/drugtrade,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/rogue/ruinedwood/chevron,
 /area/rogue/indoors/town)
 "suF" = (
@@ -16974,9 +17075,7 @@
 	},
 /area/rogue/under/town/basement)
 "swi" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/godofdreamsandnightmares,
-/obj/item/book/rogue/knowledge1,
+/obj/structure/bookcase/random/archive,
 /turf/open/floor/rogue/carpet,
 /area/rogue/indoors/town/manor)
 "swu" = (
@@ -17047,6 +17146,9 @@
 /obj/item/clothing/cloak/raincloak/green,
 /obj/item/clothing/cloak/raincloak/red,
 /obj/item/clothing/cloak/raincloak/purple,
+/obj/item/clothing/neck/roguetown/keffiyeh/black,
+/obj/item/clothing/neck/roguetown/keffiyeh/red,
+/obj/item/clothing/neck/roguetown/keffiyeh/yellow,
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/shop)
 "szg" = (
@@ -17267,6 +17369,7 @@
 /area/rogue/indoors/town/bath)
 "sMR" = (
 /obj/structure/chair/bench/coucha/r,
+/obj/machinery/light/rogue/wallfire/candle/blue,
 /turf/open/floor/carpet/inn,
 /area/rogue/under/town/basement)
 "sNj" = (
@@ -17763,16 +17866,13 @@
 /turf/open/floor/rogue/dirt/road,
 /area/rogue/outdoors/rtfield)
 "tsq" = (
-/obj/structure/bookcase,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/obj/item/book/random,
-/turf/open/floor/rogue/ruinedwood,
-/area/rogue/indoors/town/magician)
+/obj/structure/mineral_door/wood/donjon{
+	dir = 4;
+	lockid = "walls";
+	name = "Gatehouse"
+	},
+/turf/open/floor/rogue/cobble,
+/area/rogue/indoors/town/manor)
 "tst" = (
 /obj/effect/spawner/roguemap/stump,
 /turf/open/floor/rogue/grass,
@@ -17955,6 +18055,13 @@
 /area/rogue/indoors/town/tavern)
 "tBB" = (
 /obj/structure/rack/rogue,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
+/obj/item/natural/stone,
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
 	},
@@ -18508,12 +18615,11 @@
 /turf/open/floor/rogue/hexstone,
 /area/rogue/under/town/basement)
 "ued" = (
-/obj/structure/rack/rogue,
-/obj/item/rogueweapon/knife/dagger/silver,
-/turf/open/floor/rogue/ruinedwood{
-	icon_state = "horzw"
-	},
-/area/rogue/indoors/town/magician)
+/obj/structure/closet/crate/chest/old_crate,
+/obj/item/natural/bundle/cloth,
+/obj/item/clothing/under/roguetown/tights/sailor,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "ufU" = (
 /obj/machinery/light/rogue/wallfire/candle/r,
 /turf/open/floor/rogue/cobble/mossy/alt,
@@ -18888,6 +18994,14 @@
 	},
 /turf/open/floor/rogue/wood,
 /area/rogue/indoors/town/church)
+"uwA" = (
+/obj/structure/chair/wood/rogue/chair_noble{
+	dir = 8
+	},
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "horzw"
+	},
+/area/rogue/indoors/town/magician)
 "uxC" = (
 /obj/structure/fluff/grindwheel,
 /turf/open/floor/rogue/cobble,
@@ -19051,6 +19165,12 @@
 "uGB" = (
 /turf/open/water/swamp,
 /area/rogue/outdoors/rtfield)
+"uGR" = (
+/obj/structure/bookcase/random/thesis,
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "horzw"
+	},
+/area/rogue/indoors/town/magician)
 "uGU" = (
 /obj/structure/fluff/railing/wood{
 	dir = 1;
@@ -19355,8 +19475,7 @@
 /turf/open/floor/rogue/blocks,
 /area/rogue/indoors/town/dwarfin)
 "uVU" = (
-/obj/structure/bookcase,
-/obj/item/book/rogue/abyssor,
+/obj/structure/bookcase/random/apocrypha,
 /turf/open/floor/rogue/carpet,
 /area/rogue/indoors/town/manor)
 "uWi" = (
@@ -19856,6 +19975,12 @@
 "vxu" = (
 /turf/open/floor/rogue/blocks/green,
 /area/rogue/under/town/basement)
+"vyw" = (
+/obj/structure/table/wood,
+/turf/open/floor/rogue/ruinedwood{
+	icon_state = "horzw"
+	},
+/area/rogue/indoors/town/magician)
 "vyC" = (
 /obj/machinery/light/rogue/wallfire{
 	pixel_y = 32
@@ -20395,6 +20520,13 @@
 "wau" = (
 /turf/open/floor/rogue/blocks/stonered,
 /area/rogue/indoors/town/bath)
+"waK" = (
+/obj/structure/chair/wood/rogue/chair_noble{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/ruinedwood/spiral,
+/area/rogue/indoors/town)
 "wbG" = (
 /obj/structure/chair/stool/rogue{
 	pixel_x = -2;
@@ -20853,6 +20985,10 @@
 /obj/item/bedsheet/rogue/fabric,
 /turf/open/floor/carpet/royalblack,
 /area/rogue/indoors/town/manor)
+"wBv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/rogue/ruinedwood/chevron,
+/area/rogue/indoors/town)
 "wBy" = (
 /obj/structure/bookcase,
 /obj/item/book/rogue/nitebeast,
@@ -21540,6 +21676,13 @@
 "xqs" = (
 /turf/open/floor/rogue/wood/saiga,
 /area/rogue/indoors/town/tavern)
+"xqD" = (
+/obj/machinery/light/rogue/wallfire/candle/blue{
+	pixel_y = 0;
+	pixel_x = -32
+	},
+/turf/open/floor/rogue/hexstone,
+/area/rogue/under/town/basement)
 "xqU" = (
 /obj/effect/decal/cobbleedge/mossy_small{
 	dir = 8
@@ -22007,7 +22150,8 @@
 "xRZ" = (
 /obj/structure/mineral_door/wood{
 	locked = 1;
-	lockid = "manor"
+	lockid = "walls";
+	name = "Bunks"
 	},
 /turf/open/floor/rogue/ruinedwood{
 	icon_state = "weird1"
@@ -22177,6 +22321,7 @@
 /area/rogue/indoors/town/tavern)
 "ydq" = (
 /obj/machinery/light/rogue/wallfire/candle/blue,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/indoors/town)
 "ydE" = (
@@ -40155,7 +40300,7 @@ gwu
 age
 sxI
 sxI
-sxI
+xqD
 sxI
 gwu
 tPJ
@@ -40308,17 +40453,17 @@ cuY
 kdB
 sxI
 gwu
-sxI
+kIR
 sxI
 gwu
 sxI
 sxI
 sxI
-nWB
 sxI
 sxI
-gwu
 sxI
+gwu
+kIR
 ueb
 kdB
 xPr
@@ -55839,7 +55984,7 @@ wUv
 tDt
 lxt
 yhr
-kXR
+qhG
 lxt
 kXR
 kXR
@@ -56944,8 +57089,8 @@ vYP
 kXR
 qhG
 ojC
-yhr
-yhr
+sPK
+nWB
 ojC
 dOC
 kXR
@@ -58099,7 +58244,7 @@ iUq
 wEI
 wZQ
 ilh
-fMz
+pNT
 ain
 lfg
 kxG
@@ -58257,7 +58402,7 @@ jmy
 gwA
 gwA
 gwA
-fLx
+gwA
 gwA
 gwA
 gwA
@@ -58376,7 +58521,7 @@ iUq
 iUq
 iUq
 kyR
-gjF
+fqS
 wmP
 wmP
 wmP
@@ -59005,7 +59150,7 @@ tDt
 iUq
 ggd
 oEQ
-rpY
+tsq
 jBZ
 rpY
 kyR
@@ -59163,7 +59308,7 @@ iUq
 kyR
 oEQ
 ujW
-wmP
+pLR
 oDk
 clN
 bHI
@@ -59476,7 +59621,7 @@ iUq
 iUq
 cyz
 jBZ
-wmP
+qxi
 gjF
 wmP
 clN
@@ -59791,7 +59936,7 @@ iUq
 cyz
 oEQ
 oEQ
-hWb
+lod
 oEQ
 ggd
 bHI
@@ -61168,13 +61313,13 @@ lcA
 lcA
 lcA
 rru
-cyz
+kKI
 cyz
 iUq
 iUq
 iUq
 cyz
-cyz
+kKI
 lxt
 htz
 kXR
@@ -81117,7 +81262,7 @@ awl
 iez
 jdM
 pqy
-hkQ
+uVU
 euW
 hGw
 teB
@@ -82225,7 +82370,7 @@ sLP
 pqy
 uVU
 sLP
-pNT
+qaz
 sLP
 bGl
 clN
@@ -82384,7 +82529,7 @@ bjd
 sLP
 swi
 sLP
-bGl
+ilU
 pqy
 oiP
 oiP
@@ -82694,7 +82839,7 @@ pqy
 sLP
 hqW
 pqy
-djr
+dXx
 kXR
 clN
 kXR
@@ -83030,7 +83175,7 @@ pqy
 fTF
 nfH
 wmP
-nfH
+jYG
 kyR
 tfO
 oiP
@@ -83187,7 +83332,7 @@ clN
 clN
 nfH
 wmP
-nfH
+pKt
 dQd
 tfO
 oiP
@@ -83322,11 +83467,11 @@ pqy
 rjF
 sLP
 pqy
-hiy
+uVU
 sLP
-bGl
-hqW
 sLP
+hqW
+bGl
 pqy
 oiP
 oiP
@@ -83344,7 +83489,7 @@ pqy
 dXO
 nfH
 nfH
-nfH
+eoy
 kyR
 tfO
 oiP
@@ -83479,9 +83624,9 @@ clN
 sLP
 sLP
 pqy
-qHq
+swi
 sLP
-bGl
+ptj
 sLP
 lhy
 pqy
@@ -83636,11 +83781,11 @@ sOa
 sLP
 sLP
 pqy
-bGl
+swi
 sLP
 kvI
 sLP
-hqW
+fLx
 clN
 oiP
 oiP
@@ -91020,7 +91165,7 @@ bjg
 bjg
 bjg
 cPS
-tvG
+djr
 vTl
 vTl
 wau
@@ -109244,8 +109389,8 @@ cTX
 jfK
 qaY
 jYf
-icd
-icd
+iiw
+iiw
 icd
 cTX
 cTX
@@ -109555,11 +109700,11 @@ iFl
 cTX
 gAw
 iiw
-icd
-ued
-icd
-icd
 iiw
+iiw
+iiw
+iiw
+uGR
 wpL
 wpL
 wpL
@@ -109712,11 +109857,11 @@ iFl
 eqn
 keR
 iiw
-iiw
-iiw
+uwA
+vyw
 aaF
 iiw
-iiw
+dRW
 wpL
 hjp
 kgn
@@ -110024,8 +110169,8 @@ iFl
 iFl
 iFl
 cTX
-ptj
-tsq
+pSY
+fWC
 wpL
 wpL
 fWC
@@ -110338,7 +110483,7 @@ iFl
 iFl
 iFl
 cTX
-fWC
+eDp
 wyz
 qYu
 wpL
@@ -113154,6 +113299,12 @@ doW
 doW
 doW
 doW
+qHq
+ktw
+ktw
+ktw
+ktw
+ktw
 ktw
 ktw
 ktw
@@ -113162,12 +113313,6 @@ ktw
 ktw
 ktw
 ktw
-doW
-doW
-doW
-doW
-doW
-doW
 doW
 doW
 doW
@@ -113317,6 +113462,12 @@ nKr
 fFx
 nKr
 nKr
+nKr
+nKr
+nKr
+nKr
+nKr
+nKr
 mLV
 bhm
 doW
@@ -113324,12 +113475,6 @@ doW
 doW
 doW
 doW
-doW
-doW
-doW
-doW
-doW
-doW
 oiP
 oiP
 sjf
@@ -113470,10 +113615,16 @@ doW
 doW
 qQG
 vTw
+dSj
 kjw
 kjw
 kjw
 kjw
+kjw
+dSj
+kjw
+kjw
+hiy
 qyY
 bhm
 doW
@@ -113481,12 +113632,6 @@ doW
 doW
 doW
 doW
-doW
-doW
-doW
-doW
-doW
-doW
 oiP
 oiP
 sjf
@@ -113627,18 +113772,18 @@ ktw
 ktw
 ktw
 vTw
-kjw
+dSj
 oJp
 oJp
+hkQ
+kjw
+oJp
+dSj
+dSj
+dSj
 kjw
 qyY
-oNl
-doW
-doW
-doW
-doW
-doW
-doW
+bhm
 doW
 doW
 doW
@@ -113784,23 +113929,23 @@ nKr
 fFx
 nKr
 oJp
-kjw
+dSj
 fpt
 mWk
+dSj
+dSj
+mWk
+waK
+dSj
 kjw
-fFx
+kjw
+cRD
 bhm
 doW
 doW
 doW
 doW
 doW
-doW
-doW
-doW
-doW
-doW
-doW
 oiP
 oiP
 oiP
@@ -113937,14 +114082,20 @@ doW
 doW
 qQG
 vTw
+pah
 kjw
 kjw
 kjw
-kjw
-kjw
+dSj
 mWk
 fpt
 kjw
+dSj
+mWk
+kvF
+dSj
+kjw
+kjw
 qyY
 bhm
 doW
@@ -113952,12 +114103,6 @@ doW
 doW
 doW
 doW
-doW
-doW
-doW
-doW
-doW
-doW
 oiP
 oiP
 oiP
@@ -114101,15 +114246,15 @@ oJp
 kjw
 oJp
 mWk
+dSj
 kjw
+mWk
+mWk
+mWk
+oJp
+dSj
 qyY
 ktw
-ktw
-ktw
-ktw
-ktw
-ktw
-ktw
 doW
 doW
 doW
@@ -114255,17 +114400,17 @@ kjw
 mWk
 aDx
 mWk
-kjw
+dSj
 mWk
 mWk
 kjw
-oJp
-nKr
-nKr
-fFx
-nKr
-nKr
-mLV
+dSj
+dSj
+dSj
+dSj
+dSj
+dSj
+qyY
 bhm
 doW
 doW
@@ -114412,16 +114557,16 @@ kjw
 mWk
 aDx
 mWk
-kjw
+dSj
 mWk
 mWk
+ued
 kjw
 kjw
+dSj
+dSj
 kjw
-kjw
-kjw
-kjw
-kjw
+dSj
 qyY
 bhm
 doW
@@ -114569,7 +114714,7 @@ kjw
 oJp
 fpt
 mWk
-kjw
+dSj
 oJp
 oJp
 uNu
@@ -114578,7 +114723,7 @@ kjw
 oJp
 uNu
 oJp
-kjw
+dSj
 fFx
 bhm
 doW
@@ -114726,11 +114871,11 @@ kjw
 kjw
 kjw
 kjw
+dSj
 kjw
-kjw
-kjw
-kjw
-kjw
+dSj
+dSj
+dSj
 kjw
 mWk
 aDx
@@ -114888,7 +115033,7 @@ fpt
 uNu
 uNu
 oJp
-kjw
+nXw
 mWk
 aDx
 fpt
@@ -115206,7 +115351,7 @@ uJU
 eEe
 mWk
 mWk
-kjw
+nXw
 kjw
 kjw
 kjw
@@ -115354,11 +115499,11 @@ doW
 doW
 qQG
 eSC
-kjw
+dSj
 nzA
 uIc
-uJU
-lAz
+ezR
+wBv
 lAz
 vrc
 mWk
@@ -115367,7 +115512,7 @@ uNu
 fpt
 uNu
 oJp
-kjw
+dSj
 qyY
 bhm
 doW
@@ -115514,9 +115659,9 @@ vTw
 oJp
 fpt
 oJp
-uJU
+ezR
 suC
-lAz
+wBv
 uJU
 mWk
 uNu
@@ -115524,7 +115669,7 @@ uNu
 uNu
 uNu
 oJp
-kjw
+dSj
 qyY
 oNl
 doW
@@ -115671,17 +115816,17 @@ dOj
 bdh
 aDx
 mWk
-uJU
-lAz
-lAz
+ezR
+wBv
+wBv
 uJU
 uIc
 kjw
-kjw
-kjw
-kjw
-kjw
-kjw
+dSj
+dSj
+dSj
+dSj
+fCI
 fFx
 bhm
 doW
@@ -115838,7 +115983,7 @@ uNu
 uNu
 uNu
 oJp
-kjw
+dSj
 qyY
 bhm
 doW
@@ -115995,7 +116140,7 @@ aDx
 aDx
 aDx
 mWk
-kjw
+dSj
 qyY
 bhm
 doW
@@ -116152,7 +116297,7 @@ uNu
 yhk
 uNu
 oJp
-kjw
+dSj
 qyY
 bhm
 doW
@@ -116305,11 +116450,11 @@ aDx
 aDx
 aDx
 mWk
-kjw
+pah
 kjw
 kjw
 oJp
-kjw
+dSj
 qyY
 bhm
 doW
@@ -116462,7 +116607,7 @@ aDx
 aDx
 aDx
 mWk
-kjw
+bEN
 kjw
 kjw
 kjw
@@ -116619,9 +116764,9 @@ aDx
 aDx
 aDx
 npv
+siA
 kjw
-kjw
-kjw
+qUQ
 oJp
 kjw
 qyY
diff --git a/code/modules/roguetown/roguemachine/vendor.dm b/code/modules/roguetown/roguemachine/vendor.dm
index 38618066e3..cf32979ff6 100644
--- a/code/modules/roguetown/roguemachine/vendor.dm
+++ b/code/modules/roguetown/roguemachine/vendor.dm
@@ -293,3 +293,6 @@
 		held_items[P]["NAME"] = P.name
 		held_items[P]["PRICE"] = 120
 	update_icon()
+
+/obj/structure/roguemachine/vendor/nitemaster
+	keycontrol = "nightman"