PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-09-15 20:31:59 +02:00

..

adminhelp.dm

…

adminjump.dm

…

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

Fixes #10217.

2015-08-09 10:52:24 +02:00

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug.dm

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

2015-09-10 03:06:27 +01:00

diagnostics.dm

…

dice.dm

…

getlogs.dm

…

icarus.dm

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

2015-08-28 11:18:57 +02:00

mapping.dm

…

massmodvar.dm

…

modifyvariables.dm

…

playsound.dm

…

possess.dm

…

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-09-15 20:31:59 +02: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

…