Ravensdale 45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron ...

Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm

2014-04-16 22:13:48 -07:00

..

beast

…

computer2

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

disease2

Virology - NanoUI, gameplay tweaks, bugfixes

2014-03-24 23:55:41 -05:00

gamemodes

die monkey emergency DIE

2014-04-06 12:05:41 -07:00

hivebot

These files have been collapsed into root procs and can be deleted.

2013-08-16 17:48:25 -07:00

mining

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07: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

Added an upgraded mopbucket for the janitor and placed it on the map.

2012-11-30 22:37:00 +00:00

ai_lockdown.dm

…

AI_Visibility.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

airtunnel.dm

…

assemblies.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

asteroiddevice.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

authorize.dm

…

blender.dm

…

BrokenInhands.dm

…

carpetsplosion.dm

…

conveyor.dm

…

dna_mutations.dm

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

2013-01-11 22:12:31 +10: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

Ported coats pockets

2013-01-04 05:31:14 +04:00

musicplayer.dm

…

new_year.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04: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

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04: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

…