skull132 41b616baca Merge branch 'master' into development ...

# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	html/changelogs/.all_changelog.yml

2017-01-07 13:55:12 +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

Icon changes (#1400)

2017-01-07 00:48:42 +02:00

view_variables

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

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

admin_attack_log.dm

…

admin_investigate.dm

…

admin_ranks.dm

Generalizing establish_db_connection() and setup_database_connection()

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

admin_report.dm

…

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

Add db-reconnect adminverb (#1398)

2017-01-05 23:39:01 +02:00

admin.dm

Unit tests - Tag matcher (#1237)

2016-12-18 11:54:05 +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

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

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

IsBanned.dm

Merge branch 'master' into development

2017-01-07 13:55:12 +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

Fixes #1390 (#1394)

2017-01-05 01:47:24 +02:00

ToRban.dm

…