Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

adminhelp.dm

Updated the linkage between the NanoTrasen IRC bot and the server.

2013-07-02 23:41:40 +01: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

Private message fixes. Stealth-mode / admin != maroon

2014-01-25 22:16:58 -06:00

adminsay.dm

Made it so asay is not the same color as adminlogs.

2014-01-10 13:39:40 -08:00

atmosdebug.dm

…

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

Gave Mods dsay command and unique dsay identifier

2013-09-03 14:10:21 -07:00

debug.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

diagnostics.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01: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

ZAS debug_verb runtime prevention.

2014-02-16 13:31:56 -06: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

Made Vox uncloneable.

2013-08-27 00:12:48 -07:00

onlyone.dm

Added two ears back.

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

playsound.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01: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

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06: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

Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.

2014-01-28 15:59:50 +10:30