Krausus f816b8672d Resolves merge conflicts ...

Conflicts:
	code/game/machinery/computer/communications.dm

2015-08-18 04:14:14 -04:00

..

DB ban

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

permissionverbs

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

verbs

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

admin_investigate.dm

Logging improvements

2015-08-17 16:54:11 +02:00

admin_memo.dm

…

admin_ranks.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

admin_report.dm

…

admin_verbs.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

admin.dm

Minor consistency changes

2015-08-17 02:23:34 +02:00

banappearance.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

banjob.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

buildmode.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

create_mob.dm

…

create_object.dm

Make sure robot modules added to hand have NODROP

2015-08-16 02:39:44 +02:00

create_turf.dm

…

holder2.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

IsBanned.dm

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

NewBan.dm

Bantime fixins

2015-02-26 09:12:32 -05:00

newbanjob.dm

…

player_notes.dm

Changes a few del to del()

2015-07-10 23:28:08 -04:00

player_panel.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

secrets.dm

Cleanup of topic and new dice roll

2015-05-18 11:31:44 -04:00

topic.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

ToRban.dm

…