Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

combat

Central Command access rework

2015-03-04 16:36:17 +01:00

equipment

Explosion Rework

2015-06-20 04:13:55 -04:00

medical

Rewrites HUD Handling for Glasses

2015-06-11 21:42:15 -04:00

working

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

mech_bay.dm

REFACTOR: Most consoles and machinery now use defines for light color

2015-05-16 13:29:29 -07:00

mech_fabricator.dm

Fixes mech and pod fabricators

2015-05-12 03:37:37 -04:00

mech_sensor.dm

An Odysseus with patients now bypass mech movement-overrides.

2014-07-30 00:17:48 -04:00

mecha_construction_paths.dm

Fix a bunch of runtimes

2015-02-09 04:03:20 +01:00

mecha_control_console.dm

tweaks and optimization

2015-06-21 02:16:18 -04:00

mecha_parts.dm

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

mecha_wreckage.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

mecha.dm

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

2015-06-22 13:40:07 -07:00

paintkits.dm

Clean out unused fluff items

2015-05-13 05:03:40 -07:00