Zuhayr 3f6f34c16f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi

2015-09-01 11:22:10 +09:30

..

generic.dm

Fixes #10358, #10359 and #10257

2015-08-01 23:17:27 +09:30

language.dm

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

2015-08-15 10:52:17 +02:00

monkey.dm

Readded monkey scooping.

2015-08-31 07:01:56 +09:30

outsider.dm

Merged with dev.

2015-03-31 11:17:13 +10:30

station.dm

language bug fix

2015-08-23 22:37:32 -05:00

synthetic.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00