diff --git a/_maps/map_files/stonehamlet/stonehamlet.dmm b/_maps/map_files/stonehamlet/stonehamlet.dmm
index 1cadd7f2f9..f359037b02 100644
--- a/_maps/map_files/stonehamlet/stonehamlet.dmm
+++ b/_maps/map_files/stonehamlet/stonehamlet.dmm
@@ -2380,7 +2380,7 @@
 /area/rogue/outdoors/exposed/under/basement)
 "cte" = (
 /obj/structure/roguemachine/balloon_pad,
-/turf/open/floor/rogue/tile,
+/turf/open/floor/rogue/tile/kitchen,
 /area/rogue/outdoors/town/roofs)
 "ctX" = (
 /turf/closed/mineral/rogue/bedrock,
@@ -5066,6 +5066,9 @@
 /obj/machinery/light/rogue/firebowl/standing,
 /turf/open/floor/rogue/naturalstone,
 /area/rogue/outdoors/mountains)
+"eZv" = (
+/turf/open/transparent/openspace,
+/area/rogue/indoors/shelter/town/roofs)
 "eZz" = (
 /obj/machinery/light/rogue/campfire,
 /turf/open/floor/rogue/dirt/road,
@@ -10632,7 +10635,7 @@
 "kBA" = (
 /obj/structure/roguemachine/balloon_pad,
 /obj/item/reagent_containers/food/snacks/crow,
-/turf/open/floor/rogue/tile,
+/turf/open/floor/rogue/tile/kitchen,
 /area/rogue/outdoors/town/roofs)
 "kBD" = (
 /obj/effect/spawner/roguemap/tree,
@@ -18013,7 +18016,7 @@
 "rKy" = (
 /obj/item/roguemachine/merchant,
 /obj/structure/roguemachine/balloon_pad,
-/turf/open/floor/rogue/tile,
+/turf/open/floor/rogue/tile/kitchen,
 /area/rogue/outdoors/town/roofs)
 "rKK" = (
 /obj/structure/rogue/trophy/deer,
@@ -24202,7 +24205,7 @@
 	dir = 1;
 	icon_state = "crow"
 	},
-/turf/open/floor/rogue/tile,
+/turf/open/floor/rogue/tile/kitchen,
 /area/rogue/outdoors/town/roofs)
 "xRs" = (
 /obj/structure/chair/stool/rogue,
@@ -138916,7 +138919,7 @@ hZX
 hZX
 hZX
 eQe
-hZX
+eZv
 eQe
 hZX
 hZX
diff --git a/code/game/area/roguetownareas.dm b/code/game/area/roguetownareas.dm
index c8cdda1033..0a2971e417 100644
--- a/code/game/area/roguetownareas.dm
+++ b/code/game/area/roguetownareas.dm
@@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 /area/rogue/outdoors/rtfield/hamlet/unsafe	// just so there isnt unusable ambush spots placed in safe areas causing annoying screenshake but no effect
 
 /area/rogue/outdoors/rtfield/plague_district
-	ambush_mobs = list(/mob/living/carbon/human/species/human/northern/bum/ambush = 50, /mob/living/simple_animal/hostile/rogue/skeleton = 50)
+	ambush_mobs = list(/mob/living/carbon/human/species/human/northern/bum/skilled/madman = 50, /mob/living/simple_animal/hostile/rogue/skeleton = 50)
 	first_time_text = "PLAGUE DISTRICT"
 	color = "#d4da75"
 	name = "plague district"
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
 				/mob/living/carbon/human/species/goblin/skilled = 20,
 				/mob/living/carbon/human/species/skeleton/skilled/unarmed = 5,
-				/mob/living/carbon/human/species/skeleton/skilled/figter = 5)
+				/mob/living/carbon/human/species/skeleton/skilled/fighter = 5)
 	converted_type = /area/rogue/outdoors/caves
 
 /area/rogue/outdoors/caves
@@ -352,7 +352,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 				/turf/open/floor/rogue/dirt)
 	ambush_mobs = list(
 				/mob/living/carbon/human/species/skeleton/skilled/unarmed = 5,
-				/mob/living/carbon/human/species/skeleton/skilled/figter = 5,
+				/mob/living/carbon/human/species/skeleton/skilled/fighter = 5,
 				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
 				/mob/living/carbon/human/species/goblin/skilled = 20)
 	converted_type = /area/rogue/outdoors/caves
diff --git a/code/game/objects/effects/spawners/roguemapgen.dm b/code/game/objects/effects/spawners/roguemapgen.dm
index c4200fbd38..903b11b8b1 100644
--- a/code/game/objects/effects/spawners/roguemapgen.dm
+++ b/code/game/objects/effects/spawners/roguemapgen.dm
@@ -290,7 +290,7 @@
 		/obj/item/reagent_containers/food/snacks/smallrat = 15,
 		/obj/item/reagent_containers/food/snacks/smallrat/dead = 10,
 		/obj/item/roguecoin/copper = 50,
-		/mob/living/carbon/human/species/human/northern/bum/ambush  = 25,
+		/mob/living/carbon/human/species/human/northern/bum/skilled/madman  = 25,
 		)
 
 /*	..................   Skeleton Fighter Danger   ................... */