PsiOmega bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm

2015-07-26 10:21:36 +02:00

..

combat

Merge resolution.

2015-06-28 06:13:24 +09:30

equipment

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

2015-07-26 10:21:36 +02:00

medical

…

working

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

mech_bay.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

mech_fabricator.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

mech_sensor.dm

…

mecha_construction_paths.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

mecha_control_console.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

mecha_parts.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

mecha_wreckage.dm

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

mecha.dm

Merge resolution.

2015-06-28 06:13:24 +09:30