Zuhayr 1e135f91af Merge resolution with master.

2014-06-02 12:05:12 +09:30

..

adminhelp.dm

Merge pull request #4912 from Ccomp5950/mentors

2014-05-07 10:00:27 +09:30

adminjump.dm

…

adminpm.dm

AdminPM fixes

2014-05-07 13:56:25 -05:00

adminsay.dm

Adds Mentors.

2014-05-04 23:12:06 -05:00

atmosdebug.dm

…

BrokenInhands.dm

…

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

Adds Mentors.

2014-05-04 23:12:06 -05:00

debug.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

diagnostics.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

getlogs.dm

…

mapping.dm

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

massmodvar.dm

…

modifyvariables.dm

…

one_click_antag.dm

Updates most used viable entries of t cet to Nyx

2014-05-26 15:58:16 -07:00

onlyone.dm

…

playsound.dm

…

possess.dm

…

pray.dm

…

randomverbs.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-07 17:37:29 +01:00

SDQL_2_parser.dm

…

SDQL_2.dm

…

SDQL.dm

…

striketeam_syndicate.dm

…

striketeam.dm

…

ticklag.dm

…

tripAI.dm

…

vox_raiders.dm

Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.

2014-05-10 02:10:06 +09:30