cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

No more failed message, when they aren't trying to catch it

Browse Source
This commit is contained in:
dovydas12345
2018-10-27 16:01:24 +03:00
committed by GitHub
parent 7209b9107e
commit 1bd51e6daa
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defense.dm
+11 -10
View File
@@ -1,10 +1,10 @@
/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked = 0)
if(!skipcatch)
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
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())
if(!get_active_hand() && !get_inactive_hand()) //Makes sure both hands are empty
if(isturf(I.loc))
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
@@ -14,14 +14,15 @@
visible_message("<span class='warning'>[src] fails to catch [I]!</span>")
else if(istype(AM, /obj/item))
var/obj/item/I = AM
if(isturf(I.loc))
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
throw_mode_off()
return 1
else
visible_message("<span class='warning'>[src] fails to catch [I]!</span>")
if(!get_active_hand()) //Makes sure active hand is empty
var/obj/item/I = AM
if(isturf(I.loc))
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
throw_mode_off()
return 1
else
visible_message("<span class='warning'>[src] fails to catch [I]!</span>")
..()
/mob/living/carbon/water_act(volume, temperature, source)