PsiOmega 71064574ed Merge remote-tracking branch 'upstream/dev' into AirAlarms ...

Conflicts:
	code/game/machinery/alarm.dm

2014-11-21 15:28:54 +01:00

..

__HELPERS

Merge pull request #6983 from PsiOmegaDelta/Event

2014-11-12 23:45:02 +03:00

_onclick

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

ATMOSPHERICS

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

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

controllers

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

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

datums

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

2014-11-17 11:59:41 +01:00

defines

Security Records Check

2014-11-15 20:10:53 +01:00

FEA

…

game

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

2014-11-21 15:28:54 +01:00

js

…

modules

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

2014-11-21 10:27:56 +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 remote-tracking branch 'upstream/dev' into AirAlarms

2014-11-21 15:28:54 +01:00

ZAS

…

global.dm

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

2014-11-17 11:59:41 +01:00

hub.dm

…

names.dm

…

setup.dm

Slot_tie flags.

2014-11-19 18:29:51 +03:00

stylesheet.dm

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

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

world.dm

…