Merge large polaris changes

This commit is contained in:
Arokha Sieyes
2017-03-02 22:44:17 -05:00
213 changed files with 18973 additions and 17252 deletions

View File

@@ -20,8 +20,8 @@
var/active
/obj/machinery/computer/xenobio2/Destroy()
..()
injector.computer = null
..()
/obj/machinery/computer/xenobio2/attack_hand(mob/user)
if(..())
@@ -109,5 +109,5 @@
/obj/item/weapon/circuitboard/xenobio2computer
name = T_BOARD("injector control console")
build_path = /obj/item/weapon/circuitboard/xenobio2computer
origin_tech = list() //To be filled,
build_path = /obj/machinery/computer/xenobio2
origin_tech = list() //To be filled