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

2015-07-21 14:25:46 +02:00

..

__HELPERS

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

_defines

…

_onclick

Fixes #10230

2015-07-18 23:27:09 -04:00

ATMOSPHERICS

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

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

controllers

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

2015-07-17 23:09:24 +02:00

datums

Law spelling corrections, removes some law sets from the law manager overview.

2015-07-14 09:01:13 +02:00

defines

Adds 'Provisional' to the list of acting rank prefixes

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

FEA

Adds Destroys.

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

game

Merge pull request #10206 from Kelenius/ofBruisesAndBandages

2015-07-19 20:15:47 +09:30

js

…

modules

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

2015-07-21 14:25:46 +02:00

TriDimension

Fixes misleading path and proc name

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

ZAS

Fixes liquid fuel fire regression

2015-07-13 20:45:57 -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

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

stylesheet.dm

…

world.dm

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

2015-07-12 14:49:31 +02:00