Fix merge conflicts

This commit is contained in:
Arokha Sieyes
2018-07-21 11:34:54 -04:00
parent edf92c57f9
commit adbb5b86a5
3 changed files with 6 additions and 142 deletions
@@ -116,28 +116,14 @@
path = /obj/item/weapon/cell/device
/datum/gear/utility/implant
<<<<<<< HEAD
exploitable = 1
/* VOREStation Edit - Make languages great again
/datum/gear/utility/implant/eal //This does nothing if you don't actually know EAL.
display_name = "implant, language, EAL"
path = /obj/item/weapon/implant/language/eal
cost = 2
=======
>>>>>>> 8f9e817... Language and Larynx Additions (#5402)
slot = "implant"
exploitable = 1*/
exploitable = 1
/datum/gear/utility/implant/tracking
display_name = "implant, tracking"
path = /obj/item/weapon/implant/tracking/weak
<<<<<<< HEAD
cost = 0 //VOREStation Edit. Changed cost to 0
slot = "implant"
exploitable = 1
=======
cost = 10
/* VOREStation Edit - Make languages great again
/datum/gear/utility/implant/language
cost = 2
exploitable = 0
@@ -151,8 +137,7 @@
display_name = "vocal synthesizer, Skrellian"
description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it."
path = /obj/item/weapon/implant/language/skrellian
>>>>>>> 8f9e817... Language and Larynx Additions (#5402)
*/
/datum/gear/utility/pen
display_name = "Fountain Pen"
path = /obj/item/weapon/pen/fountain