From 398256a2b878d8e4eb1de1507986fa47e80e1d71 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Tue, 31 Dec 2024 19:44:23 -0600 Subject: [PATCH] yea --- code/datums/components/melee/parry.dm | 2 +- code/game/objects/items/melee/blunt.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/components/melee/parry.dm b/code/datums/components/melee/parry.dm index 74a8b59c32ed..2b3a58fe96bd 100644 --- 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 index 64e953a24d8d..72b298336dee 100644 --- 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) . = ..()