DZD 212ca5f5bd MERGE CONFLIIIIIICTS

2015-02-19 20:26:36 -05:00

..

DB ban

Add jobban options to the unban panel

2015-02-09 23:25:30 +01:00

permissionverbs

…

verbs

Merge with upstream/master

2015-02-18 13:41:32 -05:00

admin_investigate.dm

Enables the "cult" investigation

2014-07-25 11:57:13 -07:00

admin_memo.dm

…

admin_ranks.dm

New +MENTOR permission for mentors

2015-02-17 02:28:00 -05:00

admin_report.dm

…

admin_verbs.dm

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

admin.dm

Z-level check refactor

2015-02-16 20:33:28 +01:00

banappearance.dm

…

banjob.dm

…

buildmode.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Cleaning out old unused code.

2014-07-13 08:10:44 -04:00

IsBanned.dm

…

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

Compile fix & Latejoin heads get added to target lists

2015-02-18 16:27:46 -05:00

secrets.dm

Updates secrets panel to use the new shuttle...

2014-06-26 16:58:07 -04:00

topic.dm

Merge with upstream/master

2015-02-18 13:41:32 -05:00

ToRban.dm

…