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.
This commit is contained in:
mwerezak
2014-06-16 13:26:44 -04:00
parent 45c2274b0a
commit 6dee9cf65d
9 changed files with 20 additions and 1 deletions

View File

@@ -472,6 +472,8 @@
icon_state = "hatchet" icon_state = "hatchet"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS | CONDUCT
force = 12.0 force = 12.0
sharp = 1
edge = 1
w_class = 2.0 w_class = 2.0
throwforce = 15.0 throwforce = 15.0
throw_speed = 4 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." desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
force = 13.0 force = 13.0
throwforce = 5.0 throwforce = 5.0
sharp = 1
edge = 1
throw_speed = 1 throw_speed = 1
throw_range = 3 throw_range = 3
w_class = 4.0 w_class = 4.0

View File

@@ -5,6 +5,7 @@
icon_state = "d66" icon_state = "d66"
w_class = 1 w_class = 1
var/sides = 6 var/sides = 6
attack_verb = list("diced")
/obj/item/weapon/dice/New() /obj/item/weapon/dice/New()
icon_state = "[name][rand(sides)]" icon_state = "[name][rand(sides)]"

View File

@@ -79,6 +79,8 @@
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 2 force = 2
throwforce = 1 throwforce = 1
sharp = 1
edge = 1
w_class = 3 w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -99,6 +101,8 @@
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 40 force = 40
throwforce = 10 throwforce = 10
sharp = 1
edge = 1
w_class = 3 w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -122,6 +126,8 @@
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
force = 40 force = 40
throwforce = 10 throwforce = 10
sharp = 1
edge = 1
w_class = 3 w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

View File

@@ -190,6 +190,7 @@ proc/move_mining_shuttle()
attack_verb = list("hit", "pierced", "sliced", "attacked") attack_verb = list("hit", "pierced", "sliced", "attacked")
var/drill_sound = 'sound/weapons/Genhit.ogg' var/drill_sound = 'sound/weapons/Genhit.ogg'
var/drill_verb = "picking" var/drill_verb = "picking"
sharp = 1
var/excavation_amount = 100 var/excavation_amount = 100

View File

@@ -750,5 +750,6 @@
src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.") src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
status = LIGHT_BROKEN status = LIGHT_BROKEN
force = 5 force = 5
sharp = 1
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
update() update()

View File

@@ -49,6 +49,7 @@
/obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
name = "exploding bullet" name = "exploding bullet"
damage = 20 damage = 20
embed = 0
edge = 1 edge = 1

View File

@@ -17,7 +17,8 @@
icon_state= "bolter" icon_state= "bolter"
damage = 50 damage = 50
flag = "bullet" flag = "bullet"
sharp = 1
edge = 1
on_hit(var/atom/target, var/blocked = 0) on_hit(var/atom/target, var/blocked = 0)
explosion(target, -1, 0, 2) explosion(target, -1, 0, 2)

View File

@@ -5,6 +5,9 @@
force = 8.0 force = 8.0
throwforce = 15.0 throwforce = 15.0
icon_state = "phoronlarge" icon_state = "phoronlarge"
sharp = 1
edge = 1
/obj/item/weapon/shard/phoron/New() /obj/item/weapon/shard/phoron/New()
src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall") src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall")

View File

@@ -20,6 +20,7 @@
icon = 'icons/obj/xenoarchaeology.dmi' icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "sliver1" //0-4 icon_state = "sliver1" //0-4
w_class = 1 w_class = 1
sharp = 1
//item_state = "electronic" //item_state = "electronic"
var/source_rock = "/turf/simulated/mineral/" var/source_rock = "/turf/simulated/mineral/"
var/datum/geosample/geological_data var/datum/geosample/geological_data