PsiOmegaDelta 8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs ...

Conflicts:
	baystation12.dme

2015-10-01 09:48:51 +02:00

..

callproc

Replace ';' with '; // do nothing' for clarity

2015-09-10 04:00:37 +01:00

DB ban

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

2015-09-26 08:48:37 +02:00

permissionverbs

…

secrets

…

verbs

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

view_variables

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

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_secrets.dm

…

admin_verbs.dm

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

2015-09-27 13:48:33 +02:00

admin.dm

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

map_capture.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/dev' into xenomorphs

2015-10-01 09:48:51 +02:00

ToRban.dm

…