skull132 8b5c7bc2c5 Conflict resolution ...

Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt

2016-03-25 22:25:41 +02:00

..

DB ban

Generalizing establish_db_connection() and setup_database_connection()

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

permissionverbs

Generalizing establish_db_connection() and setup_database_connection()

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

verbs

Generalizing establish_db_connection() and setup_database_connection()

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

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Generalizing establish_db_connection() and setup_database_connection()

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

admin_report.dm

…

admin_verbs.dm

Fixing Verbs

2016-03-25 16:26:10 +02:00

admin.dm

Dev Perms For Days

2016-02-16 01:44:27 +02:00

banjob.dm

Generalizing establish_db_connection() and setup_database_connection()

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

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

+CCIAA Flag

2016-02-02 23:37:15 +02:00

IsBanned.dm

Generalizing establish_db_connection() and setup_database_connection()

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

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

Remove R_MENTOR & R_HOST

2016-02-05 23:20:39 +02:00

topic.dm

+CCIAA bugs

2016-02-10 00:54:15 +02:00

ToRban.dm

…