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

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +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

Fixes #5088

2014-06-17 20:35:48 +01:00

adminsay.dm

…

atmosdebug.dm

…

BrokenInhands.dm

…

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug.dm

…

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

…

playsound.dm

Replaces get_turf_loc() with get_turf()

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

possess.dm

…

pray.dm

…

randomverbs.dm

Mentor permissions fixes and such.

2014-06-10 19:48:41 -05: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