phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

SDQL2

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

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

adminhelp.dm

Adds basic cross server message relay system. Currently setup to relay adminhelps to the other server in the case of no admins on a server.

2016-05-02 11:53:29 -07: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

…

bluespacearty.dm

Fixes runtime when using gibself on an animal.

2016-04-29 03:57:16 +02: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

…

debug.dm

Some adjustments, following suggestions in the PR discussion.

2016-05-05 21:50:30 +02: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

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

map_template_loadverb.dm

Adds a 'measureOnly' mode to the maploader code for templates.

2016-04-18 16:04:35 -04:00

mapping.dm

Makes "Show debug verbs" toggleable

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

maprotation.dm

…

massmodvar.dm

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

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

modifyvariables.dm

View vars will now tell you if something's been previously var edited

2016-04-28 19:38:21 -04: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

No longer a datum for each player

2016-04-22 15:13:10 -03:00

possess.dm

…

pray.dm

Communications

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

randomverbs.dm

Fixes runtime when using gibself on an animal.

2016-04-29 03:57:16 +02:00

reestablish_db_connection.dm

…

tripAI.dm

…