alberyk 12a70b50b7 Merge branch 'master' into updates_the_nbt ...

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm

2022-02-19 10:26:35 -03:00

..

antagonism

Revenant Fixes (#11001)

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

general

Adds more customization to robotic internal organs but it is not broken (#13068)

2022-02-06 18:07:42 -03:00

global

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

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

loadout

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

occupation

fixes people being unable to play as NT (#13064)

2022-02-02 19:35:58 +01:00

other

…

skills

Ported MAP preferences from Vore + custom preview backgrounds. (#9300)

2020-07-09 18:09:13 +03:00

_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

Ported MAP preferences from Vore + custom preview backgrounds. (#9300)

2020-07-09 18:09:13 +03:00

preferences_sql.dm

…