volas e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff ...

Conflicts:
	code/modules/admin/admin_verbs.dm

2015-03-09 18:11:10 +03:00

..

DB ban

Small correction

2015-03-09 16:53:08 +03:00

permissionverbs

…

verbs

Antag-OOC

2015-03-09 12:19:50 +03:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_verbs.dm

Merge remote-tracking branch 'upstream/dev' into admin_stuff

2015-03-09 18:11:10 +03:00

admin.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-02-27 09:06:48 +01:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

IsBanned.dm

…

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

…

topic.dm

Ability to search bans by bantype

2015-03-09 15:15:08 +03:00

ToRban.dm

…