Weapon, pickaxe and shield resprite (and a bunch of other stuff) (#6776)

this resprites some weapons,

namely the butterfly knife and switchblade to not be comically oversized
(you know, they're...concealable.)
tweaks some other sprites too, like the handles of polearms and the stunbaton
this doesn't change how they look from afar, they're practically the same in glance value
riot shield taken from Eris (and tactical shield is a modified version of that)
made ebarrier use same colors as eshield (this makes more sense, honestly)
This commit is contained in:
alsoandanswer
2019-08-24 15:20:31 +03:00
committed by Erki
parent 0502e85b00
commit d875dcfc3b
22 changed files with 71 additions and 18 deletions
@@ -1,7 +1,7 @@
/obj/item/weapon/material/butterflyconstruction
name = "unfinished concealed knife"
desc = "An unfinished concealed knife, it looks like the screws need to be tightened."
icon = 'icons/obj/buildingobject.dmi'
icon = 'icons/obj/weapons_build.dmi'
icon_state = "butterflystep1"
force_divisor = 0.1
thrown_force_divisor = 0.1
@@ -16,7 +16,7 @@
/obj/item/weapon/material/butterflyblade
name = "knife blade"
desc = "A knife blade. Unusable as a weapon without a grip."
icon = 'icons/obj/buildingobject.dmi'
icon = 'icons/obj/weapons_build.dmi'
icon_state = "butterfly2"
force_divisor = 0.1
thrown_force_divisor = 0.1
@@ -24,7 +24,7 @@
/obj/item/weapon/material/butterflyhandle
name = "concealed knife grip"
desc = "A plasteel grip with screw fittings for a blade."
icon = 'icons/obj/buildingobject.dmi'
icon = 'icons/obj/weapons_build.dmi'
icon_state = "butterfly1"
force_divisor = 0.1
thrown_force_divisor = 0.1
@@ -74,6 +74,7 @@
/obj/item/weapon/material/shaft
name = "shaft"
desc = "A large stick, you could probably attach something to it."
icon = 'icons/obj/weapons_build.dmi'
icon_state = "shaft"
item_state = "rods"
force = 5
@@ -103,6 +104,7 @@
/obj/item/weapon/material/spearhead
name = "spearhead"
desc = "A pointy spearhead, not really useful without a shaft."
icon = 'icons/obj/weapons_build.dmi'
icon_state = "spearhead"
force = 5
throwforce = 5
@@ -149,7 +151,7 @@
/obj/item/woodcirclet
name = "wood circlet"
desc = "A small wood circlet for making a flower crown."
icon = 'icons/obj/buildingobject.dmi'
icon = 'icons/obj/weapons_build.dmi'
icon_state = "woodcirclet"
item_state = "woodcirclet"
w_class = ITEMSIZE_SMALL