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
This commit is contained in:
alberyk
2022-04-04 19:47:58 -03:00
100 changed files with 1824 additions and 447407 deletions
@@ -457,18 +457,6 @@
)
return _prg_list
/datum/modular_computer_app_presets/civilian/clown
name = "clown"
display_name = "Clown"
description = "Contains programs for HONK!!!"
available = TRUE
/datum/modular_computer_app_presets/civilian/mime
name = "mime"
display_name = "Mime"
description = "Contains programs for janitorial service."
available = TRUE
/datum/modular_computer_app_presets/supply
name = "supply"
display_name = "Supply"