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

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm

2015-08-12 21:18:18 +02:00

..

alarm_monitor.dm

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

2015-07-14 08:21:12 +02:00

atmos_control.dm

Compilation fixes.

2015-07-17 23:21:59 +02:00

crew_monitor.dm

Compile fix

2015-08-11 18:47:25 +01:00

human_appearance.dm

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

2015-08-12 21:18:18 +02:00

law_manager.dm

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

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

nano_module.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

power_monitor.dm

Power monitor UI now attempts to get the turf of its host.

2015-06-09 16:24:47 +02:00

rcon.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00