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

Merged
00-Steven merged 3 commits into from
Jul 15, 2026
+6 −5
Merged

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

Changes from all commits
Commits
Show all changes
3 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
a33bceb
fixed?
NewyearnewmeUwu Jul 11, 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
11 changes: 6 additions & 5 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 @@ -236,11 +236,12 @@

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)
else
disarmed_item = null
var/obj/item/disarmed_item = null
var/obj/item/item_to_disarm = defender.get_active_held_item()
if(item_to_disarm && prob(20))
if(defender.temporarilyRemoveItemFromInventory(item_to_disarm))
attacker.put_in_hands(item_to_disarm)
disarmed_item = item_to_disarm
defender.visible_message(
span_danger("[attacker] strikes [defender]'s jaw with their hand[disarmed_item ? ", disarming [defender.p_them()] of [disarmed_item]" : ""]!"),
span_userdanger("[attacker] strikes your jaw,[disarmed_item ? " disarming you of [disarmed_item] and" : ""] leaving you disoriented!"),
Expand Down
Loading