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

..

login.dm

Adds Mockingjay00's title screen.

2015-11-26 11:33:16 -05:00

logout.dm

Remove the need to map in the title screen, move title screen icons into a single file

2015-09-12 08:34:28 +01:00

new_player.dm

Two bugfixes

2017-01-17 04:11:57 -05:00

poll.dm

…

preferences_setup.dm

Messenger Bags

2016-09-14 22:34:47 -04:00

skill.dm

Replaces Station Administrator

2016-10-06 22:38:02 -04:00

sprite_accessories.dm

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

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