Jeremy Liberman f43ef06431 Virology - NanoUI, gameplay tweaks, bugfixes ...

Conflicts:
	.gitignore
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/machinery.dm
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/virus2/isolator.dm
	nano/js/nano_base_helpers.js

2014-04-19 15:42:49 -04:00

..

beast

…

computer2

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

disease2

Virology - NanoUI, gameplay tweaks, bugfixes

2014-04-19 15:42:49 -04:00

gamemodes

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

hivebot

Standardize FAT

2014-01-21 22:57:10 -05:00

mining

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

optics

…

pda2

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

powerarmor

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

spacecraft

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +00:00

_debug.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

Agouri_stuff.dm

Standardize HULK.

2014-01-21 22:45:40 -05:00

ai_lockdown.dm

…

AI_Visibility.dm

…

airtunnel.dm

…

assemblies.dm

…

asteroiddevice.dm

Popable cans and beer cans

2013-12-31 21:44:21 -05:00

authorize.dm

…

blender.dm

…

BrokenInhands.dm

…

carpetsplosion.dm

…

conveyor.dm

…

dna_mutations.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

dna.dm

…

filter_control.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

game_kit.dm

…

heater.dm

…

jobs.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

musicplayer.dm

…

new_year.dm

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

newcombatsystem.dm

…

pipe_filter.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

pipe.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

scrap.dm

…

shuttle_engines.dm

Moved shuttle_engines.dm to the unused folder as it has apparently been unticked for ages.

2012-11-19 01:00:32 +00:00

siphs.dm

…

spells.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

tensioner.dm

Committing fancy teleportation step triggers for Intigracy.

2012-11-19 20:55:29 +00:00

toilets.dm

…

traps.dm

…

travel.dm

…

Ultralight.dm

…

vehicle.dm

…

Virus2Prob.dm

…