From 0c33757b14cb7854c263f25ad2447a8f9458da7a Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Thu, 14 Nov 2019 18:54:57 +1300
Subject: [PATCH] Fixes a few bugs

---
 code/game/objects/items/devices/dogborg_sleeper.dm     |  5 ++---
 code/modules/mob/living/silicon/robot/robot_modules.dm | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index c6573fc76c..1a3bc283d9 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -134,7 +134,6 @@
 	var/voracious = hound ? TRUE : FALSE
 	var/list/targets = target && hound ? list(target) : contents
 	if(hound)
-		hound.setClickCooldown(50)
 		if(!hound.client || !(hound.client.prefs.cit_toggles & MEDIHOUND_SLEEPER))
 			voracious = FALSE
 		else
@@ -447,7 +446,7 @@
 	if (!target.devourable)
 		to_chat(user, "The target registers an error code. Unable to insert into [src].")
 		return
-	if(target)
+	if(patient)
 		to_chat(user,"<span class='warning'>Your [src] is already occupied.</span>")
 		return
 	if(target.buckled)
@@ -524,7 +523,7 @@
 			update_gut()
 			user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
 			playsound(hound, 'sound/effects/bin_close.ogg', 80, 1)
-			
+
 /obj/item/dogborg/sleeper/K9/flavour
 	name = "Mobile Sleeper"
 	desc = "A mounted, underslung sleeper, intended for holding willing occupants for leisurely purposes."
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index cae58c56c1..1894e88ec4 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -138,18 +138,20 @@
 
 //Adds flavoursome dogborg items to dogborg variants without mechanical benefits
 /obj/item/robot_module/proc/dogborg_equip()
+	if(istype(src, /obj/item/robot_module/k9) || istype(src, /obj/item/robot_module/medihound))
+		return //Bandaid fix to prevent stacking until I merge these two modules into their base types
 	var/obj/item/I = new /obj/item/analyzer/nose/flavour(src)
 	add_module(I,0,0)
 	I = new /obj/item/soap/tongue/flavour(src)
 	add_module(I,0,0)
 	I = new /obj/item/dogborg/sleeper/K9/flavour(src)
-	if(name == "Engineering")
+	if(istype(src, /obj/item/robot_module/engineering))
 		I.icon_state = "decompiler"
-	if(name == "Security")
+	if(istype(src, /obj/item/robot_module/security))
 		I.icon_state = "sleeperb"
-	if(name == "Medical")
+	if(istype(src, /obj/item/robot_module/medical))
 		I.icon_state = "sleeper"
-	if(name == "Service")
+	if(istype(src, /obj/item/robot_module/butler))
 		I.icon_state = "servicer"
 		if(cyborg_base_icon == "scrubpup")
 			I.icon_state = "compactor"