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

Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt

2015-07-12 14:49:31 +02:00

..

DB ban

…

permissionverbs

…

verbs

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

2015-07-04 15:19:52 +02:00

admin_attack_log.dm

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -04: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-06-14 10:35:29 +02:00

admin.dm

Refactor/tidies up latejoin antags/in-round antag spawning.

2015-06-21 19:33:49 +09:30

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

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

2015-04-24 17:13:37 +02:00

IsBanned.dm

…

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

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

2015-06-11 12:06:40 +02:00

player_panel.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

topic.dm

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

2015-07-12 14:49:31 +02:00

ToRban.dm

…