Shadowlight213 86cbe14d15 Conflict fixes

2016-05-19 20:42:26 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Conflict fixes

2016-05-19 20:42:26 -07:00

__HELPERS

Conflict fixes

2016-05-19 20:42:26 -07:00

__PATH_COMPATIBILITY

…

_globalvars

Conflict fixes

2016-05-19 20:42:26 -07:00

_onclick

[s] Fixes a major exploit with TK in-hand clicking. (#17760)

2016-05-18 21:59:40 -05:00

controllers

Ruin budget system (#17366)

2016-05-08 23:03:42 +10:00

datums

Fixes another wrestling permaflip (#17777)

2016-05-19 19:28:07 -05:00

game

Conflict fixes

2016-05-19 20:42:26 -07:00

js

…

modules

Conflict fixes

2016-05-19 20:42:26 -07:00

orphaned procs

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

2016-05-14 00:55:50 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

Map changing will now delay round end until it finishes

2016-05-14 12:47:00 -07:00