Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01:00

..

beast

…

computer2

Merge remote-tracking branch 'upstream/master' into dev

2014-09-10 22:14:37 +01: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

Cables are now stacks

2014-08-25 18:54:35 +04:00

mining

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

optics

…

pda2

Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize().

2014-08-26 00:03:18 +02:00

powerarmor

…

spacecraft

…

_debug.dm

…

Agouri_stuff.dm

Cables are now stacks

2014-08-25 18:54:35 +04: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

…

authorize.dm

…

blender.dm

…

BrokenInhands.dm

…

carpetsplosion.dm

…

conveyor.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

dna_mutations.dm

…

dna.dm

…

filter_control.dm

…

game_kit.dm

…

heater.dm

…

jobs.dm

…

musicplayer.dm

…

new_year.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

newcombatsystem.dm

…

pipe_filter.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

pipe.dm

…

scrap.dm

…

shuttle_engines.dm

…

siphs.dm

…

spells.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

tensioner.dm

…

toilets.dm

…

traps.dm

…

travel.dm

…

Ultralight.dm

…

vehicle.dm

…

Virus2Prob.dm

…