GinjaNinja32 2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-22 15:44:02 +01:00

..

__defines

Accidentally commited before saving the file.

2015-08-21 16:19:09 +03:00

_helpers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-22 02:30:14 +09:30

_onclick

Adds missing TK move cooldowns, adjusts click move cooldowns

2015-08-21 23:21:54 -04:00

ATMOSPHERICS

Removes #undefine

2015-08-18 17:20:39 -04:00

controllers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-22 02:30:14 +09:30

datums

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

defines

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

FEA

…

game

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

2015-08-22 15:44:02 +01:00

js

…

modules

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

2015-08-22 15:44:02 +01:00

TriDimension

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

ZAS

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

global.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

hub.dm

…

names.dm

…

setup.dm

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

stylesheet.dm

…

world.dm

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

2015-08-22 15:44:02 +01:00