Cheridan 2b784f5126 Merge pull request #5885 from Cheridan/master ...

Conflict Fix of #5638

2014-11-13 19:04:23 -06:00

..

area

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

2014-10-25 23:25:27 -07:00

gamemodes

Merge pull request #5644 from Jordie0608/beekeepermodewhen

2014-11-13 17:04:29 -06:00

jobs

Moved some things around!

2014-11-04 10:46:18 -06:00

machinery

Merge pull request #5885 from Cheridan/master

2014-11-13 19:04:23 -06:00

mecha

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

objects

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

pooling

…

turfs

Fixes burn_tile runtime

2014-11-08 17:05:16 -03:00

verbs

Breathing won't check anymore if the person if committed suicide.

2014-11-06 13:48:41 -03:00

asteroid.dm

initial commit for table overhaul

2014-11-01 23:57:01 -07:00

atoms_movable.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

atoms.dm

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

communications.dm

Conflicts solving

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

data_huds.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

dna.dm

Fixes some roundstart runtimes relating to set_species().

2014-11-09 21:01:42 +01:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…