Chinsky 7a66e7e524 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm

2013-01-22 23:46:42 +04: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

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10: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 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

poll.dm

- Added the ability to have multiple choice player polls.

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

preferences_setup.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

skill.dm

"Space Law" on the wiki is always capitalized, so now it should be in-game too.

2012-07-31 04:45:07 -04:00

sprite_accessories.dm

Furry delight, more facial hairs and hairstyles for space cats.

2013-01-22 21:52:40 +04:00