PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm

2015-08-13 08:09:28 +02:00

..

DB ban

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

permissionverbs

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

verbs

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +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

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

admin_ranks.dm

…

admin_report.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

admin_verbs.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

admin.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

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-07-29 11:57:17 +02:00

player_panel.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

topic.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

ToRban.dm

Updates ToR list URL

2015-07-25 03:27:46 +03:00