GunHog 4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too ...

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

2014-11-09 12:27:48 -06:00

..

__DEFINES

defines

2014-10-31 19:00:50 -07:00

__HELPERS

And a silent conflict to boot...

2014-11-04 20:40:15 +01:00

_globalvars

Botcall Fix for MC lag + Tweak to floorbots

2014-11-02 19:01:43 -06:00

_onclick

Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework

2014-11-08 01:07:29 +00:00

ATMOSPHERICS

Merge pull request #5704 from phil235/TypoFix1

2014-11-07 23:52:31 -06:00

controllers

Merge pull request #5700 from RemieRichards/SiliconLawCap

2014-11-08 15:22:09 -08:00

datums

Merge pull request #5693 from Aranclanos/LINDAISAGODESS

2014-11-08 00:48:23 -06:00

defines

Adds a sound for the RPED!

2014-11-08 23:49:04 -06:00

game

Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too

2014-11-09 12:27:48 -06:00

js

…

LINDA

Fixes LINDA not properly activating turfs who are next to unsimulated turfs with differences (space turfs are unsimulated)

2014-11-05 14:54:29 -03:00

modules

Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too

2014-11-09 12:27:48 -06:00

unused

Conflicts solving

2014-11-04 20:24:52 +01:00

WorkInProgress

…

_compile_options.dm

…

hub.dm

…

world.dm

…