PsiOmega 9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-01-21 08:53:27 +01:00

..

__HELPERS

fix wall burning runtime, balance rwalls

2015-01-16 23:58:15 +00:00

_onclick

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

ATMOSPHERICS

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

2015-01-21 08:53:27 +01:00

controllers

optimize relay_information

2015-01-16 23:59:39 +00:00

datums

Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red.

2015-01-04 22:26:41 -05:00

defines

Fixes a null-usr edge case.

2015-01-16 23:29:48 -07:00

FEA

…

game

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

2015-01-21 08:53:27 +01:00

js

…

modules

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

2015-01-21 08:53:27 +01:00

TriDimension

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

unused

Closet file reorganisation

2015-01-16 12:04:59 +13:00

WorkInProgress

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

ZAS

ZAS Emergency fix

2015-01-04 02:16:07 +01:00

global.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

hub.dm

…

names.dm

…

setup.dm

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

2015-01-21 08:53:27 +01:00

stylesheet.dm

Admin name colour msay colour fix

2015-01-05 18:40:52 +01:00

world.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30