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

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

airlock.dm

NanoUI AI door interface.

2015-03-03 13:23:18 +01:00

alarm.dm

Alarm centralization completion

2015-02-23 15:11:13 +01:00

apc.dm

…

autolathe.dm

…

camera.dm

…

explosive.dm

…

mulebot.dm

…

particle_accelerator.dm

…

radio.dm

…

robot.dm

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

smartfridge.dm

…

smes.dm

I am an idiot.

2014-12-08 06:27:11 +01:00

suit_storage_unit.dm

…

vending.dm

Add NanoUI to vending machines

2015-02-11 10:42:50 -05:00

wires.dm

Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red.

2015-01-04 22:26:41 -05:00