PsiOmega bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm

2015-07-26 10:21:36 +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-freeze' into dev

2015-07-14 08:21:12 +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/dev-freeze' into dev

2015-06-16 10:52:33 +02:00

admin.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +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/dev-freeze' into dev

2015-07-17 23:19:34 +02:00

ToRban.dm

Updates ToR list URL

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