Kyep 4e44253af3 fixes merge conflict, updates to master

2020-09-15 00:31:56 -07:00

..

area

Merge pull request #13751 from Fox-McCloud/alarm-overhaul

2020-09-14 13:54:06 +01:00

dna

implaments faster for loop logic

2020-09-02 10:22:45 -05:00

gamemodes

affected review tweaks

2020-09-14 11:38:17 -05:00

jobs

Re-import accesslist (this commit will be rebased out)

2020-09-04 20:53:54 -07:00

machinery

fixes merge conflict, updates to master

2020-09-15 00:31:56 -07:00

magic

Makes all global variables handled by the GLOB controller (#13152)

2020-03-20 21:56:37 -06:00

mecha

Merge pull request #14195 from Qwertytoforty/Return-of-the-speed-limit

2020-09-06 10:11:58 +01:00

objects

fixes merge conflict, updates to master

2020-09-15 00:31:56 -07:00

turfs

Merge pull request #13751 from Fox-McCloud/alarm-overhaul

2020-09-14 13:54:06 +01:00

verbs

Merge pull request #14134 from Deelite34/Night-mode-tweak-2

2020-08-25 12:58:02 +01:00

alternate_appearance.dm

…

atoms_movable.dm

Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor

2020-08-27 20:08:35 +01:00

atoms.dm

resolve conflicts

2020-06-29 15:20:03 +01:00

data_huds.dm

Bumps to DreamChecker 1.4

2020-06-20 10:51:26 +01:00

shuttle_engines.dm

File standardisation (#13131)

2020-03-17 18:08:51 -04:00

sound.dm

Port Baystruments PR from tgstation

2020-07-17 15:18:17 +02:00

world.dm

Add auto-reconnect chat feature on server reboot

2020-09-06 13:47:28 +02:00