PsiOmega 31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires ...

Conflicts:
	code/game/machinery/autolathe.dm

2014-11-25 11:19:39 +01:00

..

__HELPERS

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

2014-11-25 11:19:39 +01:00

_onclick

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

ATMOSPHERICS

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

2014-11-19 14:40:18 +01:00

controllers

ERT and Xenobiology security HUD icons

2014-11-21 14:46:54 +01:00

datums

Radio wires - Take 2. Can now also cut wiring.

2014-11-24 15:23:06 +01:00

defines

Plastique wiring.

2014-11-24 11:21:31 +01:00

FEA

…

game

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

2014-11-25 11:19:39 +01:00

js

…

modules

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

2014-11-25 11:19:39 +01:00

TriDimension

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

unused

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

WorkInProgress

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

ZAS

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

2014-10-15 22:13:44 +01:00

global.dm

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #7103 from Segrain/dev

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

stylesheet.dm

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

world.dm

Merge pull request #7127 from Zuhayr/lathe

2014-11-25 10:43:03 +01:00