Novacat 28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 ...

[MIRROR] Colony Director -> Site Manager

2020-08-28 13:17:58 -04:00

..

antagonism

Antagonist options for new events not saving with slot?

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

general

Fix indentation syntax error. (#7320)

2020-07-07 02:42:31 -04:00

global

Rebase onto Master for Volume Control Panel, Squash Commits

2020-08-27 19:47:38 -04:00

loadout

Merge pull request #8868 from VOREStation/upstream-merge-7571

2020-08-28 13:17:58 -04:00

occupation

Allows you to right click to lower job preference

2020-08-23 08:27:55 -04:00

skills

…

traits

Deprecate the stream operator

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

volume_sliders

Beginnings of a global volume control system

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

vore

Beginnings of a global volume control system

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

_defines.dm

…

preference_setup_vr.dm

Resolve conflicts, fix compile errors

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

preference_setup.dm

Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode

2020-05-30 14:10:54 -04:00