cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

incapacitated people can't have epic fights

Browse Source
This commit is contained in:
MrMelbert
2020-06-23 22:39:00 -05:00
parent 5f2016f1da
commit 8b76c1f99a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+5
View File
@@ -752,6 +752,9 @@
attacker_controller.visible_message("<span class='notice'> [attacker] and [src] separate, ending the battle. </span>", \
"<span class='notice'> [attacker] and [src] separate, ending the battle. </span>")
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("<span class='notice'> [attacker_controller.name] seperates from [attacker], ending the battle.</span>", \
@@ -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("<span class='notice'> [opponent.name] seperates from [src], ending the battle.</span>", \
"<span class='notice'> You separate from [src], ending the battle. </span>")