Cheridan 1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals ...

Revert "Simple animal force threshold no longer converts damage to brute"

2016-02-06 20:32:21 -06:00

..

area

Merge remote-tracking branch 'upstream/master' into blueprintsarea

2016-01-30 01:29:26 +00:00

gamemodes

Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals

2016-02-06 20:32:21 -06:00

machinery

Merge pull request #15154 from AnturK/brig_timers

2016-02-06 23:13:13 -03:00

mecha

Made changes to adjust with neersighted's fullscreen overlays pr.

2016-02-06 20:35:15 +01:00

objects

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

2016-02-06 20:38:16 +01:00

pooling

…

turfs

Merge pull request #15195 from GunHog/Hack_ALL_The_Tiles!

2016-02-06 01:37:40 -03:00

verbs

Merge Conflict Fix

2016-01-20 14:07:14 +02:00

asteroid.dm

Some fixes

2016-01-16 04:34:28 +09:00

atoms_movable.dm

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

2016-02-04 14:34:45 +01:00

atoms.dm

Made changes to adjust with neersighted's fullscreen overlays pr.

2016-02-06 20:35:15 +01:00

communications.dm

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

data_huds.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

dna.dm

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00