Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm

2015-08-21 16:15:07 +03:00

..

blob

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

bot

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs

2015-08-18 12:06:53 -07:00

carbon

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

silicon

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs

2015-08-18 12:06:53 -07:00

simple_animal

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

damage_procs.dm

…

default_language.dm

…

life.dm

Merge pull request #10026 from Zuhayr/dronehats

2015-08-13 17:49:03 +03:00

living_defense.dm

Moves flags values to item_flags var

2015-08-18 17:18:25 -04: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

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

login.dm

Aghosted mobs no longer act as SSD

2015-08-14 22:41:51 -04:00

logout.dm

Aghosted mobs no longer act as SSD

2015-08-14 22:41:51 -04:00

say.dm

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

2015-08-17 09:44:21 +02:00