From 58f6c961e436b4ccc795435f335e9c43c47d0811 Mon Sep 17 00:00:00 2001
From: CosmicScientist <brettdavies1995@gmail.com>
Date: Thu, 8 Oct 2015 22:45:09 +0100
Subject: [PATCH] Cigs, urinals, infrared lasers, oh my!

---
 code/game/objects/items/weapons/cigs_lighters.dm | 2 +-
 code/game/objects/structures/watercloset.dm      | 2 +-
 code/modules/assembly/infrared.dm                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 6deabe3a49d..06f19e368bf 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		new /obj/effect/decal/cleanable/ash(location)
 		if(ismob(loc))
 			var/mob/living/M = loc
-			M << "<span class='notice'>Your [name] goes out, and you empty the ash.</span>"
+			M << "<span class='notice'>Your [name] goes out.</span>"
 			lit = 0
 			icon_state = icon_off
 			item_state = icon_off
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 1daf245f01b..630064e5884 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -122,7 +122,7 @@
 			var/mob/living/GM = G.affecting
 			if(G.state >= GRAB_AGGRESSIVE)
 				if(GM.loc != get_turf(src))
-					user << "<span class='notice'>[GM.name] needs to on [src].</span>"
+					user << "<span class='notice'>[GM.name] needs to be on [src].</span>"
 					return
 				user.visible_message("<span class='danger'>[user] slams [GM] into [src]!</span>", "<span class='notice'>You slam [GM] into [src]!</span>")
 				GM.adjustBruteLoss(8)
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 2c0972ebd24..8b3fd683db2 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -159,7 +159,7 @@
 /***************************IBeam*********************************/
 
 /obj/effect/beam/i_beam
-	name = "i beam"
+	name = "infrared beam"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "ibeam"
 	var/obj/effect/beam/i_beam/next = null