Alberyk 2c6dad2dd3 More bay merge fixes (#1243) ...

- Fixes #1227 
- Fixes #1236 
- Re-add lamarr.
- Fix bootknife thing
- Fix a couple of things related to borgs
- Re-add our tator items
- Adding back all the hardsuit modules back to robotics
- Fixing a couple of missing sprites, like fireaxe cabinet
- Fixed missing computer sprites when no power

2016-12-18 22:13:42 +02:00

..

effects

Final merge

2016-11-12 00:10:21 +02:00

items

More bay merge fixes (#1243)

2016-12-18 22:13:42 +02:00

random

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

structures

More bay merge fixes (#1243)

2016-12-18 22:13:42 +02:00

buckling.dm

Buckle Fixes (#880)

2016-09-15 12:05:08 +03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Final merge

2016-11-12 00:10:21 +02:00

items.dm

Fixing compile errors (#9)

2016-11-18 18:03:27 +02:00

objs.dm

Nanako's compile fixes (#25)

2016-11-30 18:28:58 +02:00

structures.dm

Final merge

2016-11-12 00:10:21 +02:00

weapons.dm

…