Merge branch 'main' into main

Darkrp-community · Dec 22, 2024 · d62c16f · d62c16f
2 parents b5ec939 + 3736864
commit d62c16f
Show file tree

Hide file tree

Showing 58 changed files with 1,113 additions and 925 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/roguetown/otherz/roguehamlet.dmm b/_maps/map_files/roguetown/otherz/roguehamlet.dmm
@@ -10606,7 +10606,7 @@
 /obj/item/reagent_containers/glass/bottle/rogue/poison,
 /obj/item/clothing/mask/cigarette/rollie/mindbreaker,
 /obj/item/reagent_containers/food/snacks/produce/jacksberry/poison,
-/obj/item/keyring/nightman,
+/obj/item/keyring/niteman,
 /turf/open/floor/rogue/ruinedwood/chevron,
 /area/rogue/indoors/town)
 "lGN" = (

diff --git a/_maps/map_files/roguetown/otherz/smalldecap.dmm b/_maps/map_files/roguetown/otherz/smalldecap.dmm
@@ -726,7 +726,7 @@
 /area/rogue/under/cavelava)
 "su" = (
 /obj/structure/table/wood/reinforced,
-/obj/item/roguestatue/silver/gnome,
+/obj/item/roguestatue/gnome,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/rogue/herringbone,
 /area/rogue/under/cavelava)