diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index aab4d9df53..18064f83de 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -1,375 +1,3 @@
-<<<<<<< HEAD
-/obj/item/dnainjector
- name = "\improper DNA injector"
- desc = "This injects the person with DNA."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "dnainjector"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- throw_speed = 3
- throw_range = 5
- w_class = WEIGHT_CLASS_TINY
- origin_tech = "biotech=1"
-
- var/damage_coeff = 1
- var/list/fields
- var/list/add_mutations = list()
- var/list/remove_mutations = list()
-
- var/list/add_mutations_static = list()
- var/list/remove_mutations_static = list()
-
- var/used = 0
-
-/obj/item/dnainjector/attack_paw(mob/user)
- return attack_hand(user)
-
-/obj/item/dnainjector/proc/prepare()
- for(var/mut_key in add_mutations_static)
- add_mutations.Add(GLOB.mutations_list[mut_key])
- for(var/mut_key in remove_mutations_static)
- remove_mutations.Add(GLOB.mutations_list[mut_key])
-
-/obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
- prepare()
-
- if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE))
- M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
- var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
- for(var/datum/mutation/human/HM in remove_mutations)
- HM.force_lose(M)
- for(var/datum/mutation/human/HM in add_mutations)
- if(HM.name == RACEMUT)
- message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
- log_msg += " (MONKEY)"
- HM.force_give(M)
- if(fields)
- if(fields["name"] && fields["UE"] && fields["blood_type"])
- M.real_name = fields["name"]
- M.dna.unique_enzymes = fields["UE"]
- M.name = M.real_name
- M.dna.blood_type = fields["blood_type"]
- if(fields["UI"]) //UI+UE
- M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
- M.updateappearance(mutations_overlay_update=1)
- log_attack(log_msg)
- return TRUE
- return FALSE
-
-/obj/item/dnainjector/attack(mob/target, mob/user)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return
- if(used)
- to_chat(user, "This injector is used up!")
- return
- if(ishuman(target))
- var/mob/living/carbon/human/humantarget = target
- if (!humantarget.can_inject(user, 1))
- return
- add_logs(user, target, "attempted to inject", src)
-
- if(target != user)
- target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!")
- if(!do_mob(user, target) || used)
- return
- target.visible_message("[user] injects [target] with the syringe with [src]!", \
- "[user] injects [target] with the syringe with [src]!")
-
- else
- to_chat(user, "You inject yourself with [src].")
-
- add_logs(user, target, "injected", src)
-
- if(!inject(target, user)) //Now we actually do the heavy lifting.
- to_chat(user, "It appears that [target] does not have compatible DNA.")
-
- used = 1
- icon_state = "dnainjector0"
- desc += " This one is used up."
-
-
-/obj/item/dnainjector/antihulk
- name = "\improper DNA injector (Anti-Hulk)"
- desc = "Cures green skin."
- remove_mutations_static = list(HULK)
-
-/obj/item/dnainjector/hulkmut
- name = "\improper DNA injector (Hulk)"
- desc = "This will make you big and strong, but give you a bad skin condition."
- add_mutations_static = list(HULK)
-
-/obj/item/dnainjector/xraymut
- name = "\improper DNA injector (Xray)"
- desc = "Finally you can see what the Captain does."
- add_mutations_static = list(XRAY)
-
-/obj/item/dnainjector/antixray
- name = "\improper DNA injector (Anti-Xray)"
- desc = "It will make you see harder."
- remove_mutations_static = list(XRAY)
-
-/////////////////////////////////////
-/obj/item/dnainjector/antiglasses
- name = "\improper DNA injector (Anti-Glasses)"
- desc = "Toss away those glasses!"
- remove_mutations_static = list(BADSIGHT)
-
-/obj/item/dnainjector/glassesmut
- name = "\improper DNA injector (Glasses)"
- desc = "Will make you need dorkish glasses."
- add_mutations_static = list(BADSIGHT)
-
-/obj/item/dnainjector/epimut
- name = "\improper DNA injector (Epi.)"
- desc = "Shake shake shake the room!"
- add_mutations_static = list(EPILEPSY)
-
-/obj/item/dnainjector/antiepi
- name = "\improper DNA injector (Anti-Epi.)"
- desc = "Will fix you up from shaking the room."
- remove_mutations_static = list(EPILEPSY)
-////////////////////////////////////
-/obj/item/dnainjector/anticough
- name = "\improper DNA injector (Anti-Cough)"
- desc = "Will stop that aweful noise."
- remove_mutations_static = list(COUGH)
-
-/obj/item/dnainjector/coughmut
- name = "\improper DNA injector (Cough)"
- desc = "Will bring forth a sound of horror from your throat."
- add_mutations_static = list(COUGH)
-
-/obj/item/dnainjector/antidwarf
- name = "\improper DNA injector (Anti-Dwarfism)"
- desc = "Helps you grow big and strong."
- remove_mutations_static = list(DWARFISM)
-
-/obj/item/dnainjector/dwarf
- name = "\improper DNA injector (Dwarfism)"
- desc = "It's a small world after all."
- add_mutations_static = list(DWARFISM)
-
-/obj/item/dnainjector/clumsymut
- name = "\improper DNA injector (Clumsy)"
- desc = "Makes clown minions."
- add_mutations_static = list(CLOWNMUT)
-
-/obj/item/dnainjector/anticlumsy
- name = "\improper DNA injector (Anti-Clumsy)"
- desc = "Apply this for Security Clown."
- remove_mutations_static = list(CLOWNMUT)
-
-/obj/item/dnainjector/antitour
- name = "\improper DNA injector (Anti-Tour.)"
- desc = "Will cure tourrets."
- remove_mutations_static = list(TOURETTES)
-
-/obj/item/dnainjector/tourmut
- name = "\improper DNA injector (Tour.)"
- desc = "Gives you a nasty case of Tourette's."
- add_mutations_static = list(TOURETTES)
-
-/obj/item/dnainjector/stuttmut
- name = "\improper DNA injector (Stutt.)"
- desc = "Makes you s-s-stuttterrr"
- add_mutations_static = list(NERVOUS)
-
-/obj/item/dnainjector/antistutt
- name = "\improper DNA injector (Anti-Stutt.)"
- desc = "Fixes that speaking impairment."
- remove_mutations_static = list(NERVOUS)
-
-/obj/item/dnainjector/antifire
- name = "\improper DNA injector (Anti-Fire)"
- desc = "Cures fire."
- remove_mutations_static = list(COLDRES)
-
-/obj/item/dnainjector/firemut
- name = "\improper DNA injector (Fire)"
- desc = "Gives you fire."
- add_mutations_static = list(COLDRES)
-
-/obj/item/dnainjector/blindmut
- name = "\improper DNA injector (Blind)"
- desc = "Makes you not see anything."
- add_mutations_static = list(BLINDMUT)
-
-/obj/item/dnainjector/antiblind
- name = "\improper DNA injector (Anti-Blind)"
- desc = "IT'S A MIRACLE!!!"
- remove_mutations_static = list(BLINDMUT)
-
-/obj/item/dnainjector/antitele
- name = "\improper DNA injector (Anti-Tele.)"
- desc = "Will make you not able to control your mind."
- remove_mutations_static = list(TK)
-
-/obj/item/dnainjector/telemut
- name = "\improper DNA injector (Tele.)"
- desc = "Super brain man!"
- add_mutations_static = list(TK)
-
-/obj/item/dnainjector/telemut/darkbundle
- name = "\improper DNA injector"
- desc = "Good. Let the hate flow through you."
-
-/obj/item/dnainjector/deafmut
- name = "\improper DNA injector (Deaf)"
- desc = "Sorry, what did you say?"
- add_mutations_static = list(DEAFMUT)
-
-/obj/item/dnainjector/antideaf
- name = "\improper DNA injector (Anti-Deaf)"
- desc = "Will make you hear once more."
- remove_mutations_static = list(DEAFMUT)
-
-/obj/item/dnainjector/h2m
- name = "\improper DNA injector (Human > Monkey)"
- desc = "Will make you a flea bag."
- add_mutations_static = list(RACEMUT)
-
-/obj/item/dnainjector/m2h
- name = "\improper DNA injector (Monkey > Human)"
- desc = "Will make you...less hairy."
- remove_mutations_static = list(RACEMUT)
-
-/obj/item/dnainjector/antichameleon
- name = "\improper DNA injector (Anti-Chameleon)"
- remove_mutations_static = list(CHAMELEON)
-
-/obj/item/dnainjector/chameleonmut
- name = "\improper DNA injector (Chameleon)"
- add_mutations_static = list(CHAMELEON)
-
-/obj/item/dnainjector/antiwacky
- name = "\improper DNA injector (Anti-Wacky)"
- remove_mutations_static = list(WACKY)
-
-/obj/item/dnainjector/wackymut
- name = "\improper DNA injector (Wacky)"
- add_mutations_static = list(WACKY)
-
-/obj/item/dnainjector/antimute
- name = "\improper DNA injector (Anti-Mute)"
- remove_mutations_static = list(MUT_MUTE)
-
-/obj/item/dnainjector/mutemut
- name = "\improper DNA injector (Mute)"
- add_mutations_static = list(MUT_MUTE)
-
-/obj/item/dnainjector/antismile
- name = "\improper DNA injector (Anti-Smile)"
- remove_mutations_static = list(SMILE)
-
-/obj/item/dnainjector/smilemut
- name = "\improper DNA injector (Smile)"
- add_mutations_static = list(SMILE)
-
-/obj/item/dnainjector/unintelligablemut
- name = "\improper DNA injector (Unintelligable)"
- add_mutations_static = list(UNINTELLIGABLE)
-
-/obj/item/dnainjector/antiunintelligable
- name = "\improper DNA injector (Anti-Unintelligable)"
- remove_mutations_static = list(UNINTELLIGABLE)
-
-/obj/item/dnainjector/swedishmut
- name = "\improper DNA injector (Swedish)"
- add_mutations_static = list(SWEDISH)
-
-/obj/item/dnainjector/antiswedish
- name = "\improper DNA injector (Anti-Swedish)"
- remove_mutations_static = list(SWEDISH)
-
-/obj/item/dnainjector/chavmut
- name = "\improper DNA injector (Chav)"
- add_mutations_static = list(CHAV)
-
-/obj/item/dnainjector/antichav
- name = "\improper DNA injector (Anti-Chav)"
- remove_mutations_static = list(CHAV)
-
-/obj/item/dnainjector/elvismut
- name = "\improper DNA injector (Elvis)"
- add_mutations_static = list(ELVIS)
-
-/obj/item/dnainjector/antielvis
- name = "\improper DNA injector (Anti-Elvis)"
- remove_mutations_static = list(ELVIS)
-
-/obj/item/dnainjector/lasereyesmut
- name = "\improper DNA injector (Laser Eyes)"
- add_mutations_static = list(LASEREYES)
-
-/obj/item/dnainjector/antilasereyes
- name = "\improper DNA injector (Anti-Laser Eyes)"
- remove_mutations_static = list(LASEREYES)
-
-/obj/item/dnainjector/timed
- var/duration = 600
-
-/obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user)
- prepare()
- if(M.stat == DEAD) //prevents dead people from having their DNA changed
- to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.")
- return FALSE
-
- if(M.has_dna() && !(M.disabilities & NOCLONE))
- M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
- var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
- var/endtime = world.time+duration
- for(var/datum/mutation/human/HM in remove_mutations)
- if(HM.name == RACEMUT)
- if(ishuman(M))
- continue
- M = HM.force_lose(M)
- else
- HM.force_lose(M)
- for(var/datum/mutation/human/HM in add_mutations)
- if((HM in M.dna.mutations) && !(M.dna.temporary_mutations[HM.name]))
- continue //Skip permanent mutations we already have.
- if(HM.name == RACEMUT && ishuman(M))
- message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
- log_msg += " (MONKEY)"
- M = HM.force_give(M)
- else
- HM.force_give(M)
- M.dna.temporary_mutations[HM.name] = endtime
- if(fields)
- if(fields["name"] && fields["UE"] && fields["blood_type"])
- if(!M.dna.previous["name"])
- M.dna.previous["name"] = M.real_name
- if(!M.dna.previous["UE"])
- M.dna.previous["UE"] = M.dna.unique_enzymes
- if(!M.dna.previous["blood_type"])
- M.dna.previous["blood_type"] = M.dna.blood_type
- M.real_name = fields["name"]
- M.dna.unique_enzymes = fields["UE"]
- M.name = M.real_name
- M.dna.blood_type = fields["blood_type"]
- M.dna.temporary_mutations[UE_CHANGED] = endtime
- if(fields["UI"]) //UI+UE
- if(!M.dna.previous["UI"])
- M.dna.previous["UI"] = M.dna.uni_identity
- M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"])
- M.updateappearance(mutations_overlay_update=1)
- M.dna.temporary_mutations[UI_CHANGED] = endtime
- log_attack(log_msg)
- return TRUE
- else
- return FALSE
-
-/obj/item/dnainjector/timed/hulk
- name = "\improper DNA injector (Hulk)"
- desc = "This will make you big and strong, but give you a bad skin condition."
- add_mutations_static = list(HULK)
-
-/obj/item/dnainjector/timed/h2m
- name = "\improper DNA injector (Human > Monkey)"
- desc = "Will make you a flea bag."
- add_mutations_static = list(RACEMUT)
-=======
/obj/item/dnainjector
name = "\improper DNA injector"
desc = "This injects the person with DNA."
@@ -740,4 +368,3 @@
name = "\improper DNA injector (Human > Monkey)"
desc = "Will make you a flea bag."
add_mutations_static = list(RACEMUT)
->>>>>>> a479714... Adds missing span-endings (#30494)