Cael_Aislinn 56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport ...

Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

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

2012-09-06 13:13:57 +10:00

..

area

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

asteroid

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

events

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-08-23 13:56:12 +01:00

gamemodes

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

jobs

Merged rag smothering, increased cyborg slots, command report titles.

2012-09-03 01:30:20 +01:00

machinery

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

magic

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

2012-08-24 21:55:58 +10:00

mecha

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

objects

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

player

…

structure

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

turfs

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

vehicles

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

verbs

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

2012-09-04 22:11:21 +10:00

algorithm.dm

Reverts "Allow server to initialize the world without any players connected." as I am suspicious about it.

2012-08-29 18:15:55 +01:00

atom_procs.dm

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

2012-09-04 22:19:03 +10:00

cellautomata.dm

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

chemistry.dm

Moving stuff around part 2!

2012-08-22 16:32:45 +00:00

communications.dm

…

dna.dm

Other part of mutation fix.

2012-08-18 18:29:12 +01:00

hud.dm

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

json.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

landmarks.dm

What I've got of the mapfix so far:

2012-08-27 14:27:10 +00:00

master_controller.dm

Reverts "Allow server to initialize the world without any players connected." as I am suspicious about it.

2012-08-29 18:15:55 +01:00

prisonshuttle.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

response_team.dm

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

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

- Moved the r-wall define to after the definition of wall. It always bugged me and I must have fixed that 20 times in my local repors by now... Strange how I never committed it.

2012-08-16 18:19:21 +00:00

socket_talk.dm

…

sound.dm

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

specops_shuttle.dm

…

status.dm

…

step_triggers.dm

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

supplyshuttle.dm

Preparations for reducing the number of processing machines at round-start. There are currently 8000 or so at round start, this was already pruned to 2800ish by doohl's stuff.

2012-09-02 20:32:01 +00:00

syndicate_shuttle.dm

- Fixes issue 415. The problem with the moving of the syndicate shuttle was a condition bomb_set, not being properly set in all cases, where a bomb was timing. I added the setter for the bomb_set variable in nuclearbomb/process(). So if at least ONE nuke is ticking it means the bomb is set. The bomb_set variable gets reset in the appropriate places now. The places are if either the safety is enabled again or if the timer is disabled. Enabling the safety now automatically stops the timer. The timer cannot be enabled without the safety being off.

2012-08-17 09:28:44 +00:00

syndicate_specops_shuttle.dm

…

throwing.dm

- Fixes issue 812.

2012-08-17 16:19:04 +00:00

topic.dm

Fix for revdata=null causing world/Topic() runtimes.

2012-08-15 19:14:48 +00:00

vote.dm

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