Merge pull request #192 from Animusin/backup_current_state

Fix compatibility with upstream
Animusin · Dec 29, 2024 · f082688 · f082688
2 parents a802a9a + 284cbb1
commit f082688
Show file tree

Hide file tree

Showing 258 changed files with 4,736 additions and 6,358 deletions.
diff --git a/_maps/custom/roguehamlet.dmm b/_maps/custom/roguehamlet.dmm
@@ -8864,7 +8864,7 @@
 /turf/open/floor/rogue/grass,
 /area/rogue/outdoors/town)
 "jrk" = (
-/obj/item/roguestatue/silver/gnome,
+/obj/item/roguestatue/gnome,
 /turf/open/floor/rogue/tile/masonic/inverted,
 /area/rogue/indoors/town/magician)
 "jrP" = (

diff --git a/_maps/custom/roguetown.dmm b/_maps/custom/roguetown.dmm
@@ -6252,7 +6252,7 @@
 /area/rogue/indoors/town/dwarfin)
 "wy" = (
 /obj/effect/landmark/start/nightman{
-	name = "Nightman"
+	name = "Niteman"
 	},
 /turf/open/floor/carpet/royalblack,
 /area/rogue/indoors/town/bath)

diff --git a/_maps/map_files/dun_manor/dun_manor.dmm b/_maps/map_files/dun_manor/dun_manor.dmm
@@ -20124,7 +20124,7 @@
 /turf/open/floor/rogue/carpet,
 /area/rogue/under/town/basement)
 "tGe" = (
-/mob/living/carbon/human/species/goblin/npc/cave,
+/mob/living/carbon/human/species/goblin/skilled/ambush/cave,
 /turf/open/floor/rogue/dirt/ambush,
 /area/rogue/under/cave)
 "tGm" = (
@@ -22197,7 +22197,7 @@
 /turf/open/floor/rogue/cobblerock,
 /area/rogue/outdoors/town)
 "vPI" = (
-/mob/living/carbon/human/species/goblin/npc/cave,
+/mob/living/carbon/human/species/goblin/skilled/ambush/cave,
 /turf/open/floor/rogue/naturalstone,
 /area/rogue/under/cave)
 "vPS" = (