Merge remote-tracking branch 'upstream/master' into borg-slab-fix

code/modules/keybindings/setup.dm

@@ -5,7 +5,7 @@
 	SHOULD_NOT_SLEEP(TRUE)
 
 /datum/proc/keyLoop(client/user) // Called once every frame
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 
 // removes all the existing macros
 /client/proc/erase_all_macros()

code/modules/mob/living/life.dm

@@ -3,7 +3,7 @@
   * Splits off into PhysicalLife() and BiologicalLife(). Override those instead of this.
   */
 /mob/living/proc/Life(seconds, times_fired)
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 	if(mob_transforming)
 		return
 

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -206,7 +206,7 @@
 	icon_state = "toolbox_tiles"
 	throwforce = 10
 	created_name = "Floorbot"
-	var/toolbox = /obj/item/storage/toolbox/mechanical
+	var/toolbox = /obj/item/storage/toolbox
 
 /obj/item/bot_assembly/floorbot/Initialize()
 	. = ..()
@@ -225,7 +225,7 @@
 			name = "incomplete floorbot assembly"
 			icon_state = "toolbox_tiles_sensor"
 
-/obj/item/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
+/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
 	if(!istype(T, /obj/item/stack/tile/plasteel))
 		..()
 		return