Xhuis 5fe0762beb Conflicts 2/3

2015-09-22 16:42:34 -04:00

..

__DATASTRUCTURES

Fixes tcoms crashing the server.

2015-09-07 21:49:36 -07:00

__DEFINES

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

__HELPERS

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

_globalvars

God dammit timing is perfect for no one

2015-09-16 12:55:36 +01:00

_onclick

Dragging an item onto itself === clicking it

2015-09-19 15:59:24 -07:00

ATMOSPHERICS

Merge pull request #11821 from Aranclanos/datumpipeline

2015-09-19 14:08:24 +01:00

controllers

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

datums

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

game

Conflicts 2/3

2015-09-22 16:42:34 -04:00

js

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

LINDA

Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated.

2015-09-16 21:52:25 -03:00

modules

Conflicts 2/3

2015-09-22 16:42:34 -04:00

orphaned procs

Datastructures!

2015-08-28 11:29:08 +01:00

_compile_options.dm

compiles the game properly

2015-09-04 22:21:58 -06:00

hub.dm

…

world.dm

Update world.dm

2015-08-31 15:32:13 -07:00