Merge branch 'incremental_tg' r5600 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/flamethrower.dmi'
 	icon_state = "flamethrowerbase"
 	item_state = "flamethrower_0"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames.
 	force = 3.0
 	throwforce = 10.0
 	throw_speed = 1
@@ -60,6 +60,13 @@
 		item_state = "flamethrower_0"
 	return
 
+/obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag)
+	// Make sure our user is still holding us
+	if(user && user.get_active_hand() == src)
+		var/turf/target_turf = get_turf(target)
+		if(target_turf)
+			var/turflist = getline(user, target_turf)
+			flame_turf(turflist)
 
 /obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob)
 	if(user.stat || user.restrained() || user.lying)	return

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

@@ -13,7 +13,6 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
-	pressure_resistance = 70
 
 /obj/item/weapon/a_gift/New()
 	..()

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

@@ -1,186 +0,0 @@
-/obj/item/weapon/implant/nanoaug
-	name = "nanoaug"
-	desc = "A nano-robotic biological augmentation implant."
-	var/augmentation
-	var/augment_text = "You feel strange..."
-	var/activation_emote = "fart"
-
-	get_data()
-		var/dat = {"
-<b>Implant Specifications:</b><BR>
-<b>Name:</b> Cybersun Industries Nano-Robotic Biological Augmentation Suite<BR>
-<b>Life:</b> Infinite. WARNING: Biological changes are irreversable.<BR>
-<b>Important Notes:</b> <font color='red'>Illegal</font>. Subjects exposed to nanorobotic agent are considered dangerous.<BR>
-<HR>
-<b>Implant Details:</b><BR>
-<b>Function:</b> Implant contains colony of pre-programmed nanorobots. Subject will experience radical changes in their body, amplifying and improving certain bodily characteristics.<BR>
-<b>Special Features:</b> Will grant subject superhuman powers.<BR>
-<b>Integrity:</b> Nanoaugmentation is permanent. Once the process is complete, the nanorobots disassemble and are dissolved by the blood stream."}
-		return dat
-
-
-	implanted(mob/M)
-		if(!istype(M, /mob/living/carbon/human))	return 0
-		M.augmentations.Add(augmentation) // give them the mutation
-		M << "\blue [augment_text]"
-
-		return 1
-
-
-/obj/item/weapon/implant/nanoaug/strength
-	name = "Superhuman Strength"
-	augmentation = SUPRSTR
-	augment_text = "You muscle ache, and you feel a rapid surge of energy pulse through your body. You feel strong."
-
-/obj/item/weapon/implant/nanoaug/radar
-	name = "Short-range Psionic Radar"
-	augmentation = RADAR
-	augment_text = "You begin to sense the presence or lack of presence of others around you."
-
-	implanted(mob/M)
-		if(..())
-			M << "<font color='#FF0000'>Red</font color> blips on the map are Security."
-			M << "White blips are civlians."
-			M << "<font color='#3E710B'>Monochrome Green</font color> blips are cyborgs and AIs."
-			M << "<font color='#238989'>Light blue</font color> blips are heads of staff."
-			M << "<font color='#663366'>Purple</font color> blips are unidentified organisms."
-			M << "Dead biologicals will not display on the radar."
-			spawn()
-				var/mob/living/carbon/human/H = M
-				H.start_radar()
-			return 1
-		return 0
-
-/obj/item/weapon/implant/nanoaug/electrichands
-	name = "Electric Hands"
-	augmentation = ELECTRICHANDS
-	augment_text = "You feel a sudden jolt of electricity pulse through your veins. Arcs of electricity travel through your hands."
-
-/obj/item/weapon/implant/nanoaug/eswordsynth
-	name = "Energy Blade Synthesizer"
-	augmentation = ESWORDSYNTH
-	augment_text = "Your hands throb and pulsate. They feel sharper, and strangely hot."
-
-	implanted(mob/M)
-		if(..())
-			activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
-			M.mind.store_memory("Freedom nanoaugmentation can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
-			M << "The nanoaugmentation implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
-			return 1
-		return 0
-
-	trigger(emote, source as mob)
-		if(emote == activation_emote)
-			src.activate(source)
-		return
-
-	activate(var/mob/source)
-
-		var/obj/item/weapon/melee/energy/blade/swordspawn = new /obj/item/weapon/melee/energy/blade
-		if(!source.get_active_hand())
-			source.put_in_hands(swordspawn)
-
-		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
-		spark_system.set_up(5, 0, source.loc)
-		spark_system.start()
-		playsound(source.loc, "sparks", 50, 1)
-		..()
-
-/obj/item/weapon/implant/nanoaug/rebreather
-	name = "Bioelectric Rebreather"
-	augmentation = REBREATHER
-	augment_text = "You begin to lose your breath. Just as you are about to pass out, you suddenly lose the urge to breath. Breathing is no longer a necessity for you."
-
-/obj/item/weapon/implant/nanoaug/dermalarmor
-	name = "Skin-intergrated Dermal Armor"
-	augmentation = DERMALARMOR
-	augment_text = "The skin throughout your body grows tense and tight, and you become slightly stiff. Your bones and skin feel a lot stronger."
-
-/obj/item/weapon/implant/nanoaug/reflexes
-	name = "Combat Reflexes"
-	augmentation = REFLEXES
-	augment_text = "Your mind suddenly is able to identify threats before you are aware of them. You become more aware of your surroundings."
-
-/obj/item/weapon/implant/nanoaug/nanoregen
-	name = "Regenerative Nanobots"
-	augmentation = NANOREGEN
-	augment_text = "You feel a very faint vibration in your body. You instantly feel much younger."
-
-
-/obj/item/weapon/implanter/nanoaug
-	name = "Nanoaugmentation Implanter (Empty)"
-	icon_state = "nanoimplant"
-
-/obj/item/weapon/implanter/nanoaug/update()
-	if (src.imp)
-		src.icon_state = "nanoimplant"
-	else
-		src.icon_state = "nanoimplant0"
-	return
-
-
-/obj/item/weapon/implanter/nanoaug/strength
-	name = "Nanoaugmentation Implaner (Superhuman Strength)"
-
-/obj/item/weapon/implanter/nanoaug/strength/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/strength( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/radar
-	name = "Nanoaugmentation Implaner (Short-range Psionic Radar)"
-
-/obj/item/weapon/implanter/nanoaug/radar/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/radar( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/electrichands
-	name = "Nanoaugmentation Implaner (Electric Hands)"
-
-/obj/item/weapon/implanter/nanoaug/electrichands/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/electrichands( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/eswordsynth
-	name = "Nanoaugmentation Implaner (Energy Blade Synthesizer)"
-
-/obj/item/weapon/implanter/nanoaug/eswordsynth/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/eswordsynth( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/rebreather
-	name = "Nanoaugmentation Implaner (Bioelectric Rebreather)"
-
-/obj/item/weapon/implanter/nanoaug/rebreather/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/rebreather( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/dermalarmor
-	name = "Nanoaugmentation Implaner (Skin-intergrated Dermal Armor)"
-
-/obj/item/weapon/implanter/nanoaug/dermalarmor/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/dermalarmor( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/reflexes
-	name = "Nanoaugmentation Implaner (Combat Reflexes)"
-
-/obj/item/weapon/implanter/nanoaug/reflexes/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/reflexes( src )
-	..()
-	update()
-
-/obj/item/weapon/implanter/nanoaug/nanoregen
-	name = "Nanoaugmentation Implaner (Regenerative Nanobots)"
-
-/obj/item/weapon/implanter/nanoaug/nanoregen/New()
-	src.imp = new /obj/item/weapon/implant/nanoaug/nanoregen( src )
-	..()
-	update()
-
-

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

@@ -34,12 +34,7 @@
 			src.add_fingerprint(user)
 			update()
 		else
-			if (user.contents.Find(src))
-				spawn( 0 )
-					src.attack_self(user)
-					return
-			else
-				return ..()
+			return ..()
 		return
 
 

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

@@ -82,9 +82,9 @@
 	throwforce = 10.0
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
 		return (BRUTELOSS)
 
 /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
@@ -114,9 +114,9 @@
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
 		return (BRUTELOSS)
 
 /obj/item/weapon/kitchenknife/ritual

code/game/objects/items/weapons/melee/energy.dm

@@ -2,8 +2,8 @@
 	var/active = 0
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>", \
-							"\red <b>[user] is falling on the [src]! It looks like \he's trying to commit suicide.</b>")
+		viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>", \
+							"\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>")
 		return (BRUTELOSS|FIRELOSS)
 
 /obj/item/weapon/melee/energy/axe
@@ -20,7 +20,7 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] swings the [src] towards /his head! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</b>"
 		return (BRUTELOSS|FIRELOSS)
 
 /obj/item/weapon/melee/energy/sword

code/game/objects/items/weapons/melee/misc.dm

@@ -12,5 +12,5 @@
 	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return (OXYLOSS)

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

@@ -11,7 +11,6 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = 3.0
-	pressure_resistance = 80
 	var/charge = 0	// note %age conveted to actual charge in New
 	var/maxcharge = 1000
 	m_amt = 700
@@ -22,7 +21,7 @@
 	var/construction_time=100
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is licking the electrodes of the [src]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return (FIRELOSS)
 
 /obj/item/weapon/cell/crap

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

@@ -69,12 +69,22 @@
 		user <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
 		return
 
-	var/attempt = 0
+	if(user && user.buckled)
+		user.buckled.unbuckle()
+
+	var/list/tempL = L
+	var/attempt = null
 	var/success = 0
-	while(!success)
-		success = user.Move(pick(L))
-		if(attempt > 20) break	//Failsafe
+	while(tempL.len)
+		attempt = pick(tempL)
+		success = user.Move(attempt)
+		if(!success)
+			tempL.Remove(attempt)
+		else
+			break
+
 	if(!success)
 		user.loc = pick(L)
+
 	smoke.start()
 	src.uses -= 1

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -1,8 +1,8 @@
 /obj/item/weapon/storage/box/syndicate/
 	New()
 		..()
-		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))
-			if ("bloodyspai")
+		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1)))
+			if("bloodyspai")
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/clothing/mask/gas/voice(src)
 				new /obj/item/weapon/card/id/syndicate(src)
@@ -10,12 +10,13 @@
 				return
 
 			if ("stealth")
+			if("stealth")
 				new /obj/item/weapon/gun/energy/crossbow(src)
 				new /obj/item/weapon/pen/paralysis(src)
 				new /obj/item/device/chameleon(src)
 				return
 
-			if ("screwed")
+			if("screwed")
 				new /obj/effect/spawner/newbomb/timer/syndicate(src)
 				new /obj/effect/spawner/newbomb/timer/syndicate(src)
 				new /obj/item/device/powersink(src)
@@ -23,14 +24,14 @@
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
 				return
 
-			if ("guns")
+			if("guns")
 				new /obj/item/weapon/gun/projectile(src)
 				new /obj/item/ammo_magazine/a357(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/weapon/plastique(src)
 				return
 
-			if ("murder")
+			if("murder")
 				new /obj/item/weapon/melee/energy/sword(src)
 				new /obj/item/clothing/glasses/thermal/syndi(src)
 				new /obj/item/weapon/card/emag(src)
@@ -44,19 +45,29 @@
 				U.imp = new /obj/item/weapon/implant/uplink(U)
 				return
 
-			if ("hacker")
+			if("hacker")
 				new /obj/item/weapon/aiModule/syndicate(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/device/encryptionkey/binary(src)
 				return
 
-			if ("lordsingulo")
+			if("lordsingulo")
 				new /obj/item/device/radio/beacon/syndicate(src)
 				new /obj/item/clothing/suit/space/syndicate(src)
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
 				new /obj/item/weapon/card/emag(src)
 				return
 
+			if("smoothoperator")
+				new /obj/item/weapon/gun/projectile/pistol(src)
+				new /obj/item/weapon/silencer(src)
+				new /obj/item/weapon/soap/syndie(src)
+				new /obj/item/weapon/storage/bag/trash(src)
+				new /obj/item/bodybag(src)
+				new /obj/item/clothing/under/suit_jacket(src)
+				new /obj/item/clothing/shoes/laceup(src)
+				return
+
 /obj/item/weapon/storage/box/syndie_kit
 	name = "Box"
 	desc = "A sleek, sturdy box"

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

@@ -15,7 +15,7 @@
 	origin_tech = "combat=2"
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is putting the live [src] in \his mouth! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide.</b>"
 		return (FIRELOSS)
 
 /obj/item/weapon/melee/baton/update_icon()
@@ -60,7 +60,7 @@
 
 	if(user.a_intent == "hurt")
 		if(!..()) return
-		H.apply_effect(5, WEAKEN, 0)
+		//H.apply_effect(5, WEAKEN, 0)
 		H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
 		playsound(src.loc, "swing_hit", 50, 1, -1)
 	else if(!status)

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

@@ -365,8 +365,8 @@ LOOK FOR SURGERY.DM*/
 	attack_verb = list("drilled")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("/red <b>[user] is pressing the [src] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
-							"/red <b>[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
+		viewers(user) << pick("/red <b>[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
+							"/red <b>[user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
 		return (BRUTELOSS)
 
 /*
@@ -389,9 +389,9 @@ LOOK FOR SURGERY.DM*/
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
 		return (BRUTELOSS)
 
 /*
@@ -492,7 +492,7 @@ LOOK FOR SURGERY.DM*/
 				if(istype(M, /mob/living/carbon/slime))
 					if(M.stat == 2)
 						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [M.name] is having its silky inndards cut apart with [src] by [user].", 1)
+							O.show_message("\red [M.name] is having its silky innards cut apart with [src] by [user].", 1)
 						M << "\red [user] begins to cut apart your innards with [src]!"
 						user << "\red You cut [M]'s silky innards apart with [src]!"
 						M:brain_op_stage = 2.0

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

@@ -49,8 +49,8 @@
 	attack_verb = list("stabbed")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is stabbing the [src] into \his temple! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is stabbing the [src] into \his heart! It looks like \he's trying to commit suicide.</b>")
+		viewers(user) << pick("\red <b>[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.</b>")
 		return(BRUTELOSS)
 
 /obj/item/weapon/screwdriver/New()

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

@@ -12,7 +12,7 @@
 	attack_verb = list("banned")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is hitting \himself with the [src]! It looks like \he's trying to ban \himself from life.</b>"
+		viewers(user) << "\red <b>[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.</b>"
 		return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
 
 /obj/item/weapon/nullrod
@@ -29,7 +29,7 @@
 	w_class = 1
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return (BRUTELOSS|FIRELOSS)
 
 /obj/item/weapon/sord
@@ -45,7 +45,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -68,7 +68,7 @@
 		return 1
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is falling on the [src]! It looks like \he's trying to commit suicide.</b>"
+		viewers(user) << "\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -88,7 +88,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>"
+		viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>"
 		return(BRUTELOSS)
 
 /obj/item/weapon/katana/IsShield()