PsiOmegaDelta db565ae2ff Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery ...

Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm

2015-08-13 08:11:32 +02:00

..

DB ban

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

permissionverbs

…

verbs

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

admin_attack_log.dm

Uplink Items - Part III

2015-07-03 16:02:02 +02: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

…

admin_verbs.dm

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

admin.dm

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

2015-07-28 09:03:49 +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/master' into dev-freeze

2015-07-28 07:59:49 +02:00

topic.dm

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

2015-07-28 09:03:49 +02:00

ToRban.dm

Updates ToR list URL

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