alberyk 805ffc2f85 Merge branch 'master' into computer_tweaks ...

# Conflicts:
#	code/game/jobs/job/ship_crew.dm

2021-10-10 13:18:14 -03:00

..

antagonism

Revenant Fixes (#11001)

2021-01-17 11:17:27 +02:00

general

Fixes gradient type transfering between species in char setup (#12356)

2021-08-23 14:11:42 +02:00

global

Revert "Adds a preference to toggle Goonchat off." (#12270)

2021-08-03 00:57:43 +02:00

loadout

Merge branch 'master' into computer_tweaks

2021-10-10 13:18:14 -03:00

occupation

Categorized latejoin menu and made it into VueUI, improved crew manifest logic and made Verb manifest same as VueUI program, Job fixes (#10470)

2020-11-12 17:08:31 +01:00

other

…

skills

…

_defines.dm

Adds buttons to hide loadout/job equipment in the character preview (#9998)

2020-09-18 12:48:29 -03:00

preference_setup.dm

…

preferences_sql.dm

…