PsiOmega 78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm

2015-05-06 12:19:50 +02:00

..

combat

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

equipment

Fixes a few log-destroying lines

2015-05-04 21:33:30 +03:00

medical

Fixes #7627

2015-01-02 19:19:01 +10:30

working

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mech_bay.dm

Adjusts size of previous UI

2014-12-11 09:49:55 +01:00

mech_fabricator.dm

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

2015-05-06 12:19:50 +02:00

mech_sensor.dm

Now mecha area denial feedback is closer to 5 seconds apart then ever.

2014-08-24 23:41:15 +02:00

mecha_construction_paths.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mecha_control_console.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mecha_parts.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

mecha_wreckage.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mecha.dm

Crushing closets or mechas will now cause damage to the door.

2015-04-27 19:02:38 +02:00