Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

client defines.dm

Added a configuration option that allows putting the .rsc on external servers.

2013-06-11 21:28:59 +02:00

client procs.dm

Made the telesci console a proper NanoUI

2013-11-13 08:01:00 -05:00

preferences_savefile.dm

Made always random name respect gender

2013-07-27 10:09:58 +02:00

preferences_toggles.dm

Added a deadchat toggle for all players.

2013-07-27 22:54:30 -04:00

preferences.dm

Full Eye and Robot Organ Implementation

2013-11-14 13:08:29 -05:00