Lzimann d40760ad71 Fix conflicts

2017-04-07 09:12:36 -03:00

..

DB_ban

Global variable wrappers (#25325)

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

permissionverbs

Global variable wrappers (#25325)

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

verbs

Fix conflicts

2017-04-07 09:12:36 -03:00

admin_investigate.dm

Global variable wrappers (#25325)

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

admin_ranks.dm

Global variable wrappers (#25325)

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

admin_verbs.dm

Global variable wrappers (#25325)

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

admin.dm

Global variable wrappers (#25325)

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

banjob.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06: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

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06: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

Global variable wrappers (#25325)

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

IsBanned.dm

Global variable wrappers (#25325)

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

NewBan.dm

Global variable wrappers (#25325)

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

player_panel.dm

Global variable wrappers (#25325)

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

secrets.dm

Global variable wrappers (#25325)

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

sql_message_system.dm

Global variable wrappers (#25325)

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

stickyban.dm

Replaces the default output with the to_chat wrapper.

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

topic.dm

Global variable wrappers (#25325)

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

whitelist.dm

Global variable wrappers (#25325)

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