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

Conflicts:
	code/game/machinery/vending.dm

2015-04-10 15:25:34 +02:00

..

antagonist

Thermal/NVG changes.

2015-04-05 09:54:55 +02:00

area

Area/Camera network refactor - Part 2

2015-04-08 13:20:22 +02:00

dna

Should fix the head and hair issues from the organ rewrite.

2015-04-03 05:41:33 -07:00

gamemodes

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

2015-04-08 10:55:26 +02:00

jobs

Merge pull request #8604 from Zuhayr/limbs

2015-03-31 08:38:54 +03:00

machinery

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

2015-04-10 15:25:34 +02:00

magic

…

mecha

Merged with dev.

2015-03-31 11:17:13 +10:30

objects

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

2015-04-10 15:25:34 +02:00

turfs

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

2015-03-31 01:37:55 -04:00

vehicles

…

verbs

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

asteroid.dm

…

atoms_movable.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

atoms.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30