yea

shiptest-ss13 · Jan 1, 2025 · 398256a · 398256a
1 parent 91dd36c
commit 398256a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/code/datums/components/melee/parry.dm b/code/datums/components/melee/parry.dm
@@ -134,7 +134,7 @@
 	playsound(owner, sound_to_play, clamp(stamina_damage, 40, 120))
 	//Riposte!
 	if(riposte != -1)
-		source.balloon_alert(owner, "Riposte!")
+		source.balloon_alert(owner, "riposte!")
 		owner.changeNext_move(riposte)
 
 	if(GLOB.Debug2)

diff --git a/code/game/objects/items/melee/blunt.dm b/code/game/objects/items/melee/blunt.dm
@@ -19,7 +19,9 @@
 	desc = "spikey."
 	sharpness = IS_SHARP
 
-/obj/item/gun/ballistic/automatic/pistol/disposable/buster
+/obj/item/gun/ballistic/automatic/buster
+	has_safety = FALSE
+	safety = FALSE
 	default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/dual/lethal
 	allowed_ammo_types = list(
 		/obj/item/ammo_box/magazine/internal/shot/dual/lethal,
@@ -32,7 +34,7 @@
 
 /obj/item/melee/brass_knuckles/busters/Initialize()
 	. = ..()
-	stored_gun = new /obj/item/gun/ballistic/automatic/pistol/disposable/buster()
+	stored_gun = new /obj/item/gun/ballistic/automatic/buster()
 
 /obj/item/melee/brass_knuckles/busters/attack(mob/living/M, mob/living/user)
 	. = ..()