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

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm

2015-08-11 08:21:06 +02:00

..

effects

Explosion particle GC.

2015-08-09 12:35:07 +02:00

items

Merge pull request #10404 from mwerezak/stack-fix

2015-08-08 09:56:25 +02:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge pull request #10404 from mwerezak/stack-fix

2015-08-08 09:56:25 +02:00

buckling.dm

…

empulse.dm

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

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

Merge resolution.

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

explosion.dm

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

2015-07-10 12:57:46 +02:00

items.dm

Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items.

2015-07-13 10:20:46 +02:00

objs.dm

…

structures.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

weapons.dm

…