Weapon sharpness and edge adjustments

This commit is contained in:
Yoshax
2016-05-12 16:13:41 +01:00
parent cb5d2db7b9
commit e2c66a3bf2
5 changed files with 6 additions and 8 deletions
@@ -57,6 +57,8 @@
name = "fork"
desc = "It's a fork. Sure is pointy."
icon_state = "fork"
sharp = 1
edge = 0
/obj/item/weapon/material/kitchen/utensil/fork/plastic
default_material = "plastic"
@@ -1,7 +1,7 @@
/obj/item/weapon/material/harpoon
name = "harpoon"
sharp = 1
edge = 1
edge = 0
desc = "Tharr she blows!"
icon_state = "harpoon"
item_state = "harpoon"
@@ -68,7 +68,7 @@
/obj/item/weapon/material/twohanded/update_icon()
icon_state = "[base_icon][wielded]"
item_state = icon_state
/obj/item/weapon/material/twohanded/dropped()
..()
if(wielded)
@@ -119,7 +119,7 @@
unwielded_force_divisor = 0.65 // 14 when unwielded based on above
thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass)
throw_speed = 3
edge = 1
edge = 0
sharp = 1
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
+1
View File
@@ -46,6 +46,7 @@
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 75)
attack_verb = list("stabbed")
sharp = 1t
suicide_act(mob/user)
viewers(user) << pick("<span class='danger'>\The [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</span>", \
-5
View File
@@ -1897,9 +1897,4 @@
#include "code\ZAS\Zone.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\polaris-1.dmm"
#include "maps\polaris-2.dmm"
#include "maps\polaris-3.dmm"
#include "maps\polaris-4.dmm"
#include "maps\polaris-5.dmm"
// END_INCLUDE