ikarrus d3ec4dbf72 Resolving Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

2014-06-27 09:30:43 -06:00

..

SDQL2

Added world.log and log_game() to the SQDL logging.

2014-03-25 10:27:03 +00:00

adminhelp.dm

Slight edit to the output format, it now writes AFK/TOTAL and IGNORED/TOTAL as an ignored admin might also be afk, so he'd be counted twice.

2013-07-26 23:03:44 +02:00

adminjump.dm

Outright removed toggle admin jump,spawn and revive buttons

2014-01-27 16:10:19 +11:00

adminpm.dm

A bunch of bug fixes

2014-01-11 18:37:31 +00:00

adminsay.dm

Added a switch inside client/Topic which can direct the topic call to a few frequently used destinations.

2012-11-18 08:27:11 +00:00

atmosdebug.dm

…

BrokenInhands.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

cinematic.dm

…

deadsay.dm

Edited the admin names in deadsay.dm to match with current admins, currently it's reeeaaallly out of date.

2013-04-18 22:03:03 -07:00

debug.dm

Resolving Conflicts:

2014-06-27 09:30:43 -06:00

diagnostics.dm

Reload admins usable by anyone with adminrank

2014-03-08 15:46:36 +11:00

getlogs.dm

runtime logs automatically log to data/logs/runtime/YYYY-MM.txt

2013-01-04 22:16:54 +00:00

mapping.dm

Add logging to failed GC's that result in a del() call

2014-06-13 11:46:17 -07:00

massmodvar.dm

Resolves #830 - ghost_form is only selectable by members.

2013-06-24 05:35:39 +01:00

modifyvariables.dm

Resolves #830 - ghost_form is only selectable by members.

2013-06-24 05:35:39 +01:00

one_click_antag.dm

New Human Mobs will have the appearance of the client's preferences

2014-04-27 14:40:28 -06:00

onlyone.dm

Generalised ID naming

2014-04-09 18:49:59 +02:00

playsound.dm

Upgrades to the play admin midi client pref

2014-03-31 05:41:33 -07:00

possess.dm

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

pray.dm

Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950.

2013-12-13 21:14:23 +00:00

randomverbs.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

ticklag.dm

Reverts r5012

2012-11-07 23:00:38 +00:00

tripAI.dm

Moved triple-AI to the secrets panel (fun)

2012-11-12 16:38:40 +00:00