PsiOmegaDelta 2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm

2015-09-08 07:58:25 +02:00

..

adminhelp.dm

…

adminjump.dm

Expands admin jump permissions, cuts down on superfluous feedback.

2015-06-13 08:44:58 +02: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

Ensures only antags and admins can see AntagOOC.

2015-05-06 11:34:54 +02:00

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

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

2015-07-04 15:19:52 +02:00

debug.dm

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

2015-08-11 18:47:05 +01:00

diagnostics.dm

…

dice.dm

Admin dice

2015-05-10 10:11:07 +03:00

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

new object-based lighting system

2015-05-10 20:54:25 +01:00

modifyvariables.dm

Fixes #9219.

2015-06-15 18:29:07 +02:00

playsound.dm

…

possess.dm

…

pray.dm

Admin JMP now includes a link to EYE or BDY if any.

2015-06-10 11:08:31 +02:00

randomverbs.dm

Tweak.

2015-09-07 14:43:20 +09:30

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

…