From 27925774e6b017e79e63c25db965683d26aa493c Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Sun, 17 Nov 2019 02:22:48 -0800
Subject: [PATCH] applys a fix

---
 code/modules/mob/living/simple_animal/bot/construction.dm | 6 ++++--
 code/modules/mob/living/simple_animal/bot/floorbot.dm     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 6ae1a2c0..6a1cea8e 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -237,7 +237,7 @@
 	if(!istype(T, /obj/item/stack/tile/plasteel))
 		..()
 		return
-	if(!is_type_in_list(src, allowed_toolbox))
+	if(!is_type_in_list(src, allowed_toolbox) && (type != /obj/item/storage/toolbox))
 		return
 	if(contents.len >= 1)
 		to_chat(user, "<span class='warning'>They won't fit in, as there is already stuff inside!</span>")
@@ -246,6 +246,8 @@
 		var/obj/item/bot_assembly/floorbot/B = new
 		B.toolbox = type
 		switch(B.toolbox)
+			if(/obj/item/storage/toolbox)
+				B.toolbox_color = "r"
 			if(/obj/item/storage/toolbox/emergency)
 				B.toolbox_color = "r"
 			if(/obj/item/storage/toolbox/electrical)
@@ -256,7 +258,7 @@
 				B.toolbox_color = "s"
 		user.put_in_hands(B)
 		B.update_icon()
-		to_chat(user, "<span class='notice'>You add the tiles into the empty [src.name]. They protrude from the top.</span>")
+		to_chat(user, "<span class='notice'>You add the tiles into the empty [name]. They protrude from the top.</span>")
 		qdel(src)
 	else
 		to_chat(user, "<span class='warning'>You need 10 floor tiles to start building a floorbot!</span>")
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index baa864c0..c1a21b66 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -360,7 +360,7 @@
 	target = null
 
 /mob/living/simple_animal/bot/floorbot/update_icon()
-	icon_state = "[toolbox_color]floorbot-c"
+	icon_state = "[toolbox_color]floorbot[on]"
 
 
 /mob/living/simple_animal/bot/floorbot/explode()