PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm

2014-11-29 10:09:03 +01:00

..

circuits_and_designs.dm

…

emergency_shield.dm

Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.

2014-11-28 19:37:31 -05:00

energy_field.dm

Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.

2014-11-28 19:37:31 -05:00

sheldwallgen.dm

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

2014-11-29 10:09:03 +01:00

shield_capacitor.dm

…

shield_gen_external.dm

…

shield_gen.dm

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

2014-11-21 10:27:56 +01:00