Novacat 4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 ...

[MIRROR] Tweaked implant loadout, refactored implant detection.

2021-03-10 19:40:33 +00:00

..

antagonism

Antagonist options for new events not saving with slot?

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

general

Update 03_body.dm

2021-02-13 15:59:07 -07:00

global

Hotkeys by default

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

loadout

Merge pull request #9897 from VOREStation/upstream-merge-7963

2021-03-10 19:40:33 +00: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 hard override file and downports Vorestation changes of kin

2021-03-09 22:55:53 +01:00

_defines.dm

…

preference_setup_vr.dm

Resolve conflicts, fix compile errors

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

preference_setup.dm

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

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