Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

DB ban

…

permissionverbs

…

verbs

Merge branch 'master' into dev

2014-03-08 12:02:32 +04:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

admin_report.dm

…

admin_verbs.dm

DEV EMPOWERMENT Gives people with R_DEBUG access to runtimelogs.

2014-02-22 01:45:43 -06:00

admin.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

banjob.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

…

topic.dm

And now tested in game, with some fixes.

2014-02-10 22:47:29 -06:00

ToRban.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00