cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea

Browse Source 
Conflicts:
	maps/tgstation2.dmm
This commit is contained in:
Chinsky
2014-08-16 06:29:55 +04:00
parent 03cdfaf896 68fc5d91c6
commit 1de0e2cb44
4 changed files with 153 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/laser.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/energy/laser
name = "laser gun"
name = "laser carbine"
desc = "a basic weapon designed kill with concentrated energy bolts"
icon_state = "laser"
item_state = "laser"