SplinterGP 17df0f666f Merge branch 'master' into master

2020-05-05 21:02:46 -03:00

..

antagonism

Merge pull request #5828 from Cerebulon/traitorFix

2019-01-13 00:29:09 -05:00

general

Adds haemophilia too and reset button

2020-05-05 20:53:41 -03:00

global

Adds pref to toggle vchat without 60s wait for linux users (#6980)

2020-04-12 00:51:57 -04:00

loadout

Merge branch 'master' into kk-miscstuff

2020-05-04 14:20:02 +01:00

occupation

Release Update

2020-04-16 21:07:33 -04:00

skills

…

traits

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

vore

Allow wings with a secondary color

2020-03-31 22:40:48 -04:00

_defines.dm

…

preference_setup_vr.dm

Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

preference_setup.dm

Moves topic return value defines to where they are usable everywhere.

2020-04-01 20:36:00 -04:00