Mloc-Argent 9896e44d8a Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/unsorted.dm

2014-06-12 18:56:26 +01:00

..

adminhelp.dm

Rights check instead of holder check? Sure why not.

2014-06-03 15:28:14 -05:00

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

Fixes #3230.

2013-07-22 00:18:24 +01:00

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

Mentor changes.

2014-06-01 13:51:49 -05: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

Added two ears back.

2013-08-27 22:05:27 +01:00

playsound.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

possess.dm

…

pray.dm

Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better.

2013-08-27 14:24:12 +01:00

randomverbs.dm

Mentor permissions fixes and such.

2014-06-10 19:48:41 -05:00

SDQL_2_parser.dm

SDQL and SQDL 2 from Lunacode.

2013-11-04 16:16:53 +00:00

SDQL_2.dm

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

SDQL.dm

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

striketeam_syndicate.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

striketeam.dm

Moved the CentComm channels onto their own tcomm network thing

2013-12-01 18:58:16 -05:00

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