PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-07-14 08:11:11 +02:00

..

blob

get rid of mob.see_in_dark and species.darksight

2015-07-09 19:17:04 +01:00

bot

Fixes missing assessment check.

2015-06-30 15:03:51 +02:00

carbon

Refactors spiderbots a little, cleans up some spans, updates them.

2015-07-14 06:56:52 +09:30

silicon

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

simple_animal

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

2015-07-14 08:11:11 +02:00

damage_procs.dm

…

default_language.dm

…

living_defense.dm

Merge pull request #9889 from PJB3005/bay-lights

2015-07-09 14:50:10 +01:00

living_defines.dm

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

2015-06-30 08:24:43 +02:00

living_powers.dm

…

living.dm

Refactors spiderbots a little, cleans up some spans, updates them.

2015-07-14 06:56:52 +09:30

login.dm

…

logout.dm

…

say.dm

…