PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

blob

…

carbon

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-13 09:23:26 +01:00

silicon

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-13 09:23:26 +01:00

simple_animal

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-13 09:23:26 +01:00

damage_procs.dm

…

living_defense.dm

Fixes throwing miss chance using min instead of max

2015-02-14 22:12:42 -05:00

living_defines.dm

Merge remote-tracking branch 'upstream/dev' into CanTrack

2015-02-03 22:27:22 +01:00

living_powers.dm

Fixes hiding mobs being layered underneath vents

2015-02-19 01:02:32 -05:00

living.dm

Synth medical sensors now report dead/alive status.

2015-03-02 13:04:02 +01:00

login.dm

Overhauls SSD mechanic.

2014-12-27 09:16:50 -08:00

logout.dm

Fixes a comment, bleh.

2014-12-27 10:57:13 -08:00

say.dm

…