Mantis blade (new traitor item) (NOW with fixed conflicts)

code/game/objects/items/mantis.dm

@@ -0,0 +1,41 @@
+/obj/item/mantis/blade
+	name = "mantis blade"
+	desc = "A blade designed to be hidden just beneath the skin. The brain is directly linked to this bad boy, allowing it to spring into action."
+	icon_state = "mantis"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	flags_1 = CONDUCT_1
+	force = 20
+	w_class = WEIGHT_CLASS_NORMAL
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "lacerated", "ripped", "diced", "cut")
+
+/obj/item/mantis/blade/equipped(mob/user, slot, initial)
+	. = ..()
+	if(slot != ITEM_SLOT_HANDS)
+		return
+	var/side = user.get_held_index_of_item(src)
+
+	if(side == LEFT_HANDS)
+		transform = null
+	else
+		transform = matrix(-1, 0, 0, 0, 1, 0)
+
+/obj/item/mantis/blade/attack(mob/living/M, mob/living/user, secondattack = FALSE)
+	. = ..()
+	var/obj/item/mantis/blade/secondsword = user.get_inactive_held_item()
+	if(istype(secondsword, /obj/item/mantis/blade) && !secondattack)
+		sleep(2)
+		secondsword.attack(M, user, TRUE)
+	return
+
+/obj/item/mantis/blade/syndicate
+	name = "G.O.R.L.E.X. mantis blade"
+	icon_state = "syndie_mantis"
+	force = 20
+	block_chance = 20
+
+/obj/item/mantis/blade/NT
+	name = "H.E.P.H.A.E.S.T.U.S. mantis blade"
+	icon_state = "mantis"
+	force = 18

code/game/objects/items/storage/briefcase.dm

@@ -47,3 +47,10 @@
 	new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
 	new /obj/item/suppressor/specialoffer(src)
 
+/obj/item/storage/briefcase/syndie_mantis
+	desc = "A sleek briefcase. It has the letters G.O.R.L.E.X. on it"
+
+/obj/item/storage/briefcase/syndie_mantis/PopulateContents()
+	..()
+	new /obj/item/autosurgeon/organ/syndicate/syndie_mantis(src)
+	new /obj/item/autosurgeon/organ/syndicate/syndie_mantis/l(src)

code/modules/surgery/organs/augments_arms.dm

@@ -233,3 +233,13 @@
 	name = "surgical toolset implant"
 	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
 	contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/surgical_drapes)
+
+/obj/item/organ/cyberimp/arm/syndie_mantis
+	name = "G.O.R.L.E.X. mantis blade implants"
+	desc = "Modernized mantis blades designed and coined by Tiger operatives. Energy actuators makes the blade a much deadlier weapon."
+	contents = newlist(/obj/item/mantis/blade/syndicate)
+	syndicate_implant = TRUE
+
+/obj/item/organ/cyberimp/arm/syndie_mantis/l
+	zone = BODY_ZONE_L_ARM
+	syndicate_implant = TRUE

code/modules/surgery/organs/autosurgeon.dm

@@ -98,5 +98,11 @@
 /obj/item/autosurgeon/medibeam
 	starting_organ = /obj/item/organ/cyberimp/arm/medibeam
 
+/obj/item/autosurgeon/organ/syndicate/syndie_mantis
+	starting_organ = /obj/item/organ/cyberimp/arm/syndie_mantis
+
+/obj/item/autosurgeon/organ/syndicate/syndie_mantis/l
+	starting_organ = /obj/item/organ/cyberimp/arm/syndie_mantis/l
+
 /obj/item/autosurgeon/plasmavessel //Yogs Start: Just an autosurgeon with a plasma vessel in it, used in /obj/item/storage/box/syndie_kit/xeno_organ_kit
 	starting_organ = /obj/item/organ/alien/plasmavessel //Yogs End

code/modules/uplink/uplink_items.dm

@@ -1710,6 +1710,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	surplus = 0
 	include_modes = list(/datum/game_mode/nuclear)
 
+/datum/uplink_item/implants/mantis_kit
+	name = "G.O.R.L.E.X.. Mantis Blades Kit"
+	desc = "Comes with 2 G.O.R.L.E.X. Mantis blades. All packaged with autosurgeons."
+	item = /obj/item/storage/briefcase/syndie_mantis
+	cost = 16
+	surplus = 0
+
 //Race-specific items
 /datum/uplink_item/race_restricted
 	category = "Species-Restricted"

yogstation.dme

@@ -947,6 +947,7 @@
 #include "code\game\objects\items\inducer.dm"
 #include "code\game\objects\items\kitchen.dm"
 #include "code\game\objects\items\latexballoon.dm"
+#include "code\game\objects\items\mantis.dm"
 #include "code\game\objects\items\manuals.dm"
 #include "code\game\objects\items\miscellaneous.dm"
 #include "code\game\objects\items\mop.dm"

yogstation/code/modules/uplink/uplink_item.dm

@@ -131,3 +131,10 @@
 	item = /obj/item/melee/fryingpan/bananium
 	cost = 40
 	cant_discount = TRUE
+
+/datum/uplink_item/implants/mantis_kit
+	name = "G.O.R.L.E.X.  Mantis Blades Kit"
+	desc = "Comes with 2 G.O.R.L.E.X.  Mantis blades. All packaged with autosurgeons."
+	item = /obj/item/storage/briefcase/syndie_mantis
+	cost = 18
+	surplus = 0