TheGreatKitsune 6f1d71eb04 Add updates from master to resolve merge conflicts...

2022-03-21 10:31:12 -05:00

..

antagonism

Merge pull request #11874 from Heroman3003/moreroleprefs

2021-12-08 22:49:16 +00:00

general

Merge pull request #12358 from BonniePandora/PDA-clamshell+more

2022-03-02 18:14:44 +00:00

global

powder that makes you say yes

2021-09-26 20:37:00 -04:00

loadout

powder that makes you say yes

2022-03-20 18:57:54 -04:00

occupation

Non crew role added

2022-03-20 12:28:10 -05:00

skills

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

traits

…

volume_sliders

The One Where I Port Modals

2021-06-30 19:29:34 +00:00

vore

Merge pull request #11944 from Heroman3003/nifnerf

2022-01-09 01:50:59 +00:00

_defines.dm

…

preference_setup_vr.dm

…

preference_setup.dm

[MIRROR] Linter Introduction + Cleanup

2021-05-27 16:31:50 +00:00