ikarrus ce9773294d Resolved Conflicts: ...

code/modules/mob/living/carbon/carbon.dm

2014-07-01 13:02:40 -06:00

..

area

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

2014-06-09 20:26:17 +01:00

gamemodes

Merge pull request #4000 from Cheridan/terribleidea

2014-06-30 16:27:22 -03:00

jobs

Resolving Conflicts:

2014-06-27 09:30:43 -06:00

machinery

Typo Fix

2014-07-01 13:01:24 -06:00

mecha

Merge pull request #3889 from Kelenius/OfCyborgsAndModules

2014-06-20 15:03:15 -05:00

objects

Merge pull request #4000 from Cheridan/terribleidea

2014-06-30 16:27:22 -03:00

turfs

Now using pulledby

2014-06-23 12:22:10 +04:00

verbs

Maybe i should make sure the code complies before pushing it next time

2014-05-13 02:32:56 +10:00

asteroid.dm

Merge conflicts fix

2014-03-03 05:42:31 +04:00

atoms_movable.dm

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

atoms.dm

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

communications.dm

Reflects the color change for AI Private

2014-04-01 20:50:11 -05:00

dna.dm

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

shuttle_engines.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

skincmd.dm

Experimental DMF vending machine update, by Tobba.

2011-11-18 00:45:50 +00:00

smoothwall.dm

Removed a spawn() from the Destroy() proc of falsewalls.

2014-04-04 09:18:39 -03:00

sound.dm

[VIOLENT FROTHING]

2014-03-30 20:54:17 +02:00