Chinsky c7d9ce4697 Merge pull request #10046 from mwerezak/custom-item-icons ...

Makes custom items use the host item's inhand sprites if none are provided, knife fixes

2015-07-09 20:52:38 +03:00

..

__HELPERS

Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations

2015-07-09 20:45:51 +03:00

_defines

…

_onclick

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

2015-07-06 17:31:41 +02:00

ATMOSPHERICS

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

2015-07-06 17:31:41 +02:00

controllers

Fixes #9894

2015-07-09 11:50:42 +03:00

datums

Relocates drone law update to the new law set location.

2015-07-08 08:58:38 +02:00

defines

Adds 'Provisional' to the list of acting rank prefixes

2015-07-05 12:29:46 +01:00

FEA

…

game

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

js

…

modules

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

TriDimension

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

ZAS

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge pull request #9889 from PJB3005/bay-lights

2015-07-09 14:50:10 +01:00

stylesheet.dm

…

world.dm

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

2015-06-26 19:22:31 +02:00