From aca5dd84b2569b36ecfdc412c0b9867f7fc20876 Mon Sep 17 00:00:00 2001
From: bgobandit <bgobandit@users.noreply.github.com>
Date: Sat, 24 Dec 2016 22:57:35 -0500
Subject: [PATCH] Easy fixes/tweaks. (#22348)

* Fixes a misleading message

* Fixed more bugs, did kor's shit

* Fixes holodeck  monkey message

* does the needful
---
 code/game/machinery/camera/camera.dm   | 2 +-
 code/game/mecha/mecha_wreckage.dm      | 6 ++++--
 code/game/objects/structures/mirror.dm | 4 ++++
 code/modules/holodeck/mobs.dm          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 7ac6fc20b63..b7f35cc9a66 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -154,7 +154,7 @@
 
 		else if(istype(W, /obj/item/weapon/weldingtool))
 			if(weld(W, user))
-				visible_message("<span class='warning'>[user] unwelds [src], leaving it as just a frame screwed to the wall.</span>", "<span class='warning'>You unweld [src], leaving it as just a frame screwed to the wall</span>")
+				visible_message("<span class='warning'>[user] unwelds [src], leaving it as just a frame bolted to the wall.</span>", "<span class='warning'>You unweld [src], leaving it as just a frame bolted to the wall</span>")
 				deconstruct(TRUE)
 			return
 
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index 29a5fa39737..1e453d7b14b 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -5,7 +5,7 @@
 
 /obj/structure/mecha_wreckage
 	name = "exosuit wreckage"
-	desc = "Remains of some unfortunate mecha. Completely unrepairable."
+	desc = "Remains of some unfortunate mecha. Completely unrepairable, but perhaps something can be salvaged."
 	icon = 'icons/mecha/mecha.dmi'
 	density = 1
 	anchored = 0
@@ -139,6 +139,7 @@
 	name = "\improper Reticence wreckage"
 	icon_state = "reticence-broken"
 	color = "#87878715"
+	desc = "..."
 
 /obj/structure/mecha_wreckage/ripley
 	name = "\improper Ripley wreckage"
@@ -185,6 +186,7 @@
 /obj/structure/mecha_wreckage/honker
 	name = "\improper H.O.N.K wreckage"
 	icon_state = "honker-broken"
+	desc = "All is right in the universe."
 
 /obj/structure/mecha_wreckage/honker/New()
 	..()
@@ -245,4 +247,4 @@
 		if(parts.len && prob(40))
 			var/part = pick(parts)
 			welder_salvage += part
-			parts -= part
\ No newline at end of file
+			parts -= part
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index abb87edf4e6..1b953237333 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -42,6 +42,10 @@
 
 		H.update_hair()
 
+/obj/structure/mirror/examine_status()
+	if(broken)
+		return // no message spam
+	..()
 
 /obj/structure/mirror/obj_break(damage_flag)
 	if(!broken && !(flags & NODECONSTRUCT))
diff --git a/code/modules/holodeck/mobs.dm b/code/modules/holodeck/mobs.dm
index af8b095d971..adac4ea7b2d 100644
--- a/code/modules/holodeck/mobs.dm
+++ b/code/modules/holodeck/mobs.dm
@@ -17,4 +17,4 @@
 	butcher_results = list()
 	response_help = "pets"
 	response_disarm = "pushes aside"
-	response_harm = "bites"
+	response_harm = "kicks"