mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

2015-03-31 01:37:55 -04:00

..

adminhelp.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03: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

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

adminsay.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

antag-ooc.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

atmosdebug.dm

Fixes #7040.

2014-11-17 12:27:29 +01:00

BrokenInhands.dm

Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file

2015-03-29 01:52:26 -04:00

buildmode.dm

Add middle mouse button action for buildmode

2015-03-15 22:22:25 +02:00

check_customitem_activity.dm

resolved a MySQL statement issue

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

cinematic.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

custom_event.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

deadsay.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

debug.dm

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

2015-03-31 01:37:55 -04:00

diagnostics.dm

Z-Level Compatibility

2014-10-30 14:29:56 +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

icarus.dm

Icarus cannon admin logs.

2015-02-20 19:54:15 +01:00

mapping.dm

Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names.

2014-11-03 12:51:01 +01:00

massmodvar.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

modifyvariables.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

playsound.dm

Play server sound verb for admins

2015-03-09 12:19:47 +03: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

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

randomverbs.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

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.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03: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