From 731cd6d2b796a08d688894a0c116882168d2a43b Mon Sep 17 00:00:00 2001
From: Mitchell <mitchs98@gmail.com>
Date: Sun, 11 Nov 2018 04:12:15 -0600
Subject: [PATCH] Removes Pulling change/Properly fixes move speed

---
 code/modules/mob/living/carbon/alien/alien.dm          |  4 ++++
 .../mob/living/carbon/alien/humanoid/humanoid.dm       |  5 -----
 code/modules/mob/living/carbon/alien/larva/larva.dm    | 10 ----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index dea7c447191..796aed2eb6b 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -132,6 +132,10 @@
 		// add some movement delay
 		move_delay_add = min(move_delay_add + round(amount / 2), 10) // a maximum delay of 10
 
+/mob/living/carbon/alien/movement_delay()
+	. = ..()
+	. += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns
+
 /mob/living/carbon/alien/getDNA()
 	return null
 
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index da47f8c80b5..ef55e21db7b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -27,11 +27,6 @@
 	add_language("Hivemind")
 	..()
 
-
-/mob/living/carbon/alien/humanoid/movement_delay()
-	. = ..()
-	. += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns
-
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)
 	if(..())
 		return 1
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 1c1d9957555..2ea6f6a092a 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -38,16 +38,6 @@
 		amount_grown = min(amount_grown + 1, max_grown)
 	..(amount)
 
-/mob/living/carbon/alien/larva/movement_delay()
-	. = 1
-
-/mob/living/carbon/alien/larva/start_pulling(var/atom/movable/AM)
-	if(stat || sleeping || paralysis || weakened)
-		return
-	if(istype(AM,/obj/item))
-		to_chat(src, "<span class='warning'>You are far too small to pull anything!</span>")
-	return
-
 /mob/living/carbon/alien/larva/ex_act(severity)
 	..()