Lzimann 79d9178adf Fix conflicts

2017-04-25 10:51:49 -03:00

..

DB_ban

AHelp improvements (#26092)

2017-04-19 18:54:26 +02:00

permissionverbs

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

verbs

Fix conflicts

2017-04-25 10:51:49 -03:00

admin_investigate.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

admin_ranks.dm

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

admin_verbs.dm

AHelp improvements (#26092)

2017-04-19 18:54:26 +02:00

admin.dm

Renames some incorrect terminology

2017-04-23 10:09:08 -04:00

banjob.dm

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

create_mob.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

create_object.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

create_poll.dm

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

create_turf.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

fun_balloon.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

holder2.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

ipintel.dm

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

IsBanned.dm

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

NewBan.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

player_panel.dm

Adds a link to individual logs on the player panel and moves the other one (#26341)

2017-04-19 13:03:51 +02:00

secrets.dm

While we're here, regenerate station names on holidays

2017-04-22 22:08:31 +01:00

sql_message_system.dm

AHelp improvements (#26092)

2017-04-19 18:54:26 +02:00

stickyban.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

topic.dm

AHelp improvements (#26092)

2017-04-19 18:54:26 +02:00

whitelist.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00