Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

antagonism

Antagonist options for new events not saving with slot?

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

general

Fixing conflicts

2020-10-05 18:10:53 -07:00

global

Swap default door sounds

2020-10-04 22:16:20 -07:00

loadout

Fixing conflicts

2020-10-05 18:10:53 -07:00

occupation

September 2020 Upstream Merge

2020-09-25 23:07:08 -07: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