From bd397ff844baeaf692826b965d7ee11f38c7b432 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 16 Aug 2014 21:18:46 -0400 Subject: [PATCH] Adjusts laser cannon damage Increased laser cannon damage to be higher than regular laser damage. Also updated the name var of /laser/captain so that it doesn't inherit "laser carbine" --- code/modules/projectiles/guns/energy/laser.dm | 3 ++- code/modules/projectiles/projectile/beams.dm | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 0b177c672f..29cd912074 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -16,12 +16,13 @@ clumsy_check = 0 obj/item/weapon/gun/energy/laser/retro - name ="retro laser" + name = "retro laser" icon_state = "retro" desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." /obj/item/weapon/gun/energy/laser/captain + name = "antique laser gun" icon_state = "caplaser" desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding." force = 10 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 9b1df5c30a..84c9347ed0 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -93,7 +93,7 @@ var/list/beam_master = list() /obj/item/projectile/beam/heavylaser name = "heavy laser" icon_state = "heavylaser" - damage = 40 + damage = 60 /obj/item/projectile/beam/xray name = "xray beam" @@ -106,11 +106,6 @@ var/list/beam_master = list() damage = 50 -/obj/item/projectile/beam/deathlaser - name = "death laser" - icon_state = "heavylaser" - damage = 60 - /obj/item/projectile/beam/emitter name = "emitter beam" icon_state = "emitter"