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

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

Browse Source 
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-12 17:53:17 +10:00
parent 33e12ca9d3 29fe7720ca
commit 419247adfe
38 changed files with 4130 additions and 2856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/projectile/bullets.dm
View File

@@ -18,6 +18,9 @@
stun = 5
weaken = 5
/obj/item/projectile/bullet/midbullet2
damage = 25
/obj/item/projectile/bullet/suffocationbullet//How does this even work?
name = "co bullet"
damage = 20