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

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

DB ban

Dun goofed

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

permissionverbs

Fixes.

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

verbs

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2014-01-10 13:52:07 -08:00

admin_investigate.dm

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2013-12-13 19:13:43 +00:00

admin_memo.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

admin_ranks.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

admin_report.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

admin_verbs.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

admin.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

banjob.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

create_mob.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

create_object.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

create_turf.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +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

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00: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

Uncommented ninja block in Check Antags.

2013-12-27 10:48:37 +10:30

topic.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00: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