tkdrg 0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs ...

Fixes bulldogs being unable to load special ammo

2016-02-06 14:19:35 -03:00

..

area

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

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

gamemodes

Merge pull request #15212 from Shadowlight213/lingcamo

2016-02-06 02:30:46 -06:00

machinery

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

mecha

Rework portable atmos; tgui portable pump

2016-02-05 17:06:00 -06:00

objects

Merge pull request #15216 from KorPhaeron/fixes_bulldogs

2016-02-06 14:19:35 -03: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 pull request #15009 from MrStonedOne/patch-141

2016-01-29 21:59:46 -03:00

atoms.dm

Merge pull request #15034 from AnturK/shuttle_templates

2016-01-31 13:33:30 -03:00

communications.dm

…

data_huds.dm

…

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