From e94880ad6708788dcad6df3cd70ef95c2465ee5d Mon Sep 17 00:00:00 2001
From: Sam <samharries1@gmail.com>
Date: Sat, 10 Jun 2017 10:18:05 +0100
Subject: [PATCH] Fixes conflict

---
 code/game/objects/items/cardboard_cutouts.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index d815e8c262f..b076b7be43c 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -15,7 +15,7 @@
 	var/lastattacker = null
 
 /obj/item/cardboard_cutout/attack_hand(mob/living/user)
-	if(user.a_intent == I_HELP || pushed_over)
+	if(user.a_intent == INTENT_HELP || pushed_over)
 		return ..()
 	user.visible_message("<span class='warning'>[user] pushes over [src]!</span>", "<span class='danger'>You push over [src]!</span>")
 	playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
@@ -185,4 +185,4 @@
 	dir = SOUTH
 
 /obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed
-	deceptive = TRUE
\ No newline at end of file
+	deceptive = TRUE