Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes

Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs

code/game/objects/structures/flora/flora.dm

@@ -233,6 +233,9 @@
 		. += "<span class='filter_notice'><i>You can see something in there...</i></span>"
 
 /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
+	if(issilicon(user))
+		return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
+	
 	if(stored_item)
 		to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>")
 		return

code/modules/reagents/reagent_containers/syringes.dm

@@ -298,6 +298,7 @@
 	var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
 	if(isnull(trans)) trans = 0
 	add_attack_logs(user,target,"Stabbed with [src.name] containing [contained], trasferred [trans] units")
+	if(!issilicon(user))
 		break_syringe(target, user)
 
 /obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)