cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

No more catching two handed items with one hand

Browse Source
This commit is contained in:
dovydas12345
2018-10-27 15:48:12 +03:00
parent b60f8fa190
commit 7209b9107e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defense.dm
+14 -1
View File
@@ -2,13 +2,26 @@
if(!skipcatch)
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
if(canmove && !restrained())
if(istype(AM, /obj/item))
if(istype(AM, /obj/item/twohanded))
var/obj/item/twohanded/I = AM
if(!get_active_hand() && !get_inactive_hand())
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>")
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>")
..()
/mob/living/carbon/water_act(volume, temperature, source)