Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

blob

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest

2013-01-31 14:26:58 -08:00

carbon

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

2013-09-02 23:32:33 +01:00

silicon

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

2013-09-02 23:32:33 +01:00

simple_animal

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

2013-09-02 23:32:33 +01:00

damage_procs.dm

With a brand new spanking BEF pull.

2013-06-14 21:24:28 -05:00

living_defense.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

living_defines.dm

A ton of preliminary work condensing say_quote and say_understands down to the basic common procs between mob types.

2013-08-16 17:46:07 -07:00

living.dm

Gas mask filters Plasma and N2O.

2013-09-01 20:51:19 +01:00

login.dm

Compile fix.

2013-06-01 21:11:41 +01:00

logout.dm

Fixes SSD not being prolonged.

2013-02-13 10:35:09 +00:00

say.dm

Added two ears back.

2013-08-27 22:05:27 +01:00