Cael_Aislinn c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-12-29 13:06:03 +10:00

..

names

Merged modified name files submitted by Fateweaver. See the following issues / patch submissions for details:

2011-11-27 07:09:44 +00:00

access levels.txt

TG: Renamed access_medlab to access_genetics.

2012-05-13 00:24:34 +01:00

admin_ranks.txt

Moved one or two bits out of +FUN and into a +SPAWN flag. The spawn flag allows mob transformations, spawning of items etc.

2012-11-09 21:58:10 +00:00

admins.txt

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

alienwhitelist.txt

Added people to alienwhitelist.

2012-09-09 15:28:12 +01:00

config.txt

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

custom_items.txt

Oen'g's baton.

2012-12-19 00:13:19 -08:00

dbconfig.txt

crap

2012-02-10 20:36:30 +01:00

forumdbconfig.txt

Clarified some commenting in forumdbconfig.txt

2011-03-10 06:52:12 +00:00

game_options.txt

How many times am I going to repeat this mistake...

2012-10-15 15:44:51 +04:00

jobs.txt

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

moderators.txt

updated configs on MLoc's request.

2012-11-07 20:35:02 +04:00

motd help.txt

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

motd.txt

Adds Flashkirby's ERT suits. Moved ERT's equipment to lockers so it's easier to edit in future. Edited medical ERT's loadout slightly. Added a megaphone that broadcasts a larger message than normal, gave on to each Head in their office. Changelog.

2012-06-01 22:49:01 +01:00

README feedback.txt

TG: - Committing a feedback logging readme file with instructions how to set up

2012-05-13 00:40:28 +01:00

rules.html

TG: Fixes a derp I made with the PA in a recent commit.

2012-06-02 01:12:34 +01:00

svndir.txt

- Fixed Issue 185

2011-10-21 02:49:37 +00:00