Kyep 977087a97e fixes merge conflict

2019-08-11 01:36:09 -07:00

..

DB ban

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

permissionverbs

…

tickets

Admins can now see the mhelp tickets

2019-04-19 14:31:46 +02:00

verbs

Diagonal tweaks

2019-07-12 06:00:19 -04:00

admin_investigate.dm

Add admin logs to NTSL2, change font to Verdana

2018-11-06 09:57:33 -08:00

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

hides attack logs involving NPCs, lavaland, adminroom, thunderdome

2019-06-06 19:46:07 -07:00

admin.dm

Remove traces of the Mask of Nar'Sie

2019-06-03 06:33:43 +02:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

holder2.dm

…

ipintel.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

IsBanned.dm

this stupid space who even made appealmessage have a space in it

2019-07-11 19:03:01 -04:00

machine_upgrade.dm

…

NewBan.dm

…

player_panel.dm

Merge

2019-05-09 17:06:35 +01:00

secrets.dm

adminbus

2019-03-30 05:15:47 -04:00

sql_notes.dm

…

stickyban.dm

…

topic.dm

reword the reword

2019-07-11 18:42:03 -04:00

ToRban.dm

…

watchlist.dm

…