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
@@ -656,11 +656,7 @@ var/global/list/robot_modules = list(
LANGUAGE_SKRELLIAN = 0,
LANGUAGE_GUTTER = 1
)
sprites = list(
"Dread" = "securityrobot",
)
var/id
/obj/item/weapon/robot_module/syndicate/New(var/mob/living/silicon/robot/R)
loc = R
src.modules += new /obj/item/device/flash(src)
@@ -689,7 +685,7 @@ var/global/list/robot_modules = list(
id = null
return ..()
*/
/obj/item/weapon/robot_module/security/combat
/obj/item/weapon/robot_module/combat
name = "combat robot module"
channels = list("Security" = 1)
networks = list(NETWORK_SECURITY)