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
This commit is contained in:
Alberyk
2016-12-18 22:13:42 +02:00
committed by skull132
parent 535919aaa7
commit 2c6dad2dd3
22 changed files with 427 additions and 103 deletions
@@ -328,6 +328,7 @@
/obj/item/weapon/storage/backpack/duffel/tox
name = "scientist's duffel bag"
desc = "Handy when it comes to storing volatile materials of the anomalous persuasion."
icon_state = "duffel-toxins"
/obj/item/weapon/storage/backpack/duffel/sec
name = "security duffel bag"