Merge pull request #940 from SplinterGP/master

gives X-01 and gauss rifle hand sprites, todo: take a look at the sprites and change anything needed.
This commit is contained in:
Izac Joof Forsgren
2020-08-10 23:34:08 +02:00
committed by GitHub
4 changed files with 3 additions and 2 deletions

View File

@@ -21,7 +21,7 @@
icon = 'icons/obj/gun_yw.dmi' icon = 'icons/obj/gun_yw.dmi'
icon_state = "gaussrifle" icon_state = "gaussrifle"
item_state = "gaussrifle" item_state = "gaussrifle"
item_icons = list(slot_r_hand_str = 'icons/mob/items/righthand_guns_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_guns_yw.dmi') item_icons = list(slot_r_hand_str = 'icons/mob/items/righthand_guns_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_guns_yw.dmi', slot_back_str = 'icons/mob/back_yw.dmi')
desc = "An older model of the experimental Gauss weapon series produced by Hephaestus industries. As it is unable to pass through glass, it was phased out during the mars-sol conflict due to the invention of laser carbines.Nevertheless, it still packs a punch and is easy to maintain, making it a favorite amongst sol privateers." desc = "An older model of the experimental Gauss weapon series produced by Hephaestus industries. As it is unable to pass through glass, it was phased out during the mars-sol conflict due to the invention of laser carbines.Nevertheless, it still packs a punch and is easy to maintain, making it a favorite amongst sol privateers."
force = 8 force = 8
fire_sound = 'sound/weapons/Gauss_shoot.ogg' fire_sound = 'sound/weapons/Gauss_shoot.ogg'
@@ -34,4 +34,4 @@
charge_meter = 1 charge_meter = 1
recoil = 1 recoil = 1
fire_delay = 27 //old technology fire_delay = 27 //old technology
///END OF GAUSS WEAPONRY/// ///END OF GAUSS WEAPONRY///

View File

@@ -50,6 +50,7 @@
icon_state = "x01stun" icon_state = "x01stun"
icon = 'icons/obj/gun_yw.dmi' icon = 'icons/obj/gun_yw.dmi'
item_state = null //so the human update icon uses the icon_state instead. item_state = null //so the human update icon uses the icon_state instead.
item_icons = list(slot_r_hand_str = 'icons/mob/items/righthand_guns_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_guns_yw.dmi')
fire_sound = 'sound/weapons/Taser.ogg' fire_sound = 'sound/weapons/Taser.ogg'
fire_delay = 8 // Handguns should be inferior to two-handed weapons. fire_delay = 8 // Handguns should be inferior to two-handed weapons.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB