Cael_Aislinn 6aa245f716 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/game/gamemodes/gameticker.dm

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

2013-01-08 23:08:52 +10:00

..

machine_input_output_plates.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

machine_processing.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

machine_stacking.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

machine_unloading.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

mine_areas.dm

added dwarf fortress music for the title screen and mining asteroid

2013-01-07 22:13:24 +10:00

mine_items.dm

Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

2012-12-28 01:07:36 +10:00

mine_turfs.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

mint.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

money_bag.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

ores_coins.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

satchel_ore_boxdm.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00