PsiOmega 1784e62621 Merge remote-tracking branch 'upstream/dev' into Stripping ...

Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm

2014-11-22 11:27:19 +01:00

..

__HELPERS

/tg/ input stripping.

2014-11-21 18:32:51 +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

Merge pull request #7008 from Zuhayr/spaceninjas

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

defines

AI can now track people with max level sensors.

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

FEA

…

game

Merge pull request #7102 from PsiOmegaDelta/AssignmentERT

2014-11-22 11:18:09 +01:00

js

…

modules

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

2014-11-22 11:27:19 +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 #7008 from Zuhayr/spaceninjas

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

stylesheet.dm

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

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

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10:30