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

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Ccomp5950
2014-04-25 20:40:36 -05:00
parent 9dcea4f753 0a345ea9e0
commit 976ae06e6b
79 changed files with 1440 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/energy.dm
View File

@@ -43,7 +43,7 @@
damage = 10
damage_type = TOX
nodamage = 0
weaken = 10
agony = 40
stutter = 10