From 8b76c1f99a49fc98c6ae2d2474aa94abf3acdb34 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Tue, 23 Jun 2020 22:39:00 -0500 Subject: [PATCH] incapacitated people can't have epic fights --- code/game/objects/items/toys.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5f224076e59..94fd458d497 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -752,6 +752,9 @@ attacker_controller.visible_message(" [attacker] and [src] separate, ending the battle. ", \ " [attacker] and [src] separate, ending the battle. ") break + //dead men tell no tales, incapacitated men fight no fights + if(attacker_controller.incapacitated()) + break //if the attacker_controller isn't next to the attacking toy (and doesn't have telekinesis), the battle ends if((!in_range(attacker, attacker_controller) && !(attacker_controller.dna.check_mutation(TK)))) attacker_controller.visible_message(" [attacker_controller.name] seperates from [attacker], ending the battle.", \ @@ -759,6 +762,8 @@ break //if it's PVP and the opponent is not next to the defending(src) toy (and doesn't have telekinesis), the battle ends if(opponent) + if(opponent.incapacitated()) + break if(!in_range(src, opponent) && !(opponent.dna.check_mutation(TK))) opponent.visible_message(" [opponent.name] seperates from [src], ending the battle.", \ " You separate from [src], ending the battle. ")