Merge remote-tracking branch 'upstream/main'

_maps/map_files/roguetown/roguetown.dmm

@@ -9924,7 +9924,7 @@
 /area/rogue/indoors/town/shop)
 "kIj" = (
 /obj/structure/fluff/statue{
-	name = "The Veiled Lady"
+	name = "The Undermaiden"
 	},
 /obj/structure/flora/ausbushes/sparsegrass,
 /turf/open/floor/rogue/dirt/road,

code/datums/components/spawner.dm

@@ -6,10 +6,11 @@
 	var/max_mobs = 5
 	var/spawn_text = "emerges from"
 	var/list/faction = list("mining")
+	/// The minimum distance to a client before we can start spawning mobs.
+	var/range = 10
 
 
-
-/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs)
+/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _range, _max_mobs)
 	if(_spawn_time)
 		spawn_time=_spawn_time
 	if(_mob_types)
@@ -18,6 +19,8 @@
 		faction=_faction
 	if(_spawn_text)
 		spawn_text=_spawn_text
+	if(_range)
+		range = _range
 	if(_max_mobs)
 		max_mobs=_max_mobs
 
@@ -27,7 +30,6 @@
 /datum/component/spawner/process()
 	try_spawn_mob()
 
-
 /datum/component/spawner/proc/stop_spawning(force)
 	STOP_PROCESSING(SSprocessing, src)
 	for(var/mob/living/simple_animal/L in spawned_mobs)
@@ -41,6 +43,14 @@
 		return 0
 	if(spawn_delay > world.time)
 		return 0
+	if(range)
+		var/is_close_enough = FALSE
+		for(var/mob/living as anything in SSmobs.clients_by_zlevel[P.z]) // client-containing mobs, NOT clients
+			if(get_dist(P, living) <= range)
+				is_close_enough = TRUE
+				break
+		if(!is_close_enough)
+			return FALSE
 	spawn_delay = world.time + spawn_time
 	var/chosen_mob_type = pick(mob_types)
 	var/mob/living/simple_animal/L = new chosen_mob_type(P.loc)
@@ -49,3 +59,5 @@
 	L.nest = src
 	L.faction = src.faction
 	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
+	playsound(src, 'sound/misc/portal_op.ogg', 100, 1)
+	stop_spawning()

code/datums/gods/patrons/divine_pantheon.dm

@@ -51,7 +51,7 @@
 /datum/patron/divine/necra
 	name = "Necra"
 	domain = "Force of Death and Decay"
-	desc = "The Veiled Lady, a feared but respected Force and keeper of the dead."
+	desc = "The Undermaiden, also known as the Veiled Lady. A feared but respected Force and keeper of the dead."
 	flaws = "Unchanging, Apathetic, Strict"
 	worshippers = "Dark Elves, Gravekeepers, Mourners"
 	sins = "Undeath"

code/game/objects/items/rogueweapons/melee/blunt.dm

@@ -151,20 +151,6 @@
 	max_integrity = 300
 
 
-//................ Copper bludgeon ............... //
-/obj/item/rogueweapon/mace/copperbludgeon
-	force = DAMAGE_CLUB
-	force_wielded = DAMAGE_CLUB_WIELD
-	name = "copper bludgeon"
-	desc = "An extremely crude weapon for cruder bastards."
-	icon_state = "cbludgeon"
-	max_integrity = 80
-	minstr = 5
-	smeltresult = /obj/item/ingot/copper
-	sellprice = 10
-	wdefense = MEDIOCHRE_PARRY
-
-
 //................ Club ............... //
 /obj/item/rogueweapon/mace/woodclub
 	force = DAMAGE_CLUB
@@ -230,6 +216,15 @@
 	icon_state = "carpentercudgel"
 	desc = "A stubby club reinforced with iron bits, popular among village watchmen and peasant militias. Despite being reinforced and hard-hitting, it still cannot compare to a proper mace."
 
+//................ Bludgeon ............... // (Copper cudgel)
+/obj/item/rogueweapon/mace/cudgel/bludgeon
+	name = "bludgeon"
+	icon = 'icons/roguetown/weapons/custom.dmi'
+	icon_state = "bludgeon"
+	desc = "Old wooden club with copper nails in it."
+	max_integrity = INTEGRITY_POOR
+	sellprice = VALUE_DIRT_CHEAP
+
 
 //................ Wooden sword ............... //
 /obj/item/rogueweapon/mace/woodclub/train_sword
@@ -369,6 +364,21 @@
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
 
 
+
+// Obsolete
+//................ Copper bludgeon ............... //
+/obj/item/rogueweapon/mace/copperbludgeon
+	force = DAMAGE_CLUB
+	force_wielded = DAMAGE_CLUB_WIELD
+	name = "copper bludgeon"
+	desc = "An extremely crude weapon for cruder bastards."
+	icon_state = "cbludgeon"
+	max_integrity = 80
+	minstr = 5
+	smeltresult = /obj/item/ingot/copper
+	sellprice = 10
+	wdefense = MEDIOCHRE_PARRY
+
 //................ Copper goden ............... //
 /obj/item/rogueweapon/mace/goden/copper
 	force = 10

code/game/objects/items/rogueweapons/melee/swords.dm

@@ -372,6 +372,7 @@
 \----------*/
 /obj/item/rogueweapon/sword/scimitar
 	possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/chop)
+	gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/chop)
 	name = "scimitar"
 	desc = "A Zybantu design for swords, these curved blades are a common sight in the lands of the Ziggurat."
 	icon_state = "scimitar"
@@ -380,6 +381,7 @@
 
 /obj/item/rogueweapon/sword/scimitar/falchion
 	possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/axe/chop)
+	gripped_intents = list(/datum/intent/sword/cut, /datum/intent/axe/chop)
 	name = "falchion"
 	desc = "Broad blade, excellent steel, a design inspired by Malum the dwarves claim."
 	icon_state = "falchion_old"
@@ -392,7 +394,7 @@
 	desc = "Straight iron blade, simple cutting edge, no nonsense and a popular northern blade."
 	icon_state = "imesser"
 	possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/axe/chop)
-	minstr = 8 // Heavy blade used by orcs
+	gripped_intents = list(/datum/intent/sword/cut, /datum/intent/axe/chop, /datum/intent/sword/thrust)
 	wbalance = EASY_TO_DODGE
 	sellprice = 20
 

code/modules/clothing/rogueclothes/neck.dm

@@ -366,7 +366,7 @@
 
 /obj/item/clothing/neck/roguetown/psycross/silver/necra
 	name = "amulet of Necra"
-	desc = "Where, grave, thy victory? I triumph still while the Veiled Lady abides by me."
+	desc = "Where, grave, thy victory? I triumph still while the Undermaiden abides by me."
 	icon_state = "necra"
 	resistance_flags = FIRE_PROOF