jack-fractal 1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage ...

Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm

2014-05-13 20:45:05 -04:00

..

adminhelp.dm

Merge pull request #4912 from Ccomp5950/mentors

2014-05-07 10:00:27 +09:30

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

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

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

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07: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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -04:00

massmodvar.dm

…

modifyvariables.dm

…

one_click_antag.dm

Merge pull request #4819 from Mloc/bs12-itemorgans

2014-04-25 15:33:34 -05: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

Merge remote-tracking branch 'upstream/master' into dev

2014-05-07 17:37:29 +01: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