PsiOmega 5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/toys.dm

2015-05-26 08:26:48 +02:00

..

__HELPERS

Fixes #9210.

2015-05-12 08:11:48 +02:00

_defines

…

_onclick

Adds attack animation calls

2015-05-20 00:18:32 -04:00

ATMOSPHERICS

Creates a default vent for atmospherics tanks.

2015-05-14 15:31:39 +02:00

controllers

Merge pull request #9300 from PsiOmegaDelta/RoundStart

2015-05-18 12:00:49 +03:00

datums

Merge with dev.

2015-05-20 13:39:31 +09:30

defines

Updates bear traps

2015-05-24 16:33:41 -04:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

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

2015-05-26 08:26:48 +02:00

js

…

modules

Fixes #9294

2015-05-25 22:26:55 +02:00

TriDimension

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

ZAS

Cleans up debug prints

2015-05-19 17:47:51 -04:00

global.dm

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #9389 from mwerezak/fire

2015-05-21 03:13:55 +03:00

stylesheet.dm

…

world.dm

Merge resolution.

2015-05-11 11:47:24 +09:30