From de09a1f309d08a371a00503d6e6392d4197bf7b4 Mon Sep 17 00:00:00 2001
From: dovydas12345 <37041561+dovydas12345@users.noreply.github.com>
Date: Sat, 27 Oct 2018 20:54:31 +0300
Subject: [PATCH] Requested changes, removes fail message
---
.../mob/living/carbon/carbon_defense.dm | 35 +++++++------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 3adbb6206d9..ac2730d3e37 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,28 +1,17 @@
/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked = 0)
if(!skipcatch)
- if(in_throw_mode) //Makes sure player is in throw mode
- if(canmove && !restrained())
- if(istype(AM, /obj/item/twohanded))
- var/obj/item/twohanded/I = AM
- if(!get_active_hand() && !get_inactive_hand()) //Makes sure both hands are empty
- if(isturf(I.loc))
- put_in_active_hand(I)
- visible_message("[src] catches [I]!")
- throw_mode_off()
- return 1
- else
- visible_message("[src] fails to catch [I]!")
-
- else if(istype(AM, /obj/item))
- var/obj/item/I = AM
- if(!get_active_hand()) //Makes sure active hand is empty
- if(isturf(I.loc))
- put_in_active_hand(I)
- visible_message("[src] catches [I]!")
- throw_mode_off()
- return 1
- else
- visible_message("[src] fails to catch [I]!")
+ if(in_throw_mode && canmove && !restrained()) //Makes sure player is in throw mode
+ if(!istype(AM,/obj/item) || !isturf(AM.loc))
+ retrun FALSE
+ if(get_active_hand())
+ return FALSE
+ if(istype(AM, /obj/item/twohanded))
+ if(get_inactive_hand())
+ return FALSE
+ put_in_active_hand(AM)
+ visible_message("[src] catches [AM]!")
+ throw_mode_off()
+ return TRUE
..()
/mob/living/carbon/water_act(volume, temperature, source)