unknown 4b396a52e7 Resolved conflicts

2016-06-19 15:07:36 -04:00

..

DB_ban

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

permissionverbs

…

verbs

Complete Revenant Rewrite (#18522)

2016-06-17 10:58:07 +12:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Splits languages into languages_spoken and languages_understood.

2016-06-16 18:50:32 -04:00

admin.dm

Adds Asteroid emergency shuttle to station (#18125)

2016-06-02 15:48:08 -05:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

holder2.dm

…

ipintel.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

IsBanned.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

NewBan.dm

…

player_panel.dm

Fix wizard follow button not working

2016-05-29 00:20:34 -03:00

secrets.dm

Fixes stupid mononamers

2016-06-17 20:33:50 +01:00

sql_notes.dm

fixes broken regex

2016-03-11 21:43:32 +11:00

stickyban.dm

…

topic.dm

Complete Revenant Rewrite (#18522)

2016-06-17 10:58:07 +12:00

watchlist.dm

…