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

…

adminjump.dm

…

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

…

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

diagnostics.dm

…

getlogs.dm

…

mapping.dm

ZAS debug_verb runtime prevention.

2014-02-16 13:31:56 -06:00

massmodvar.dm

…

modifyvariables.dm

…

one_click_antag.dm

…

onlyone.dm

…

playsound.dm

…

possess.dm

…

pray.dm

…

randomverbs.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

SDQL_2_parser.dm

…

SDQL_2.dm

…

SDQL.dm

…

striketeam_syndicate.dm

…

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

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