Anewbe d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins ...

# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi

2017-01-17 22:05:38 -06:00

..

generic.dm

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

language.dm

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

monkey.dm

Readded monkey scooping.

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

outsider.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

station.dm

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

synthetic.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00