MMMiracles 40227ab0cf conflicts??

2016-01-29 20:17:49 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Renames appearance flag defines.

2016-01-24 23:26:14 -06:00

__HELPERS

Merge pull request #14963 from neersighted/flat

2016-01-29 21:23:11 +03:00

__PATH_COMPATIBILITY

…

_globalvars

…

_onclick

Merge pull request #14989 from ChangelingRain/holoclarity

2016-01-29 20:20:25 +03:00

ATMOSPHERICS

Allow tgui input() to be 0, fix SMES components

2016-01-28 07:10:37 -06:00

controllers

Merge pull request #14698 from Firecage/absolutepathsandifs

2016-01-29 03:15:12 +03:00

datums

Merge pull request #15003 from MrStonedOne/patch-140

2016-01-29 19:36:37 -03:00

game

Merge pull request #15009 from MrStonedOne/patch-141

2016-01-29 21:59:46 -03:00

js

…

LINDA

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

modules

conflicts??

2016-01-29 20:17:49 -05:00

orphaned procs

…

_compile_options.dm

Min compiler version is now 509, Weapon hit indicators and Progress bars no longer colour/rotate/match the alpha of the atoms they are attached to.

2016-01-24 23:22:12 -06:00

hub.dm

…

world.dm

…