refactoring code to allow all living mobs to use shields.

This commit is contained in:
Ghommie
2019-11-17 06:23:12 +01:00
parent d9b24b20d1
commit b560ff8284
14 changed files with 167 additions and 157 deletions
+1 -1
View File
@@ -100,7 +100,7 @@
/obj/item/paperplane/throw_impact(atom/hit_atom)
if(iscarbon(hit_atom))
var/mob/living/carbon/C = hit_atom
if(C.can_catch_item(TRUE))
if(!get_active_held_item() && !restrained())
var/datum/action/innate/origami/origami_action = locate() in C.actions
if(origami_action?.active) //if they're a master of origami and have the ability turned on, force throwmode on so they'll automatically catch the plane.
C.throw_mode_on()