duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

SDQL2

Adds lag checks to massedit, sdql2, del-all, and the map loader

2016-03-15 03:39:42 -07:00

adminhelp.dm

Revert "Adds mentorhelp"

2016-03-25 01:48:27 -03:00

adminjump.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor

2016-02-04 14:34:45 +01:00

adminpm.dm

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

adminsay.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

atmosdebug.dm

Removes in world

2015-10-09 22:37:53 -05:00

bluespacearty.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

BrokenInhands.dm

…

buildmode.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

cinematic.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

deadsay.dm

Changes asay and dsay logging so they are seperate logging types.

2015-11-03 20:07:55 -08:00

debug.dm

Adds lag checks to massedit, sdql2, del-all, and the map loader

2016-03-15 03:39:42 -07:00

diagnostics.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

fps.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

getlogs.dm

removes unnecessary file()

2016-01-27 22:18:38 +11:00

machine_upgrade.dm

…

manipulate_organs.dm

Adds subtypesof(). It's shorthand for typesof(path) - path.

2015-11-16 18:55:57 -05:00

map_template_loadverb.dm

Fixes uploaded templates.

2016-02-26 17:41:30 +01:00

mapping.dm

Makes "Show debug verbs" toggleable

2016-02-02 01:34:53 -02:00

maprotation.dm

choosen -> chosen

2015-10-06 21:50:19 -07:00

massmodvar.dm

Adds lag checks to massedit, sdql2, del-all, and the map loader

2016-03-15 03:39:42 -07:00

modifyvariables.dm

Neatens some things up

2016-03-27 22:05:58 +01:00

one_click_antag.dm

Human fixes

2016-03-15 12:29:35 -05:00

onlyone.dm

Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"

2016-01-07 23:15:35 -03:00

panicbunker.dm

…

playsound.dm

Adds volume control for admin sounds.

2016-03-24 21:19:51 -07:00

possess.dm

…

pray.dm

Communications

2016-03-09 22:42:03 -06:00

randomverbs.dm

Now works with gangs too (provided the gang was created BEFORE antaghud was turned on)

2016-03-05 15:00:29 -05:00

reestablish_db_connection.dm

…

tripAI.dm

…