Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	maps/tgstation.2.0.8.dmm

code/game/objects/items/weapons/cigs_lighters.dm

@@ -406,7 +406,7 @@ ZIPPO
 	var/lit = 0
 
 /obj/item/weapon/lighter/zippo
-	name = "Zippo lighter"
+	name = "\improper Zippo lighter"
 	desc = "The zippo."
 	icon_state = "zippo"
 	item_state = "zippo"

code/game/objects/items/weapons/explosives.dm

@@ -28,6 +28,8 @@
 			message_admins("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).")
 			log_attack("<font color='red'> [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])</font>")
 		target.overlays += image('assemblies.dmi', "plastic-explosive2")
+		log_admin("[user] ([user.ckey]) has planted a [src].")
+		message_admins("[user] ([user.ckey]) planted a [src].")
 		user << "Bomb has been planted. Timer counting down from [timer]."
 		spawn(timer*10)
 			if(target)

code/game/objects/items/weapons/implants/implanter.dm

@@ -66,7 +66,7 @@
 
 
 /obj/item/weapon/implanter/explosive
-	name = "implanter-explosive"
+	name = "implanter (E)"
 
 /obj/item/weapon/implanter/explosive/New()
 	imp = new /obj/item/weapon/implant/explosive( src )
@@ -75,7 +75,7 @@
 	return
 
 /obj/item/weapon/implanter/compressed
-	name = "implanter-compressed"
+	name = "implanter (C)"
 	icon_state = "cimplanter0"
 
 /obj/item/weapon/implanter/compressed/New()

code/game/objects/items/weapons/syndie.dm

@@ -9,8 +9,8 @@
 /obj/item/weapon/syndie/c4explosive
 	icon_state = "c-4small_0"
 	item_state = "c-4small"
-	name = "mysterious package"
-	desc = "A mysterious package."
+	name = "normal-sized package"
+	desc = "A small wrapped package."
 	w_class = 3
 
 	var/power = 1  /*Size of the explosion.*/
@@ -27,9 +27,9 @@
 	var/K = rand(1,2000)
 	K = md5(num2text(K)+name)
 	K = copytext(K,1,7)
-	src.desc += "\n You see [K] engraved on \the [src]"
+	src.desc += "\n You see [K] engraved on \the [src]."
 	var/obj/item/weapon/syndie/c4detonator/detonator = new(src.loc)
-	detonator.desc += "\n You see [K] engraved on \the [src]"
+	detonator.desc += "\n You see [K] engraved on the lighter."
 	detonator.bomb = src
 
 /obj/item/weapon/syndie/c4explosive/proc/detonate()
@@ -53,8 +53,8 @@
 /obj/item/weapon/syndie/c4detonator
 	icon_state = "c-4detonator_0"
 	item_state = "c-4detonator"
-	name = "lighter"  /*Sneaky, thanks Dreyfus.*/
-	desc = "A disposable lighter, it's quite heavy."
+	name = "\improper Zippo lighter"  /*Sneaky, thanks Dreyfus.*/
+	desc = "The zippo."
 	w_class = 1
 
 	var/obj/item/weapon/syndie/c4explosive/bomb