Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

DB ban

Dun goofed

2013-11-04 13:10:33 -08:00

permissionverbs

Fixes.

2013-10-07 20:35:26 +01:00

verbs

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

admin_investigate.dm

Ported BS12 player info system.

2012-10-13 08:34:45 -07:00

admin_memo.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

admin_ranks.dm

Return of Moderator II

2013-01-04 03:02:08 +04:00

admin_report.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

admin_verbs.dm

More power to devs. (this is a bad idea)

2013-11-04 21:31:29 +00:00

admin.dm

Fixed delay so anyone with R_SERVER can use it.

2013-11-03 13:31:54 -08:00

banjob.dm

Job whitelist fix.

2013-09-02 17:51:49 +01:00

create_mob.dm

Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').

2012-10-27 21:21:17 +00:00

create_object.dm

Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').

2012-10-27 21:21:17 +00:00

create_turf.dm

Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').

2012-10-27 21:21:17 +00:00

holder2.dm

Fixes admins not spawning as aliens on roundstart.

2013-08-20 14:20:33 +01:00

IsBanned.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

NewBan.dm

Ported BS12 player info system.

2012-10-13 08:34:45 -07:00

newbanjob.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-26 18:49:18 +10:00

player_notes.dm

Return of Moderator II

2013-01-04 03:02:08 +04:00

player_panel.dm

Typo fix.

2013-08-13 15:18:45 -07:00

topic.dm

Admin request: Jobbans for IA and ERT

2013-11-17 18:16:42 -06:00

ToRban.dm

>Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever

2012-10-24 14:39:36 +00:00