From 5cf0a9e67f54c0ab108cc05d68d66fdca9ac6c44 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 8 Jun 2019 17:30:50 -0700
Subject: [PATCH 1/2] Update carbon_defense.dm

---
 code/modules/mob/living/carbon/carbon_defense.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 36e2365d6b..e96bb7f121 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -277,7 +277,7 @@
 			M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You give [H] a pat on the head to make [p_them()] feel better!</span>")
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "headpat", /datum/mood_event/headpat)
-			if(M.has_trait(TRAIT_FRIENDLY))
+			if(HAS_TRAIT(M, TRAIT_FRIENDLY))
 				GET_COMPONENT_FROM(mood, /datum/component/mood, M)
 				if (mood.sanity >= SANITY_GREAT)
 					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
@@ -312,7 +312,7 @@
 			M.visible_message("<span class='notice'>[M] hugs [src] to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You hug [src] to make [p_them()] feel better!</span>")
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug)
-			if(M.has_trait(TRAIT_FRIENDLY))
+			if(HAS_TRAIT(M, TRAIT_FRIENDLY))
 				GET_COMPONENT_FROM(mood, /datum/component/mood, M)
 				if (mood.sanity >= SANITY_GREAT)
 					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)