Merge pull request #10088 from mwerezak/inhand-overlays2

Ports grenade and flash in-hand sprites
This commit is contained in:
GinjaNinja32
2015-07-10 21:12:11 +01:00
7 changed files with 9 additions and 8 deletions

View File

@@ -2,9 +2,9 @@
name = "flash"
desc = "Used for blinding and being an asshole."
icon_state = "flash"
item_state = "flash"
item_state = "flashtool"
throwforce = 5
w_class = 2.0
w_class = 2
throw_speed = 4
throw_range = 10
flags = CONDUCT

View File

@@ -1,7 +1,7 @@
/obj/item/weapon/grenade/chem_grenade
name = "grenade casing"
icon_state = "chemg"
item_state = "flashbang"
item_state = "grenade"
desc = "A hand made chemical grenade."
w_class = 2.0
force = 2.0

View File

@@ -1,8 +1,8 @@
/obj/item/weapon/grenade/empgrenade
name = "classic emp grenade"
icon_state = "emp"
item_state = "emp"
origin_tech = "materials=2;magnets=3"
icon_state = "emp"
item_state = "empgrenade"
origin_tech = "materials=2;magnets=3"
prime()
..()

View File

@@ -4,7 +4,7 @@
w_class = 2.0
icon = 'icons/obj/grenade.dmi'
icon_state = "grenade"
item_state = "flashbang"
item_state = "grenade"
throw_speed = 4
throw_range = 20
flags = CONDUCT