skull132 b8ea5fd539 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/admin/admin_verbs.dm

2017-02-07 21:00:23 +02:00

..

callproc

…

DB ban

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

permissionverbs

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

secrets

…

verbs

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

view_variables

Fixes #1528 + hard delete for admins (#1534)

2017-01-12 16:19:17 +02:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_ranks.dm

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00

admin_secrets.dm

More conflict clearance!

2016-10-07 01:13:36 +03:00

admin_server_greeting.dm

Welcome Screen (#535)

2016-07-11 16:48:58 +03:00

admin_verbs.dm

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

admin.dm

Fix #1494 (#1496)

2017-01-10 18:01:33 +02:00

banjob.dm

Fix general antagonist bans (#1643)

2017-01-26 01:33:44 +02:00

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

IsBanned.dm

Implement ban pass phrase (#1714)

2017-02-04 17:43:55 +02:00

map_capture.dm

…

NewBan.dm

…

newbanjob.dm

…

player_notes_sql.dm

Generalizing establish_db_connection() and setup_database_connection()

2016-03-04 00:53:37 +02:00

player_notes.dm

…

player_panel.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

topic.dm

Fix general antagonist bans (#1643)

2017-01-26 01:33:44 +02:00

ToRban.dm

…