From 0f126d2e542c2143bca2f35a3a0fb6761aa5ff1b Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Sun, 1 Feb 2015 14:13:51 +1030
Subject: [PATCH] Minor Entered() refactoring.

---
 code/game/turfs/simulated.dm                 | 34 +++++++-------------
 code/modules/clothing/clothing.dm            |  3 ++
 code/modules/clothing/shoes/miscellaneous.dm | 10 ++++++
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 84ec0adecb..ae5d68582d 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -41,30 +41,21 @@
 
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
-			if(istype(H.shoes, /obj/item/clothing/shoes/clown_shoes))
-				var/obj/item/clothing/shoes/clown_shoes/O = H.shoes
-				if(H.m_intent == "run")
-					if(O.footstep >= 2)
-						O.footstep = 0
-						playsound(src, "clownstep", 50, 1) // this will get annoying very fast.
-					else
-						O.footstep++
-				else
-					playsound(src, "clownstep", 20, 1)
-
 			// Tracking blood
 			var/list/bloodDNA = null
 			var/bloodcolor=""
 			if(H.shoes)
 				var/obj/item/clothing/shoes/S = H.shoes
-				if(S.track_blood && S.blood_DNA)
-					bloodDNA = S.blood_DNA
-					bloodcolor=S.blood_color
-					S.track_blood--
+				if(istype(S))
+					S.handle_movement(src,(H.m_intent == "run" ? 1 : 0))
+					if(S.track_blood && S.blood_DNA)
+						bloodDNA = S.blood_DNA
+						bloodcolor=S.blood_color
+						S.track_blood--
 			else
 				if(H.track_blood && H.feet_blood_DNA)
 					bloodDNA = H.feet_blood_DNA
-					bloodcolor=H.feet_blood_color
+					bloodcolor = H.feet_blood_color
 					H.track_blood--
 
 			if (bloodDNA)
@@ -75,14 +66,11 @@
 
 				bloodDNA = null
 
-		var/noslip = 0
-		for (var/obj/structure/stool/bed/chair/C in loc)
-			if (C.buckled_mob == M)
-				noslip = 1
-		if((wet == 1 && M.m_intent == "walk") || noslip)
-			return // no slipping while sitting in a chair, plz
-
 		if(src.wet)
+
+			if(M.buckled || (src.wet == 1 && M.m_intent == "walk"))
+				return
+
 			var/slip_dist = 1
 			var/slip_stun = 6
 			var/floor_type = "wet"
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f6dc6cc337..6741fdb780 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -360,6 +360,9 @@ BLIND     // can't see anything
 	species_restricted = list("exclude","Unathi","Tajara")
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/shoes.dmi')
 
+/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running)
+	return
+
 /obj/item/clothing/shoes/update_clothing_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index e52b2fce8c..38b252b1ff 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -71,6 +71,16 @@
 	var/footstep = 1	//used for squeeks whilst walking
 	species_restricted = null
 
+/obj/item/clothing/shoes/clown_shoes/handle_movement(var/turf/walking, var/running)
+	if(running)
+		if(footstep >= 2)
+			footstep = 0
+			playsound(src, "clownstep", 50, 1) // this will get annoying very fast.
+		else
+			footstep++
+	else
+		playsound(src, "clownstep", 20, 1)
+
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
 	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."