ikarrus 951c8bddef Resolve Conflicts: ...

code/modules/admin/topic.dm

2014-08-22 12:58:59 -06:00

..

SDQL2

…

adminhelp.dm

…

adminjump.dm

…

adminpm.dm

…

adminsay.dm

…

atmosdebug.dm

…

BrokenInhands.dm

…

cinematic.dm

…

deadsay.dm

Updates admin nicknames, moves list to txt file

2014-08-16 19:14:17 +10:00

debug.dm

Resolved Conflicts:

2014-08-21 19:47:30 -06:00

diagnostics.dm

…

getlogs.dm

…

mapping.dm

Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab.

2014-08-15 20:24:49 -06:00

massmodvar.dm

…

modifyvariables.dm

admins can't edit their rank's powers

2014-08-07 12:00:48 -07:00

one_click_antag.dm

Resolve Conflicts:

2014-08-22 12:58:59 -06:00

onlyone.dm

…

playsound.dm

…

possess.dm

…

pray.dm

…

randomverbs.dm

Made receiving and printing centcom reports a proc

2014-08-17 13:03:11 -06:00

ticklag.dm

…

tripAI.dm

…