Nadyr a34fd9cec8 Merge branch 'master' into upstream-merge-10213

2021-04-30 01:03:17 -04:00

..

antagonism

Antagonist options for new events not saving with slot?

2020-05-21 11:09:28 -04:00

general

Update 02_language.dm

2021-04-11 06:12:20 -04:00

global

Hotkeys by default

2020-11-19 21:48:52 -07:00

loadout

Merge branch 'master' into upstream-merge-10213

2021-04-30 01:03:17 -04:00

occupation

Merge pull request #9852 from Heroman3003/whitelisted-job-limit

2021-03-05 14:49:52 +00:00

skills

…

traits

Update trait_defines.dm

2021-02-27 14:55:02 -08:00

volume_sliders

Beginnings of a global volume control system

2020-08-21 04:42:47 -04:00

vore

Update 07_traits.dm

2021-04-11 06:13:12 -04:00

_defines.dm

…

preference_setup_vr.dm

…

preference_setup.dm

Merge pull request #9867 from VOREStation/upstream-merge-7928

2021-03-09 22:59:48 +00:00