Merge branch 'master' into computer_tweaks

# Conflicts:
#	code/game/jobs/job/ship_crew.dm
This commit is contained in:
alberyk
2021-10-10 13:18:14 -03:00
229 changed files with 3237 additions and 502 deletions
@@ -7,6 +7,7 @@
icon_state = "tablet"
icon_state_unpowered = "tablet"
icon_state_menu = "menu"
overlay_state = "electronic"
slot_flags = SLOT_ID | SLOT_BELT
can_reset = TRUE
hardware_flag = PROGRAM_TABLET