PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm

2014-11-11 14:13:02 +01:00

..

cold_sink.dm

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

2014-11-11 14:13:02 +01:00

generator_input.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

heat_exchanger.dm

Committing for Numbers.

2012-09-30 19:31:35 +00:00

heat_source.dm

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

2014-11-11 14:13:02 +01:00

outlet_injector.dm

Fixes atmos control computers not being able to turn their devices on or off

2014-09-08 23:52:32 -04:00

oxygen_generator.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

thermal_plate.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unary_base.dm

NewPipe

2014-09-05 00:18:33 +08:00

vent_pump.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

vent_scrubber.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00