Mloc-Argent 08393161c0 Merge branch 'master' into BEF-staging ...

Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-07-04 13:08:28 +01:00

..

xenoarchaeology

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

circuitprinter.dm

Adds Uranium Capability to Circuit Imprinters

2013-06-10 00:12:28 -04:00

designs.dm

Fixed #2708.

2013-04-27 13:49:44 +04:00

destructive_analyzer.dm

Fixes closets and destructive analyzer

2013-01-03 16:08:46 -08:00

message_server.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

protolathe.dm

Runtime fix for inputing the number of sheets that you want to add into a protolathe, when the sheet doesn't exist.

2013-01-07 12:06:31 +00:00

rd-readme.dm

…

rdconsole.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

rdmachines.dm

-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.

2012-10-25 19:15:51 +00:00

research_shuttle.dm

Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.

2013-07-04 04:55:24 -07:00

research.dm

Adds Uranium Capability to Circuit Imprinters

2013-06-10 00:12:28 -04:00

server.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00