Compatability

This commit is contained in:
Unknown
2021-03-10 14:24:14 -05:00
parent 13889abe61
commit c92fbc73fe
3 changed files with 2 additions and 4 deletions
-4
View File
@@ -14,10 +14,6 @@
active_power_usage = 10000 //10 kW. It's a big all-body scanner.
light_color = "#00FF00"
var/obj/machinery/body_scanconsole/console
<<<<<<< HEAD
var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup, /obj/item/device/nif) //VOREStation Add - Backup Implant, NIF
=======
>>>>>>> 823d556... Merge pull request #7963 from MistakeNot4892/implants
var/printing_text = null
/obj/machinery/bodyscanner/Initialize()