From 6dee9cf65dc41b6205f66d8a148a7a0dc63efada Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 16 Jun 2014 13:26:44 -0400
Subject: [PATCH] Adds sharp and edge flags to appropriate items

Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
---
 code/defines/obj/weapon.dm                                | 4 ++++
 code/game/objects/items/weapons/dice.dm                   | 1 +
 code/game/objects/items/weapons/weaponry.dm               | 6 ++++++
 code/modules/mining/mine_items.dm                         | 1 +
 code/modules/power/lighting.dm                            | 1 +
 code/modules/projectiles/projectile/bullets.dm            | 1 +
 code/modules/projectiles/projectile/special.dm            | 3 ++-
 code/modules/research/xenoarchaeology/finds/finds_misc.dm | 3 +++
 code/modules/research/xenoarchaeology/geosample.dm        | 1 +
 9 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d8c004c3c4..353158cf90 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -472,6 +472,8 @@
 	icon_state = "hatchet"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 12.0
+	sharp = 1
+	edge = 1
 	w_class = 2.0
 	throwforce = 15.0
 	throw_speed = 4
@@ -497,6 +499,8 @@
 	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
 	force = 13.0
 	throwforce = 5.0
+	sharp = 1
+	edge = 1
 	throw_speed = 1
 	throw_range = 3
 	w_class = 4.0
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 82df54987e..72c4589343 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -5,6 +5,7 @@
 	icon_state = "d66"
 	w_class = 1
 	var/sides = 6
+	attack_verb = list("diced")
 
 /obj/item/weapon/dice/New()
 	icon_state = "[name][rand(sides)]"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 91e0cca579..d087ca28cf 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -79,6 +79,8 @@
 	slot_flags = SLOT_BELT
 	force = 2
 	throwforce = 1
+	sharp = 1
+	edge = 1
 	w_class = 3
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
@@ -99,6 +101,8 @@
 	slot_flags = SLOT_BELT
 	force = 40
 	throwforce = 10
+	sharp = 1
+	edge = 1
 	w_class = 3
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
@@ -122,6 +126,8 @@
 	slot_flags = SLOT_BELT | SLOT_BACK
 	force = 40
 	throwforce = 10
+	sharp = 1
+	edge = 1
 	w_class = 3
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 288546872c..06bde28b9a 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -190,6 +190,7 @@ proc/move_mining_shuttle()
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
 	var/drill_sound = 'sound/weapons/Genhit.ogg'
 	var/drill_verb = "picking"
+	sharp = 1
 
 	var/excavation_amount = 100
 
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 24465bc08f..928c56b10c 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -750,5 +750,6 @@
 		src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
 		status = LIGHT_BROKEN
 		force = 5
+		sharp = 1
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		update()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index c000bea5fe..cc38efa29e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -49,6 +49,7 @@
 /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
 	name = "exploding bullet"
 	damage = 20
+	embed = 0
 	edge = 1
 
 
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 70a5e9e326..f426eefb2f 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -17,7 +17,8 @@
 	icon_state= "bolter"
 	damage = 50
 	flag = "bullet"
-
+	sharp = 1
+	edge = 1
 
 	on_hit(var/atom/target, var/blocked = 0)
 		explosion(target, -1, 0, 2)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
index 874bd907a4..e3e0d96197 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
@@ -5,6 +5,9 @@
 	force = 8.0
 	throwforce = 15.0
 	icon_state = "phoronlarge"
+	sharp = 1
+	edge = 1
+
 /obj/item/weapon/shard/phoron/New()
 
 	src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall")
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index a2ea98a430..401ae13cd3 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -20,6 +20,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
 	w_class = 1
+	sharp = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/"
 	var/datum/geosample/geological_data