diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 78884826f7..78cd9c39e7 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -140,6 +140,11 @@
 	slot_flags = SLOT_BELT
 	default_material = "plasteel" //VOREStation Edit
 
+/obj/item/weapon/material/knife/machete/cyborg
+	name = "integrated machete"
+	desc = "A sharp machete often found attached to robots."
+	unbreakable = TRUE
+
 /obj/item/weapon/material/knife/tacknife/survival
 	name = "survival knife"
 	desc = "A hunting grade survival knife."
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index f171bc397a..5f7dae3a0f 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -80,7 +80,7 @@
 /datum/robot_component/armour/platform
 	name = "platform armour plating"
 	external_type = /obj/item/robot_parts/robot_component/armour_platform
-	max_damage = 180
+	max_damage = 140
 
 // ACTUATOR
 // Enables movement.
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
index 1b656bf9a6..79279af6dd 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
@@ -19,7 +19,6 @@
 	icon = 'icons/mob/robots_thinktank.dmi'
 	icon_state = "tachi"
 	color = "#68a2f2"
-	speed = -1 // They're meant to be viable for transport, so can't be slower than a human.
 
 	cell =        /obj/item/weapon/cell/mech
 	idcard_type = /obj/item/weapon/card/id/platform
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
index 029660d8c1..cfb7b2dd81 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
@@ -56,7 +56,7 @@
 	var/deathtimeseconds = round((deathtime - deathtimeminutes * 1 MINUTE) / 10,1)
 	if (deathtime < platform_respawn_time)
 		to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.")
-		to_chat(usr, "You must wait [platform_respawn_time/600] minute\s to respawn as a drone!")
+		to_chat(usr, "You must wait [platform_respawn_time/600] minute\s to take control of \the [src]!")
 		return
 	// End boilerplate.
 
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
index 26ee97156c..2a8ffcb3e1 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
@@ -50,9 +50,11 @@
 /obj/item/weapon/robot_module/robot/platform/explorer/New()
 	..()
 	modules += new /obj/item/weapon/tool/wrench/cyborg(src)
+	modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src)
+	modules += new /obj/item/weapon/tool/wirecutters/cyborg(src)
 	modules += new /obj/item/weapon/tool/screwdriver/cyborg(src)
 	modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
-	modules += new /obj/item/weapon/chainsaw(src)
+	modules += new /obj/item/weapon/material/knife/machete/cyborg(src)
 
 	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(7500)
 	var/obj/item/stack/medical/bruise_pack/bandaid = new(src)
@@ -65,10 +67,7 @@
 	var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) 
 	modules += phasegun
 
-	var/obj/item/weapon/gun/energy/laser/mounted/pew = new(src)
-	pew.name = "overvolted phase carbine"
-	pew.appearance = phasegun
-	emag = pew
+	emag = new /obj/item/weapon/chainsaw(src)
 
 /obj/item/weapon/robot_module/robot/platform/explorer/respawn_consumable(var/mob/living/silicon/robot/R, rate)
 	. = ..()
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
index 816b540cc8..ec6d6f4267 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
@@ -118,7 +118,7 @@
 	else
 		to_chat(src, SPAN_WARNING("You have nothing in your cargo compartment."))
 
-/mob/living/silicon/robot/platform/MouseDrop_T(atom/movable/dropping, mob/user)
+/mob/living/silicon/robot/platform/MouseDrop_T(atom/movable/dropping, mob/living/user)
 	if(!istype(user) || !istype(dropping) || user.incapacitated())
 		return FALSE
 	if(!can_mouse_drop(dropping, user) || !can_store_atom(dropping, user))