diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 751542dc327..fc5ad29d195 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -168,7 +168,7 @@
var/armed = 0
suicide_act(mob/user)
- viewers(user) << "\red [user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide."
return (BRUTELOSS)
/obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 9b57d5847a6..cb2310f3dd3 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -235,7 +235,6 @@
* Glass shards - TODO: Move this into code/game/object/item/weapons
*/
/obj/item/weapon/shard/Bump()
-
spawn( 0 )
if (prob(20))
src.force = 15
@@ -245,6 +244,25 @@
return
return
+/obj/item/weapon/shard
+ name = "shard"
+ desc = "A nasty looking shard of glass."
+ icon = 'icons/obj/shards.dmi'
+ icon_state = "large"
+ w_class = 1.0
+ force = 5.0
+ throwforce = 15.0
+ item_state = "shard-glass"
+ g_amt = 3750
+ attack_verb = list("stabbed", "slashed", "sliced", "cut")
+
+ suicide_act(mob/user)
+ viewers(user) << pick("[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \
+ "[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.")
+ return (BRUTELOSS)
+
+
+
/obj/item/weapon/shard/New()
src.icon_state = pick("large", "medium", "small")
@@ -463,4 +481,4 @@
src.use(2)
else
return 1
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index c8c96078b81..cda1ff18659 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -400,7 +400,7 @@
var/colourName = "red" //for updateIcon purposes
suicide_act(mob/user)
- viewers(user) << "\red [user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide."
return (BRUTELOSS|OXYLOSS)
/*
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 8ad169c4778..014793357e9 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -21,7 +21,7 @@
/obj/item/weapon/plastique/suicide_act(var/mob/user)
. = (BRUTELOSS)
- viewers(user) << "\red [user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!"
+ viewers(user) << "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!"
var/message_say = "FOR NO RAISIN!"
if(user.mind)
if(user.mind.special_role)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index d9755549dd1..ce72857494d 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -116,9 +116,9 @@
throwforce = 10.0
suicide_act(mob/user)
- viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \
- "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \
- "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")
+ viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \
+ "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \
+ "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")
return (BRUTELOSS)
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
@@ -164,9 +164,9 @@
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user)
- viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \
- "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \
- "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")
+ viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \
+ "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \
+ "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")
return (BRUTELOSS)
/obj/item/weapon/kitchenknife/ritual
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 0d46aa3a342..f18d7b00227 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -1,10 +1,11 @@
/obj/item/weapon/melee/energy
var/active = 0
- suicide_act(mob/user)
- viewers(user) << pick("\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \
- "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")
- return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/melee/energy/suicide_act(mob/user)
+ viewers(user) << pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \
+ "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")
+ return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/axe
name = "energy axe"
@@ -19,8 +20,9 @@
origin_tech = "combat=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
- suicide_act(mob/user)
- viewers(user) << "\red [user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide."
+
+/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
+ viewers(user) << "[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide."
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/sword
@@ -53,4 +55,4 @@
w_class = 4.0//So you can't hide it in your pocket or some such.
flags = FPRINT | TABLEPASS | NOSHIELD
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- var/datum/effect/effect/system/spark_spread/spark_system
\ No newline at end of file
+ var/datum/effect/effect/system/spark_spread/spark_system
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 9502352979b..9ce1885e814 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -11,8 +11,9 @@
origin_tech = "combat=4"
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
- suicide_act(mob/user)
- viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide."
+
+/obj/item/weapon/melee/chainofcommand/suicide_act(mob/user)
+ viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide."
return (OXYLOSS)
/obj/item/weapon/melee/icepick
@@ -23,4 +24,4 @@
force = 15
throwforce = 10
w_class = 2
- attack_verb = list("stabbed", "jabbed", "iced,")
\ No newline at end of file
+ attack_verb = list("stabbed", "jabbed", "iced,")
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 0f0ea000ca2..c49350a01bf 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -21,7 +21,7 @@
var/construction_time=100
suicide_act(mob/user)
- viewers(user) << "\red [user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide."
return (FIRELOSS)
/obj/item/weapon/cell/crap
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 6b894973c48..9e3e7b211d0 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -17,7 +17,7 @@
origin_tech = "combat=2"
suicide_act(mob/user)
- viewers(user) << "\red [user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide."
return (FIRELOSS)
/obj/item/weapon/melee/baton/loaded/New()
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 071bdbea9af..df76e4154d7 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -50,8 +50,8 @@
attack_verb = list("stabbed")
suicide_act(mob/user)
- viewers(user) << pick("\red [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \
- "\red [user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")
+ viewers(user) << pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \
+ "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")
return(BRUTELOSS)
/obj/item/weapon/screwdriver/New()
@@ -490,4 +490,4 @@
attack_self(mob/user as mob)
open = !open
user << "\blue You [open?"open" : "close"] the conversion kit."
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index a80a0ce63ed..0b83600f6a2 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -11,8 +11,9 @@
throw_range = 15
attack_verb = list("banned")
- suicide_act(mob/user)
- viewers(user) << "\red [user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life."
+
+/obj/item/weapon/banhammer/suicide_act(mob/user)
+ viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life."
return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
/obj/item/weapon/nullrod
@@ -29,7 +30,7 @@
w_class = 1
suicide_act(mob/user)
- viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod.
@@ -81,7 +82,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user)
- viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
return(BRUTELOSS)
/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -104,7 +105,7 @@
return 1
suicide_act(mob/user)
- viewers(user) << "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide."
return(BRUTELOSS)
/obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -124,7 +125,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user)
- viewers(user) << "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku."
+ viewers(user) << "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku."
return(BRUTELOSS)
/obj/item/weapon/katana/IsShield()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 12ed4b939a1..fbe97530edd 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -214,9 +214,9 @@
suicide_act(mob/user)
if(locate(/obj/structure/stool) in user.loc)
- viewers(user) << "\red [user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide."
else
- viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide."
+ viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide."
return(OXYLOSS)
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index fda3fb64e25..bd8bd4f2c31 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -1,69 +1,70 @@
-client/script = {""}
+client/script = {""}