Chinsky 317cbd8438 Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	baystation12.dme

2013-05-22 16:51:41 +04: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' into bleeding-edge-freeze

2013-05-22 16:51:41 +04:00

silicon

Most mobs can emote now.

2013-05-18 18:17:28 +02:00

simple_animal

Most mobs can emote now.

2013-05-18 18:17:28 +02:00

damage_procs.dm

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

2013-01-23 00:48:07 +10:00

living_defense.dm

Proper fix for the projectile runtime.

2013-01-15 19:46:30 +01:00

living_defines.dm

-Moved all copy+pasted use of mob Move() has been moved into /mob/living/Move().

2012-12-31 08:49:46 +00:00

living.dm

Fixes Godmode for humans so that it truly is godmode. Good for bug checking. Atmos temperature difference will no longer directly apply fireloss, nor will being punched or shot in the guts damage organs. Can no longer be shocked.

2013-04-29 22:35:58 -05:00

login.dm

WIP mergefixes

2012-09-26 20:10:58 +10:00

logout.dm

Fixes SSD not being prolonged.

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

say.dm

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

2013-03-15 20:37:35 +10:00