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

Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm

2015-10-16 11:04:43 +02:00

..

DB ban

Permabans do not expire, and we don't need to show expired when it's been manually lifted

2015-09-23 13:03:11 +01:00

permissionverbs

…

verbs

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

2015-10-11 17:17:41 +02:00

admin_attack_log.dm

Improved admin logging.

2015-08-27 20:20:20 +02:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_verbs.dm

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

2015-09-27 13:36:56 +02:00

admin.dm

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

2015-10-16 11:04:43 +02:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

Add proc/crash_with, fix two incorrect qdel calls

2015-09-23 13:29:54 +01:00

player_panel.dm

…

topic.dm

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

2015-10-16 11:04:43 +02:00

ToRban.dm

…