cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6024 from mwerezak/laser

Browse Source 
Adjusts laser cannon damage
This commit is contained in:
Zuhayr
2014-08-18 09:29:27 +09:30
parent 2a6a312dbe bd397ff844
commit 6679434713
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -22,6 +22,7 @@ obj/item/weapon/gun/energy/laser/retro
/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

7
code/modules/projectiles/projectile/beams.dm
View File

@@ -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"