Cael_Aislinn 419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport ...

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>

2012-10-12 17:53:17 +10:00

..

ammunition

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

guns

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

2012-10-05 22:21:26 +10:00

projectile

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

2012-10-12 17:53:17 +10:00

ammunition.dm

…

gun.dm

Hulks can't use guns. Hopefully this encourages them to actually go around punching things instead of having their magic stun immunity shield while playing normally.

2012-09-11 03:43:30 +00:00

projectile.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00