mwerezak 9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-03-31 00:16:56 -04:00

..

adminhelp.dm

sanitize() refactor: first pass (sanitize)

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

adminjump.dm

…

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

…

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

sanitize() refactor: third pass (misc)

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

diagnostics.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

getlogs.dm

…

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

…

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

…

SDQL.dm

…

striketeam.dm

sanitize() refactor: first pass (sanitize)

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

ticklag.dm

…

tripAI.dm

…