Snapshot 76295edd6e Merge pull request #6333 from mwerezak/engine ...

Alternative to #6332

2014-09-13 00:45:17 -07:00

..

__HELPERS

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

_onclick

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-09-01 22:03:29 +09:30

ATMOSPHERICS

Heaters/Freezers, Cryo

2014-09-13 02:18:48 -04:00

controllers

Adds config option for air compression heating

2014-09-12 01:18:12 -04:00

datums

Powernets

2014-09-07 01:10:22 -04:00

defines

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

FEA

…

game

Merge pull request #6333 from mwerezak/engine

2014-09-13 00:45:17 -07:00

js

…

modules

Merge pull request #6333 from mwerezak/engine

2014-09-13 00:45:17 -07:00

TriDimension

…

unused

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

WorkInProgress

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

ZAS

updating turf gas overlays is now delta-based

2014-09-11 20:13:10 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Attempts to fix #6226

2014-09-10 22:15:04 -04:00

stylesheet.dm

…

world.dm

Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.

2014-08-16 05:28:45 +04:00