Nadyr 1d004e4bb8 Merge branch 'master' into upstream-merge-13038

2022-06-04 20:23:28 -04: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

Merge pull request #13030 from ItsSelis/selis-byond-ui

2022-06-04 16:30:29 +00:00

loadout

Makes new pAI obtainable

2022-06-04 20:03:22 +00:00

occupation

[MIRROR] By-species age restrictions

2021-10-25 00:37:49 +00:00

skills

The One Where I Port Modals

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

traits

Update trait_defines.dm

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

volume_sliders

The One Where I Port Modals

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

vore

Merge pull request #12763 from KillianKirilenko/kk-feedback

2022-04-17 21:40:01 +00:00

_defines.dm

…

preference_setup_vr.dm

…

preference_setup.dm

[MIRROR] Linter Introduction + Cleanup

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