PsiOmega bd885164f1 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents ...

Conflicts:
	code/global.dm

2014-11-08 10:26:45 +01:00

..

DB ban

…

permissionverbs

…

verbs

Z-Level Compatibility

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

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_verbs.dm

Admin event panel taking shape.

2014-11-05 17:19:04 +01:00

admin.dm

Z-Level Compatibility

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

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

modularize ban system

2014-07-18 21:08:01 +00:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

topic.dm

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00

ToRban.dm

…