Skip to content

mad dog no longer perma deletes items on failed disarm #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NewyearnewmeUwu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

mad dog no longer perma deletes items on failed disarm #1119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8776848
mad dog no longer perma deletes guns on failed disarm
NewyearnewmeUwu Jun 21, 2026
be5e0a3
requested changes
NewyearnewmeUwu Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modular_doppler/martial_arts/mad_dog.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,9 @@
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))
attacker.put_in_hands(disarmed_item)
if(disarmed_item && prob(20))
if(defender.temporarilyRemoveItemFromInventory(disarmed_item))
attacker.put_in_hands(disarmed_item)
else
disarmed_item = null
defender.visible_message(
Expand Down
Loading