PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm

2015-10-16 13:02:59 +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

Merge pull request #11230 from PsiOmegaDelta/xenomorphs

2015-10-13 08:31:27 +10:30

view_variables

Cherrypicked xenophage-rewrite mechanics over.

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

admin_attack_log.dm

Blobs locations are now more random.

2015-10-13 18:49:55 +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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-10-16 13:02:59 +02:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

map_capture.dm

Added more help/error messages to the tool.

2015-10-08 12:36:09 +03:00

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/master' into dev-freeze

2015-10-16 11:04:43 +02:00

ToRban.dm

…