Chinsky 5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll ...

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm

2015-05-12 06:04:22 +03:00

..

client defines.dm

Staff now have a "re-admin self" button after de-admining themselves.

2015-03-05 11:05:58 -05:00

client procs.dm

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

2015-05-11 09:28:59 +02:00

preferences_factions.dm

A bit of prep work for integegrating player-set backgrounds into gameplay.

2014-08-01 22:54:57 +09:30

preferences_gear.dm

Removes CE's hardhat

2015-04-29 16:11:53 +01:00

preferences_savefile.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

preferences_spawnpoints.dm

Adds cyborg-only latejoin spawnpoint

2014-11-14 23:38:09 +00:00

preferences_toggles.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

preferences.dm

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

2015-05-12 06:04:22 +03:00