Firecage 84e8690ec6 merge conflict fix

2015-05-31 02:45:46 +02:00

..

client defines.dm

…

client procs.dm

Merge pull request #8132 from MrStonedOne/wellthen

2015-03-05 19:02:15 +01:00

preferences_savefile.dm

Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity.

2015-04-25 18:28:29 +02:00

preferences_toggles.dm

Fixes #1190

2015-05-23 06:30:28 -03:00

preferences.dm

merge conflict fix

2015-05-31 02:45:46 +02:00