skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

2017-09-09 21:38:02 +03:00

..

master

Fix MC crash handling (#3222)

2017-08-04 21:24:41 +03:00

subsystems

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

configuration.dm

Adds a gamemode probability verb (#3320)

2017-08-26 08:05:20 -05:00

controller.dm

Update DMM Suite (#2711)

2017-06-15 12:41:45 +03:00

hooks-defs.dm

Adds hacking tool.

2015-11-13 21:59:56 +01:00

hooks.dm

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

verbs.dm

DEvent, Mk II (#3241)

2017-09-06 18:08:44 +02:00