Kelenius ec1b6f122c Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards ...

Conflicts:
	icons/obj/items.dmi
	maps/exodus-1.dmm

2015-04-16 19:17:10 +03:00

..

__HELPERS

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

2015-04-14 15:54:22 +02:00

_onclick

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

ATMOSPHERICS

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

2015-04-08 10:55:26 +02:00

controllers

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

datums

Removed some cocked up files.

2015-04-13 22:58:32 +09:30

defines

Ports /vg/'s Nas-Sie remake.

2015-04-11 13:58:08 +02:00

FEA

…

game

Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards

2015-04-16 19:17:10 +03:00

js

…

modules

Movement fixes.

2015-04-15 14:21:58 +02:00

TriDimension

…

ZAS

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

2015-03-26 17:01:33 +10:30

global.dm

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

2015-04-14 15:54:22 +02:00

hub.dm

…

names.dm

…

setup.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

stylesheet.dm

Makes reflex shooting more obvious

2015-04-02 21:54:35 -04:00

world.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30