carnie 3317aa9fe3 Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2 ...

Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.

2013-08-06 09:54:24 +01:00

..

hud.dm

obj/hud is now datum/hud. There was no need for it to be an object.

2012-09-28 23:02:11 +00:00

login.dm

Merged listen_ooc, seeprayers, STFU_ghosts, STFU_radio, deadchat, sound_adminhelp, ghostears, ghostsight, canplaysound, midis, no_ambi and lobby_music into client.prefs.toggles as bitflags.

2012-11-21 05:58:04 +00:00

logout.dm

Ok, part 1 of this huge mind datum fix. I need to run over the next part again because I've made a lot inconsistencies in it. This is sort of all the misc stuff that got tidied up whilst I was trying to get my head around how everything related to eachother.

2012-08-05 15:29:15 +00:00

new_player.dm

Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2

2013-08-06 09:54:24 +01:00

poll.dm

- Added the ability to have multiple choice player polls.

2012-12-16 03:29:06 +00:00

preferences_setup.dm

Renamed variables:

2013-08-01 13:48:41 +01:00

sprite_accessories.dm

Adding lost pulls #590 #528 #574 #563 #529

2013-05-26 13:02:13 -06:00