cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 20:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
This commit is contained in:
Chinsky
2012-11-13 04:02:26 +04:00
parent 94b54d1cef daac550822
commit 8e60315b11
87 changed files with 12326 additions and 11674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
/obj/item/weapon/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
projectile_type = "/obj/item/projectile/practice"
projectile_type = "/obj/item/projectile/beam/practice"
clumsy_check = 0
obj/item/weapon/gun/energy/laser/retro