headswe 2326abe31b Merge pull request #1754 from Whitellama/master ...

Ports/Fixes for the merge!

2012-10-13 07:00:40 -07:00

..

area

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

2012-10-12 17:53:17 +10:00

events

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

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

gamemodes

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

jobs

Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ

2012-10-12 13:58:18 -07:00

machinery

Ported BS12 medbots.

2012-10-13 06:33:05 -07:00

magic

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

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

mecha

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

objects

Merge pull request #1754 from Whitellama/master

2012-10-13 07:00:40 -07: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 remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +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

some merge fixes

2012-10-12 18:21:50 +10:00

algorithm.dm

File restructuring: ohgodihopenothingbroke edition.

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

asteroid.dm

-Hallucinations can be cured. Anti-Toxin and Synaptizine will cure it, while the latter being more effective at it.

2012-10-05 05:23:28 +00:00

atoms_movable.dm

File restructuring: ohgodihopenothingbroke edition.

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

atoms.dm

tweaks to game start / admins, fixe for adjacent reaching not working

2012-10-10 00:41:50 +10:00

cellautomata.dm

File restructuring: ohgodihopenothingbroke edition.

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

communications.dm

…

dna.dm

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

hud.dm

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

2012-10-05 22:21:26 +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

…

skincmd.dm

…

smoothwall.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +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

supplyshuttle.dm

Resolves issue 977 - randomised supply packs are randomised at the time of purchase

2012-09-30 14:40:48 +00:00

vote.dm

File restructuring: ohgodihopenothingbroke edition.

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