GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm

2015-04-13 12:49:07 +01:00

..

__HELPERS

Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff

2015-04-12 13:16:45 +09:30

_onclick

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

ATMOSPHERICS

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

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

controllers

Merge pull request #8707 from PsiOmegaDelta/Garbage

2015-04-09 08:50:12 +03:00

datums

Added construction drone variant, updated the construction area map slightly.

2015-04-11 19:20:13 +09:30

defines

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

FEA

…

game

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

2015-04-13 12:49:07 +01:00

js

…

modules

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

2015-04-13 12:49:07 +01: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 pull request #8753 from Neerti/4-4-2015_borg_module_stuff

2015-04-12 13:16:45 +09:30

hub.dm

…

names.dm

…

setup.dm

Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen

2015-04-11 04:43:50 +03: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