alberyk 8c1d2a7cde Merge branch 'master' into final_away_maps_additions ...

# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm

2022-04-04 19:47:58 -03:00

..

antagonist

…

civilian

Merge branch 'master' into final_shuttle_touches_and_stuff

2021-12-21 16:51:40 -03:00

command

Teleport pads are now controlled directly by the teleport control computer program.

2022-03-16 15:20:58 +00:00

engineering

console stuff

2021-10-10 15:08:16 -03:00

games

console stuff

2021-10-10 15:08:16 -03:00

generic

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

medical

Merge branch 'master' into no_bluespace_fun

2022-01-29 20:56:43 -03:00

pai

…

research

console stuff

2021-10-10 15:08:16 -03:00

security

Merge branch 'master' into init_update_and_stuff

2022-03-05 17:05:46 -03:00

system

…

_program.dm

…

app_presets.dm

Removes Clown and Mime PDA presets (#13384)

2022-03-16 02:49:23 +01:00