Cael_Aislinn f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649) ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

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

2012-09-08 14:22:44 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

2012-09-08 14:22:44 +10:00

jobs

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

2012-09-08 14:22:44 +10:00

machinery

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

2012-09-08 14:22:44 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

2012-09-08 14:22:44 +10:00

player

Merge github.com:Baystation12/Baystation12

2012-07-10 07:49:09 +02:00

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

various compile fixes, added bs12 moderator rank

2012-09-06 15:09:36 +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

various compile fixes, added bs12 moderator rank

2012-09-06 15:09:36 +10:00

chemistry.dm

Moving stuff around part 2!

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

communications.dm

Some tweaks and fixes for UL and any while loops I find, as well as removing generally bad procs.

2012-06-22 12:50:45 -07:00

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

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

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

Fixed a compile error.

2012-06-22 14:11:18 -07:00

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

added specops shuttle computer to the specops launch bay (to allow new spawned ERT members to recall the shuttle), modified some autosay messages from specops computer to be a bit more ambiguous

2012-07-25 02:22:53 +10:00

status.dm

-OPTIMIZATION TIME

2012-07-26 03:04:05 +00:00

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

Removed a spawn() from rad_collector/New()

2012-09-07 09:48:57 +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

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

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