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

-You can now sell plasma sheets for supply points. Conversion rate is 3 plasma sheets for 1 point. The rate is adjustable.

2012-12-23 01:01:25 +00:00

adminpm.dm

Fixes #5088

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

adminsay.dm

Adds Mentors.

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

atmosdebug.dm

TG: - Fixed "Check Plumbing" and added "Check Power".

2012-05-06 18:33:39 +01:00

BrokenInhands.dm

Fixed up BrokenInHands a little.

2013-05-16 13:05:23 +01:00

check_customitem_activity.dm

resolved a MySQL statement issue

2013-05-03 13:21:44 +10:00

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

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

mapping.dm

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

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

massmodvar.dm

Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.

2012-11-02 10:23:04 +00:00

modifyvariables.dm

Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.

2012-11-02 10:23:04 +00:00

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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

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

Reverts r5012

2012-11-07 23:00:38 +00:00

tripAI.dm

Moved triple-AI to the secrets panel (fun)

2012-11-12 16:38:40 +00:00

vox_raiders.dm

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

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