diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index abc69300c9c6..00b3ff9960b5 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -383,7 +383,7 @@ That or it's just space magic. Either way, it shrinks stuff." ammo_type = list(/obj/item/ammo_casing/energy/shrink) item_state = "shrink_ray" - icon_state = "shrink_ray" + icon_state = "alienpistol" fire_delay = 3 SECONDS selfcharge = 1//shot costs 200 energy, has a max capacity of 1000 for 5 shots. self charge returns 25 energy every couple ticks, so about 1 shot charged every 12~ seconds trigger_guard = TRIGGER_GUARD_ALLOW_ALL// variable-size trigger, get it? (abductors need this to be set so the gun is usable for them) diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 14b0b4639d19..6084e28cf4ab 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -85,13 +85,13 @@ name = "modified antique laser gun" desc = "It's somehow modified to have more firemodes." icon_state = "capgun_brazil_hos" - item_state = "hoslaser" + item_state = "hoslaserkill0" manufacturer = MANUFACTURER_SHARPLITE /obj/item/gun/energy/e_gun/hos/brazil/true desc = "This genuine antique laser gun, modified with an experimental suite of alternative firing modes based on the X-01 MultiPhase Energy Gun, is now truly one of the finest weapons in the frontier." icon_state = "capgun_hos" - item_state = "hoslaser" + item_state = "hoslaserkill0" selfcharge = 1 manufacturer = MANUFACTURER_SHARPLITE @@ -113,6 +113,8 @@ /obj/item/gun/energy/e_gun/turret name = "hybrid turret gun" desc = "A heavy hybrid energy cannon with two settings: Stun and kill. ...It doesn't seem have a trigger, seems it can only be used as a turret." + lefthand_file = GUN_LEFTHAND_ICON + righthand_file = GUN_RIGHTHAND_ICON icon_state = "turretlaser" item_state = "turretlaser" slot_flags = null @@ -132,6 +134,10 @@ desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell." icon_state = "nucgun" item_state = "nucgun" + + lefthand_file = GUN_LEFTHAND_ICON + righthand_file = GUN_RIGHTHAND_ICON + charge_delay = 5 can_charge = FALSE internal_magazine = TRUE diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index b72bdd55b5a3..44b8d4eaf8d7 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,7 +1,9 @@ /obj/item/gun/energy/laser name = "SL L-204 laser gun" desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." - + lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi' + item_state = "laser" w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=2000) ammo_type = list(/obj/item/ammo_casing/energy/lasergun) @@ -29,11 +31,11 @@ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi' mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi' icon_state = "retro" + item_state = "laser" desc = "An antiquated model of the basic lasergun, no longer used or sold by Sharplite. Nevertheless, the sheer popularity of this model makes it a somewhat common sight to this day." ammo_x_offset = 3 manufacturer = MANUFACTURER_SHARPLITE - /obj/item/gun/energy/laser/captain name = "antique laser gun" icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi' @@ -41,7 +43,7 @@ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi' mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi' icon_state = "caplaser" - item_state = null + item_state = "caplaser" desc = "This is the SL X-00, an antique laser gun, out of production for decades and well beyond anyone's capacity to recreate. All craftsmanship is of the highest quality. It is decorated with ashdrake leather and chrome. The gun menaces with spikes of energy. On the item is an image of a space station. The station is exploding." force = 10 ammo_x_offset = 3 @@ -92,7 +94,7 @@ name = "accelerator laser cannon" desc = "An advanced laser cannon that does more damage the farther away the target is." icon_state = "lasercannon" - item_state = "laser" + item_state = "lasercannon" w_class = WEIGHT_CLASS_BULKY default_ammo_type = /obj/item/stock_parts/cell/gun/large allowed_ammo_types = list( @@ -226,6 +228,7 @@ righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi' mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi' icon_state = "e10" + item_state = "gun" w_class = WEIGHT_CLASS_SMALL wield_delay = 0.2 SECONDS diff --git a/code/modules/projectiles/guns/energy/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm index cf67db9fd5ae..d32c5f13b1e6 100644 --- a/code/modules/projectiles/guns/energy/mounted.dm +++ b/code/modules/projectiles/guns/energy/mounted.dm @@ -3,6 +3,8 @@ desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots." icon = 'icons/obj/items_cyborg.dmi' icon_state = "taser" + lefthand_file = GUN_LEFTHAND_ICON + righthand_file = GUN_RIGHTHAND_ICON item_state = "armcannonstun4" force = 5 selfcharge = 1