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

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

adminhelp.dm

sanitize() refactor: first pass (sanitize)

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

adminjump.dm

Expands admin jump permissions, cuts down on superfluous feedback.

2015-06-13 08:44:58 +02:00

adminpm.dm

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

2015-06-04 08:10:49 +02:00

adminsay.dm

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

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

antag-ooc.dm

Ensures only antags and admins can see AntagOOC.

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

atmosdebug.dm

Fixes #7040.

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

BrokenInhands.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

buildmode.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

check_customitem_activity.dm

…

cinematic.dm

Modification to 'cinematic' command

2015-05-04 12:10:59 +03:00

custom_event.dm

sanitize() refactor: third pass (misc)

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

deadsay.dm

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

2015-06-14 10:35:29 +02:00

debug.dm

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

2015-06-26 20:28:47 +02:00

diagnostics.dm

Z-Level Compatibility

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

dice.dm

Admin dice

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

getlogs.dm

…

icarus.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

mapping.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

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

Play server sound verb for admins

2015-03-09 12:19:47 +03:00

possess.dm

Drops the machinery part of the singularity.

2015-04-16 12:51:02 +02:00

pray.dm

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

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

randomverbs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-05 22:13:58 +02:00

SDQL_2_parser.dm

SDQL and SQDL 2 from Lunacode.

2013-11-04 16:16:53 +00:00

SDQL_2.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

SDQL.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

striketeam.dm

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

ticklag.dm

…

tripAI.dm

…