From 87768483c1bb8ef1a7849295a0675db449b12082 Mon Sep 17 00:00:00 2001 From: Asbestos Gremlin <70115628+NewyearnewmeUwu@users.noreply.github.com> Date: Sun, 21 Jun 2026 12:06:45 -0700 Subject: [PATCH 1/2] mad dog no longer perma deletes guns on failed disarm --- modular_doppler/martial_arts/mad_dog.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_doppler/martial_arts/mad_dog.dm b/modular_doppler/martial_arts/mad_dog.dm index 87c8baeaf0177e..c381824af350a5 100644 --- a/modular_doppler/martial_arts/mad_dog.dm +++ b/modular_doppler/martial_arts/mad_dog.dm @@ -237,7 +237,8 @@ attacker.do_attack_animation(defender, ATTACK_EFFECT_DISARM) if(defender.stat == CONSCIOUS && !defender.IsParalyzed() && attacker.combat_mode) var/obj/item/disarmed_item = defender.get_active_held_item() - if(disarmed_item && defender.temporarilyRemoveItemFromInventory(disarmed_item) && prob(20)) + if(disarmed_item && prob(20)) + defender.temporarilyRemoveItemFromInventory(disarmed_item) attacker.put_in_hands(disarmed_item) else disarmed_item = null From be5e0a3af1d5855b334363819e18cae8ac728631 Mon Sep 17 00:00:00 2001 From: Asbestos Gremlin <70115628+NewyearnewmeUwu@users.noreply.github.com> Date: Mon, 29 Jun 2026 11:58:06 -0700 Subject: [PATCH 2/2] requested changes --- modular_doppler/martial_arts/mad_dog.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_doppler/martial_arts/mad_dog.dm b/modular_doppler/martial_arts/mad_dog.dm index c381824af350a5..5d0795afa22780 100644 --- a/modular_doppler/martial_arts/mad_dog.dm +++ b/modular_doppler/martial_arts/mad_dog.dm @@ -238,8 +238,8 @@ if(defender.stat == CONSCIOUS && !defender.IsParalyzed() && attacker.combat_mode) var/obj/item/disarmed_item = defender.get_active_held_item() if(disarmed_item && prob(20)) - defender.temporarilyRemoveItemFromInventory(disarmed_item) - attacker.put_in_hands(disarmed_item) + if(defender.temporarilyRemoveItemFromInventory(disarmed_item)) + attacker.put_in_hands(disarmed_item) else disarmed_item = null defender.visible_message(