PsiOmegaDelta 94b999772b Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower ...

Conflicts:
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/station_alert.dm

2015-12-04 11:22:27 +01:00

..

admin.dm

…

base.dm

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-04 11:22:27 +01:00

conscious.dm

…

contained.dm

…

default.dm

Ghosts can now view any object with a NanoUI interface.

2015-11-22 12:21:41 +01:00

interactive.dm

Adds a remote interaction state for NanoUI.

2015-12-03 10:15:11 +01:00

inventory_deep.dm

…

inventory.dm

…

outside.dm

…

physical.dm

…

remote.dm

Adds a remote interaction state for NanoUI.

2015-12-03 10:15:11 +01:00

self.dm

…

zlevel.dm

…