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

..

master

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

subsystems

Merge branch 'master' into updates_the_nbt

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

configuration.dm

Startup Runtime Fix (#12922)

2022-01-22 23:52:32 +01:00

controller.dm

Suspending different subsystems during explosion (#7760)

2019-12-24 18:03:18 +01:00

hooks-defs.dm

Odin Ghost Role Update (#10220)

2020-10-12 23:06:36 +02:00

hooks.dm

…

verbs.dm

Fixes evac shuttles being called as transfer shuttles, fixes shuttle arrive time announcement. (#12876)

2021-12-30 22:10:05 +01:00