xxalpha 06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea

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

..

effects

Merge conflict fix

2016-01-27 17:38:42 +02:00

items

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

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

structures

Merge pull request #14698 from Firecage/absolutepathsandifs

2016-01-29 03:15:12 +03:00

buckling.dm

Fixes

2015-12-14 16:40:00 -06:00

empulse.dm

Pooling is good for the soul.

2015-11-17 11:27:26 -05:00

explosion.dm

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

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

items.dm

Fix space heater interaction

2016-01-25 12:03:18 -06:00

objs.dm

Allow relabeling any canister; port MULEbot to tgui

2016-01-18 14:21:56 -06:00

radiation.dm

Removes rad pulse admin notice

2015-12-10 04:26:56 -06:00

structures.dm

Chairs

2016-01-27 14:03:19 -06:00

weapons.dm

…