Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

code/game/objects/items/implants/implant_misc.dm

@@ -27,8 +27,11 @@
 /obj/item/implanter/emp
 	name = "implanter" // Skyrat edit, was implanter (EMP)
 	imp_type = /obj/item/implant/emp
+<<<<<<< HEAD
 	special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit
 	special_desc = "A Syndicate implanter used for a EMP implant" // Skyrat edit
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 /obj/item/implant/radio
 	name = "internal radio implant"
@@ -88,6 +91,9 @@
 /obj/item/implanter/radio/syndicate
 	name = "implanter" // Skyrat edit , was originally implanter (internal syndicate radio)
 	imp_type = /obj/item/implant/radio/syndicate
+<<<<<<< HEAD
 	special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit
 	special_desc = "A Syndicate implanter used for a internal radio implant" // Skyrat edit
 
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3

code/game/objects/items/implants/implantcase.dm

@@ -1,7 +1,11 @@
 /**
  * Item used to store implants. Can be renamed with a pen. Implants are moved between those and implanters when a mob uses an implanter on a case.
  */
+<<<<<<< HEAD
 /obj/item/implantcase//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
+=======
+/obj/item/implantcase
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	name = "implant case"
 	desc = "A glass case containing an implant."
 	icon = 'icons/obj/medical/syringe.dmi'

code/game/objects/items/implants/implantchair.dm

@@ -55,7 +55,11 @@
 
 	return data
 
+<<<<<<< HEAD
 /obj/machinery/implantchair/ui_act(action, params)
+=======
+/obj/machinery/implantchair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return

code/game/objects/items/implants/implanter.dm

@@ -1,7 +1,11 @@
 /**
  * Players can use this item to put obj/item/implant's in living mobs. Can be renamed with a pen.
  */
+<<<<<<< HEAD
 /obj/item/implanter//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
+=======
+/obj/item/implanter
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	name = "implanter"
 	desc = "A sterile automatic implant injector."
 	icon = 'icons/obj/medical/syringe.dmi'

code/game/objects/items/implants/implantuplink.dm

@@ -53,6 +53,10 @@
 	imp = new imp_type(src, uplink_handler)
 	return ..()
 
+/obj/item/implanter/uplink/Initialize(mapload, uplink_handler)
+	imp = new imp_type(src, uplink_handler)
+	return ..()
+
 /obj/item/implanter/uplink/precharged
 	name = "implanter" // Skyrat edit , original was implanter (precharged uplink)
 	imp_type = /obj/item/implant/uplink/precharged