From 57ca69c151d3751e9645647d72b7ada77a1bfded Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 22 Mar 2021 01:31:56 -0400
Subject: [PATCH] Update human.dm

---
 code/modules/mob/living/carbon/human/human.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 4b3257ab65a..b351c3d79be 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1650,12 +1650,5 @@
 
 	..()
 
-<<<<<<< HEAD
-/mob/living/carbon/human/reduce_cuff_time()
-	if(istype(gloves, /obj/item/clothing/gloves/gauntlets/rig))
-		return 2
-	return ..()
-=======
 /mob/living/carbon/human/get_mob_riding_slots()
 	return list(back, head, wear_suit)
->>>>>>> 0b5bb3f... Allows Teshari to glide in some multiz fall conditions. (#7990)