Timothy Teakettle eba1e8f301 fixes the merge conflicts

2020-06-15 23:29:49 +01:00

..

area

Merge pull request #12175 from Detective-Google/snaxi2

2020-06-02 23:48:50 +02:00

gamemodes

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

machinery

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

mecha

Merge remote-tracking branch 'citadel/master' into combat_rework

2020-06-02 21:49:43 -07:00

objects

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

turfs

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

alternate_appearance.dm

…

atoms_movable.dm

Fixing some issues with floating movetype & co. (#12262)

2020-05-18 04:44:19 -07:00

atoms_movement.dm

Merge branch 'master' into Ghommie-cit721

2020-05-07 18:18:54 +02:00

atoms.dm

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

communications.dm

…

data_huds.dm

…

say.dm

Porting "Refactors language holder"

2020-05-08 22:44:02 +02:00

shuttle_engines.dm

…

sound.dm

…

world.dm

Merge pull request #12313 from kevinz000/click_logs

2020-05-23 20:21:45 +00:00