CosmicScientist 2844c80ed5 Fixing merge conflicts

2015-08-08 15:43:38 +01:00

..

__DEFINES

Merge pull request #10992 from RemieRichards/AlternateWornLayer

2015-08-07 19:37:52 +10:00

__HELPERS

Merge pull request #10960 from RemieRichards/Orbits

2015-08-04 16:40:26 -05:00

_globalvars

Add global list of AT roundstart cords

2015-07-18 20:17:46 +09:00

_onclick

Merge pull request #11002 from AnturK/bizzaro

2015-08-05 14:50:23 +10:00

ATMOSPHERICS

Fixes some pipenet bugs in components_base

2015-07-25 23:15:49 -07:00

controllers

Removes most world.log messages at roundstart, 'all minimaps have been generated' now appears in world and bold red.

2015-08-03 20:43:08 -03:00

datums

Merge pull request #10944 from bustygoku/Carrier-RNG

2015-08-07 19:36:29 +10:00

game

Fixing merge conflicts

2015-08-08 15:43:38 +01:00

js

…

LINDA

Fixes hotspot lights lasting forever.

2015-07-31 18:35:38 +02:00

modules

Fixing merge conflicts

2015-08-08 15:43:38 +01:00

orphaned procs

Fixes proc arguments

2015-07-15 23:52:35 +02:00

_compile_options.dm

apparently using a beta build for the code to compile in the first place is a good idea vOv

2015-07-27 11:35:49 +02:00

hub.dm

…

world.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00