PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm

2015-12-13 10:47:33 +01:00

..

adminhelp.dm

…

adminjump.dm

Replaces 'in world' arguments.

2015-11-21 11:06:08 +01:00

adminpm.dm

Even comments need matching spans for Travis to pass.

2015-08-18 11:55:43 -07:00

adminsay.dm

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

2015-08-27 08:53:22 +02:00

antag-ooc.dm

…

atmosdebug.dm

…

BrokenInhands.dm

…

buildmode.dm

Build mode throws now admin logs.

2015-11-29 12:14:31 +01:00

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug.dm

Replaces 'in world' arguments.

2015-11-21 11:06:08 +01:00

diagnostics.dm

…

dice.dm

…

getlogs.dm

…

mapping.dm

Updates preset TTV bombs, adds debug verb

2015-10-09 11:18:12 -04:00

massmodvar.dm

…

modifyvariables.dm

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

playsound.dm

…

possess.dm

Replaces 'in world' arguments.

2015-11-21 11:06:08 +01:00

pray.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

randomverbs.dm

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

2015-12-13 10:47:33 +01:00

SDQL_2_parser.dm

…

SDQL_2.dm

…

SDQL.dm

…

striketeam.dm

Fixes admin or event spawned antags not spawning

2015-08-03 12:06:23 -04:00

ticklag.dm

…

tripAI.dm

…