PsiOmega c9dc6c8add Merge remote-tracking branch 'upstream/master' into ColdEngine

2014-09-16 17:23:30 +02: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

Commenting out two unused vars to get the compile log to look neater.

2014-09-15 01:12:46 +09:30

controllers

remove lighting area GC for now

2014-09-14 17:40:07 +01: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 remote-tracking branch 'upstream/master' into ColdEngine

2014-09-16 17:23:30 +02:00

js

…

modules

Map changes

2014-09-15 15:30:27 +02: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

gives warden the ability to use faxes

2014-09-14 20:07:00 -07:00

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