Cael_Aislinn 283ae84dad various mergefixes ...

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

2012-09-22 21:37:42 +10:00

..

area

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

2012-09-22 21:29:04 +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

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

jobs

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

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

machinery

various mergefixes

2012-09-22 21:37:42 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

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

objects

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

2012-09-22 21:29:04 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

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

algorithm.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

asteroid.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

atoms_movable.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

atoms.dm

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

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

cellautomata.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +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

Ported parts of the BS12 organ system.

2012-09-18 21:32:39 +00: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

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

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

supplyshuttle.dm

Fixes an issue where areas were set with luminosity = 1. Not sure why the hell I done that and why the hell I never noticed it. Thanks Kor.

2012-09-17 02:27:12 +00:00

vote.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00