Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595

2020-03-12 20:31:14 +01:00
parent 185a0b092e 245b7ed306
commit 8ccd0d2cbc
958 changed files with 221881 additions and 212761 deletions
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -8,6 +8,7 @@
 	var/desc = null
 	var/obj/target = null
 	var/check_flags = 0
+	var/required_mobility_flags = MOBILITY_USE
 	var/processing = FALSE
 	var/obj/screen/movable/action_button/button = null
 	var/buttontooltipstyle = ""
@@ -96,20 +97,23 @@

 /datum/action/proc/IsAvailable()
 	if(!owner)
-		return 0
+		return FALSE
+	var/mob/living/L = owner
+	if(istype(L) && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
+		return FALSE
 	if(check_flags & AB_CHECK_RESTRAINED)
 		if(owner.restrained())
-			return 0
+			return FALSE
 	if(check_flags & AB_CHECK_STUN)
-		if(owner.IsKnockdown() || owner.IsStun())
-			return 0
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE))
+			return FALSE
 	if(check_flags & AB_CHECK_LYING)
-		if(owner.lying)
-			return 0
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_STAND))
+			return FALSE
 	if(check_flags & AB_CHECK_CONSCIOUS)
 		if(owner.stat)
-			return 0
-	return 1
+			return FALSE
+	return TRUE

 /datum/action/proc/UpdateButtonIcon(status_only = FALSE, force = FALSE)
 	if(button)
@@ -422,6 +426,7 @@

 /datum/action/item_action/hands_free
 	check_flags = AB_CHECK_CONSCIOUS
+	required_mobility_flags = NONE

 /datum/action/item_action/hands_free/activate
 	name = "Activate"
@@ -430,7 +435,8 @@
 	name = "Shift Nerves"

 /datum/action/item_action/explosive_implant
-	check_flags = 0
+	check_flags = NONE
+	required_mobility_flags = NONE
 	name = "Activate Explosive Implant"

 /datum/action/item_action/toggle_research_scanner
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -136,7 +136,7 @@
 		fall_chance += 2
 	if(prob(fall_chance) && !owner.lying && !owner.buckled)
 		to_chat(owner, "<span class='warning'>Your leg gives out!</span>")
-		owner.Knockdown(35)
+		owner.DefaultCombatKnockdown(35)

 	else if(owner.get_active_held_item())
 		var/drop_chance = 1
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -13,7 +13,7 @@
 /datum/brain_trauma/special/godwoken/on_life()
 	..()
 	if(prob(4))
-		if(prob(33) && (owner.IsStun() || owner.IsKnockdown() || owner.IsUnconscious()))
+		if(prob(33) && owner.HighestImmobilityAmount())
 			speak("unstun", TRUE)
 		else if(prob(60) && owner.health <= owner.crit_threshold)
 			speak("heal", TRUE)
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -39,12 +39,18 @@
 	//title_image = ntitle_image

 /datum/browser/proc/add_stylesheet(name, file)
-	if(istype(name, /datum/asset/spritesheet))
+	if (istype(name, /datum/asset/spritesheet))
 		var/datum/asset/spritesheet/sheet = name
 		stylesheets["spritesheet_[sheet.name].css"] = "data/spritesheets/[sheet.name]"
 	else
-		stylesheets["[ckey(name)].css"] = file
-		register_asset("[ckey(name)].css", file)
+		var/asset_name = "[name].css"
+		stylesheets[asset_name] = file
+		if(!SSassets.cache[asset_name])
+			register_asset(asset_name, file)
+
+/datum/browser/proc/add_script(name, file)
+	scripts["[ckey(name)].js"] = file
+	register_asset("[ckey(name)].js", file)

 /datum/browser/proc/set_content(ncontent)
 	content = ncontent
--- a/code/datums/components/caltrop.dm
+++ b/code/datums/components/caltrop.dm
@@ -59,4 +59,4 @@
 						"<span class='userdanger'>You slide on [A]!</span>")

 			cooldown = world.time
-		H.Knockdown(60)
+		H.DefaultCombatKnockdown(60)
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -100,7 +100,7 @@
 		AM.forceMove(T)
 		if(isliving(AM))
 			var/mob/living/L = AM
-			L.Knockdown(100)
+			L.DefaultCombatKnockdown(100)
 			L.adjustBruteLoss(30)
 		falling_atoms -= AM

@@ -110,8 +110,7 @@
 		if (isliving(AM))
 			var/mob/living/L = AM
 			L.notransform = TRUE
-			L.Stun(200)
-			L.resting = TRUE
+			L.Paralyze(200)

 		var/oldtransform = AM.transform
 		var/oldcolor = AM.color
--- a/code/datums/components/crafting/recipes/recipes_clothing.dm
+++ b/code/datums/components/crafting/recipes/recipes_clothing.dm
@@ -33,11 +33,17 @@
 				/obj/item/organ/ears/cat = 1)
 	category = CAT_CLOTHING

+////////
+//Huds//
+////////
+
 /datum/crafting_recipe/hudsunsec
 	name = "Security HUDsunglasses"
 	result = /obj/item/clothing/glasses/hud/security/sunglasses
 	time = 20
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/security = 1,
+					/obj/item/clothing/glasses/sunglasses = 1)
 	reqs = list(/obj/item/clothing/glasses/hud/security = 1,
 				  /obj/item/clothing/glasses/sunglasses = 1,
 				  /obj/item/stack/cable_coil = 5)
@@ -56,9 +62,11 @@
 	result = /obj/item/clothing/glasses/hud/health/sunglasses
 	time = 20
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/health = 1,
+				/obj/item/clothing/glasses/sunglasses = 1)
 	reqs = list(/obj/item/clothing/glasses/hud/health = 1,
-				  /obj/item/clothing/glasses/sunglasses = 1,
-				  /obj/item/stack/cable_coil = 5)
+				/obj/item/clothing/glasses/sunglasses = 1,
+				/obj/item/stack/cable_coil = 5)
 	category = CAT_CLOTHING

 /datum/crafting_recipe/hudsunmedremoval
@@ -86,6 +94,27 @@
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
 	category = CAT_CLOTHING
+
+/datum/crafting_recipe/diagnostic_sunglasses
+	name = "Diagnostic HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	time = 20
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				/obj/item/clothing/glasses/sunglasses = 1)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/diagnostic_singlasses_removal
+	name = "Diagnostic HUDsunglasses removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
+	category = CAT_CLOTHING
+
 /* //Kevinz doesn't want it as a recipe for now, leaving it in if anything ever changes to let it in
 /datum/crafting_recipe/stunglasses
 	name = "Stunglasses"
@@ -130,7 +159,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 7,
 				/obj/item/stack/sheet/leather = 3)
 	time = 70
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_toolbelt
@@ -139,7 +167,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 5,
 				/obj/item/stack/sheet/leather = 2)
 	time = 30
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_bandolier
@@ -148,7 +175,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 6,
 				/obj/item/stack/sheet/leather = 2)
 	time = 50
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_helmet
@@ -157,7 +183,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 4,
 				/obj/item/stack/sheet/leather = 2)
 	time = 30
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_vest
@@ -166,7 +191,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 6,
 				/obj/item/stack/sheet/leather = 3)
 	time = 50
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_wintercoat
@@ -183,5 +207,4 @@
 	reqs = list(/obj/item/clothing/suit/hooded/wintercoat = 1,
 				/obj/item/bedsheet/cosmos = 1)
 	time = 60
-	always_availible = TRUE
 	category = CAT_CLOTHING
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -119,18 +119,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON

-/datum/crafting_recipe/switchblade_ms
-	name = "Switchblade"
-	result = /obj/item/switchblade/crafted
-	reqs = list(/obj/item/weaponcrafting/stock = 1,
-				/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/kitchen/knife = 1,
-				/obj/item/stack/cable_coil = 2)
-	tools = list(TOOL_WELDER)
-	time = 45
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
 //////////////////
 ///BOMB CRAFTING//
 //////////////////
@@ -310,19 +298,15 @@
 	subcategory = CAT_AMMO

 /datum/crafting_recipe/ashen_arrow
-	name = "Bonfire-Hardened Arrow"
+	name = "Fire Hardened Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/ashen
-	tools = list(/obj/structure/bonfire)
+	tools = list(TOOL_WELDER)
 	time = 30
 	always_availible = FALSE
 	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO

-/datum/crafting_recipe/ashen_arrow/welder
-	name = "Welder-Hardened Arrow"
-	tools = list(TOOL_WELDER)
-
 /datum/crafting_recipe/smartdart
 	name = "Medical smartdart"
 	result =  /obj/item/reagent_containers/syringe/dart
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -18,7 +18,7 @@
 	var/mob/living/LM = parent
 	var/v = volume
 	var/e = e_range
-	if(!T.footstep || LM.buckled || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING))
+	if(!T.footstep || LM.buckled || !CHECK_MOBILITY(LM, MOBILITY_STAND) || LM.buckled || LM.throwing || (LM.movement_type & (VENTCRAWLING | FLYING)))
 		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
 			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 		return
--- a/code/datums/components/jousting.dm
+++ b/code/datums/components/jousting.dm
@@ -54,7 +54,7 @@
 			msg += " and knocks [target] [target_buckled? "off of [target.buckled]" : "down"]"
 			if(target_buckled)
 				target.buckled.unbuckle_mob(target)
-			target.Knockdown(knockdown_time)
+			target.DefaultCombatKnockdown(knockdown_time)
 		if(length(msg))
 			user.visible_message("<span class='danger'>[msg]!</span>")

--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -42,7 +42,7 @@
 	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine)

 	for(var/mat in mat_list) //Make the assoc list ref | amount
-		var/datum/material/M = getmaterialref(mat) || mat
+		var/datum/material/M = SSmaterials.GetMaterialRef(mat)
 		materials[M] = 0

 /datum/component/material_container/proc/OnExamine(datum/source, mob/user, list/examine_list)
@@ -130,7 +130,7 @@
 /// For inserting an amount of material
 /datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	if(amt > 0 && has_space(amt))
 		var/total_amount_saved = total_amount
 		if(mat)
@@ -145,7 +145,7 @@
 /// Uses an amount of a specific material, effectively removing it.
 /datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	var/amount = materials[mat]
 	if(mat)
 		if(amount >= amt)
@@ -157,7 +157,7 @@
 /// Proc for transfering materials to another container.
 /datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	if((amt==0)||(!T)||(!mat))
 		return FALSE
 	if(amt<0)
@@ -190,7 +190,7 @@
 	for(var/x in mats) //Loop through all required materials
 		var/datum/material/req_mat = x
 		if(!istype(req_mat))
-			req_mat = getmaterialref(req_mat) //Get the ref if necesary
+			req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref if necesary
 		if(!materials[req_mat]) //Do we have the resource?
 			return FALSE //Can't afford it
 		var/amount_required = mats[x] * multiplier
@@ -251,7 +251,7 @@
 		var/datum/material/req_mat = x
 		if(!istype(req_mat))
 			if(ispath(req_mat)) //Is this an actual material, or is it a category?
-				req_mat = getmaterialref(req_mat) //Get the ref
+				req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref

 			else // Its a category. (For example MAT_CATEGORY_RIGID)
 				if(!has_enough_of_category(req_mat, mats[req_mat], multiplier)) //Do we have enough of this category?
@@ -316,5 +316,5 @@
 /// Returns the amount of a specific material in this container.
 /datum/component/material_container/proc/get_material_amount(var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	return(materials[mat])
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -240,7 +240,7 @@
 /datum/component/riding/human/force_dismount(mob/living/user)
 	var/atom/movable/AM = parent
 	AM.unbuckle_mob(user)
-	user.Knockdown(60)
+	user.DefaultCombatKnockdown(60)
 	user.visible_message("<span class='warning'>[AM] pushes [user] off of [AM.p_them()]!</span>")

 /datum/component/riding/cyborg
@@ -298,7 +298,7 @@
 	M.Move(targetm)
 	M.visible_message("<span class='warning'>[M] is thrown clear of [AM]!</span>")
 	M.throw_at(target, 14, 5, AM)
-	M.Knockdown(60)
+	M.DefaultCombatKnockdown(60)

 /datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, mob/living/riding_target_override)
 	var/list/equipped
@@ -341,7 +341,7 @@
 	var/mob/living/parent
 	var/selfdeleting = FALSE

-/obj/item/riding_offhand/dropped()
+/obj/item/riding_offhand/dropped(mob/user)
 	selfdeleting = TRUE
 	. = ..()

--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -22,7 +22,7 @@
 			return //undeads are unaffected by the spook-pocalypse.
 		if(istype(H.dna.species, /datum/species/zombie))
 			H.adjustStaminaLoss(25)
-			H.Knockdown(15) //zombies can't resist the doot
+			H.DefaultCombatKnockdown(15) //zombies can't resist the doot
 		C.Jitter(35)
 		C.stuttering = 20
 		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
@@ -36,7 +36,7 @@

 /datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
 	if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
-		H.Knockdown(20)
+		H.DefaultCombatKnockdown(20)
 		H.set_species(/datum/species/skeleton)
 		H.visible_message("<span class='warning'>[H] has given up on life as a mortal.</span>")
 		var/T = get_turf(H)
--- a/code/datums/components/storage/concrete/bag_of_holding.dm
+++ b/code/datums/components/storage/concrete/bag_of_holding.dm
@@ -11,7 +11,7 @@
 		var/turf/loccheck = get_turf(A)
 		if(is_reebe(loccheck.z))
 			user.visible_message("<span class='warning'>An unseen force knocks [user] to the ground!</span>", "<span class='big_brass'>\"I think not!\"</span>")
-			user.Knockdown(60)
+			user.DefaultCombatKnockdown(60)
 			return
 		if(istype(loccheck.loc, /area/fabric_of_reality))
 			to_chat(user, "<span class='danger'>You can't do that here!</span>")
@@ -25,7 +25,7 @@
 			for(var/mob/living/M in T)
 				if(M.movement_type & FLYING)
 					M.visible_message("<span class='danger'>The bluespace collapse crushes the air towards it, pulling [M] towards the ground...</span>")
-					M.Knockdown(5, TRUE, TRUE)		//Overrides stun absorbs.
+					M.DefaultCombatKnockdown(5, TRUE, TRUE)		//Overrides stun absorbs.
 			T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic)
 		for (var/obj/structure/ladder/unbreakable/binary/ladder in GLOB.ladders)
 			ladder.ActivateAlmonds()
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -409,7 +409,7 @@

 /datum/component/storage/proc/check_views()
 	for(var/mob/M in can_see_contents())
-		if(!isobserver(M) && !M.CanReach(src, view_only = TRUE))
+		if(!isobserver(M) && !M.CanReach(parent, view_only = TRUE))
 			close(M)

 /datum/component/storage/proc/emp_act(datum/source, severity)
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -287,7 +287,6 @@
 			G.fields["gender"]  = "Other"
 		L.fields["blood_type"]	= H.dna.blood_type
 		L.fields["b_dna"]		= H.dna.unique_enzymes
-		L.fields["enzymes"]		= H.dna.struc_enzymes
 		L.fields["identity"]	= H.dna.uni_identity
 		L.fields["species"]		= H.dna.species.type
 		L.fields["features"]	= H.dna.features
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -26,10 +26,10 @@
 /datum/proc/vv_get_dropdown()
 	. = list()
 	. += "---"
-	.["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=[REF(src)]"
-	.["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=[REF(src)]"
-	.["Delete"] = "?_src_=vars;[HrefToken()];delete=[REF(src)]"
-	.["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=[REF(src)]"
+	.["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]"
+	.["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]"
+	.["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]"
+	.["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]"


 /datum/proc/on_reagent_change(changetype)
@@ -54,7 +54,7 @@
 		return

 	var/title = ""
-	var/refid = REF(D)
+	var/refid = "\ref[D]"
 	var/icon/sprite
 	var/hash

@@ -62,8 +62,6 @@
 	if (!islist)
 		type = D.type

-
-
 	if(istype(D, /atom))
 		var/atom/AT = D
 		if(AT.icon && AT.icon_state)
@@ -410,7 +408,7 @@


 /client/proc/vv_update_display(datum/D, span, content)
-	src << output("[span]:[content]", "variables[REF(D)].browser:replace_span")
+	src << output("[span]:[content]", "variables\ref[D].browser:replace_span")


 #define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing )
@@ -423,9 +421,9 @@
 				name = DA[name] //name is really the index until this line
 			else
 				value = DA[name]
-			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];listedit=[REF(DA)];index=[index]'>E</a>) (<a href='?_src_=vars;[HrefToken()];listchange=[REF(DA)];index=[index]'>C</a>) (<a href='?_src_=vars;[HrefToken()];listremove=[REF(DA)];index=[index]'>-</a>) "
+			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];listedit=\ref[DA];index=[index]'>E</a>) (<a href='?_src_=vars;[HrefToken()];listchange=\ref[DA];index=[index]'>C</a>) (<a href='?_src_=vars;[HrefToken()];listremove=\ref[DA];index=[index]'>-</a>) "
 		else
-			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];datumedit=[REF(DA)];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;[HrefToken()];datumchange=[REF(DA)];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;[HrefToken()];datummass=[REF(DA)];varnamemass=[name]'>M</a>) "
+			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];datumedit=\ref[DA];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;[HrefToken()];datumchange=\ref[DA];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;[HrefToken()];datummass=\ref[DA];varnamemass=[name]'>M</a>) "
 	else
 		header = "<li>"

@@ -440,7 +438,7 @@
 		#ifdef VARSICON
 		var/icon/I = new/icon(value)
 		var/rnd = rand(1,10000)
-		var/rname = "tmp[REF(I)][rnd].png"
+		var/rname = "tmp\ref[I][rnd].png"
 		usr << browse_rsc(I, rname)
 		item = "[VV_HTML_ENCODE(name)] = (<span class='value'>[value]</span>) <img class=icon src=\"[rname]\">"
 		#else
@@ -453,9 +451,9 @@
 	else if (istype(value, /datum))
 		var/datum/D = value
 		if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D] [D.type]"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D] [D.type]"
 		else
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D.type]"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D.type]"

 	else if (islist(value))
 		var/list/L = value
@@ -473,9 +471,9 @@

 				items += debug_variable(key, val, level + 1, sanitize = sanitize)

-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a><ul>[items.Join()]</ul>"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a><ul>[items.Join()]</ul>"
 		else
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a>"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a>"

 	else if (name in GLOB.bitfields)
 		var/list/flags = list()
@@ -587,7 +585,7 @@
 		var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No")
 		if (prompt != "Yes" || !usr.client)
 			return
-		message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a <a href='?_src_=vars;[HrefToken(TRUE)];datumrefresh=[REF(thing)]'>VV window</a>")
+		message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a <a href='?_src_=vars;[HrefToken(TRUE)];datumrefresh=\ref[thing]'>VV window</a>")
 		log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [thing]")
 		to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window")
 		C.debug_variables(thing)
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -21,7 +21,7 @@
 		return FALSE


-	if(!(type in D.viable_mobtypes))
+	if(!D.viable_mobtypes[type])
 		return FALSE

 	return TRUE
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -18,7 +18,7 @@
 	var/stage_prob = 4

 	//Other
-	var/list/viable_mobtypes = list() //typepaths of viable mobs
+	var/list/viable_mobtypes = list() //typecache of viable mobs
 	var/mob/living/carbon/affected_mob = null
 	var/list/cures = list() //list of cures if the disease has the CURABLE flag, these are reagent ids
 	var/infectivity = 65
@@ -34,6 +34,10 @@
 	var/process_dead = FALSE //if this ticks while the host is dead
 	var/copy_type = null //if this is null, copies will use the type of the instance being copied

+/datum/disease/New(make_typecache = TRUE)
+	if(make_typecache && length(viable_mobtypes))
+		viable_mobtypes = typecacheof(viable_mobtypes)
+
 /datum/disease/Destroy()
 	. = ..()
 	if(affected_mob)
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -80,7 +80,8 @@

 */

-/datum/disease/advance/New()
+/datum/disease/advance/New(make_typecache = TRUE)
+	..()
 	Refresh()

 /datum/disease/advance/Destroy()
--- a/code/datums/diseases/advance/presets.dm
+++ b/code/datums/diseases/advance/presets.dm
@@ -2,7 +2,7 @@
 /datum/disease/advance/cold
 	copy_type = /datum/disease/advance

-/datum/disease/advance/cold/New()
+/datum/disease/advance/cold/New(make_typecache = TRUE)
 	name = "Cold"
 	symptoms = list(new/datum/symptom/sneeze)
 	..()
@@ -11,7 +11,7 @@
 /datum/disease/advance/flu
 	copy_type = /datum/disease/advance

-/datum/disease/advance/flu/New()
+/datum/disease/advance/flu/New(make_typecache = TRUE)
 	name = "Flu"
 	symptoms = list(new/datum/symptom/cough)
 	..()
@@ -21,7 +21,7 @@
 	name = "Experimental Disease"
 	copy_type = /datum/disease/advance

-/datum/disease/advance/random/New(max_symptoms, max_level = 8)
+/datum/disease/advance/random/New(make_typecache = TRUE, max_symptoms, max_level = 8)
 	if(!max_symptoms)
 		max_symptoms = rand(1, VIRUS_SYMPTOM_LIMIT)
 	var/list/datum/symptom/possible_symptoms = list()
@@ -37,6 +37,6 @@
 		if(chosen_symptom)
 			var/datum/symptom/S = new chosen_symptom
 			symptoms += S
-	Refresh()

-	name = "Sample #[rand(1,10000)]"
+	name = "Sample #[rand(1,10000)]"
+	..()
--- a/code/datums/diseases/advance/symptoms/genetics.dm
+++ b/code/datums/diseases/advance/symptoms/genetics.dm
@@ -61,12 +61,12 @@ Bonus
 		symptom_delay_max = 60
 	if(A.properties["resistance"] >= 8) //mutate twice
 		power = 2
-	possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT]
+	possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT]
 	var/mob/living/carbon/M = A.affected_mob
 	if(M)
 		if(!M.has_dna())
 			return
-		archived_dna = M.dna.struc_enzymes
+		archived_dna = M.dna.mutation_index

 // Give them back their old DNA when cured.
 /datum/symptom/genetic_mutation/End(datum/disease/advance/A)
@@ -77,5 +77,5 @@ Bonus
 		if(M && archived_dna)
 			if(!M.has_dna())
 				return
-			M.dna.struc_enzymes = archived_dna
+			M.dna.mutation_index = archived_dna
 			M.domutcheck()
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -257,6 +257,8 @@
 /datum/symptom/heal/coma/End(datum/disease/advance/A)
 	if(!..())
 		return
+	if(active_coma)
+		uncoma()
 	REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)

 /datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
@@ -277,9 +279,9 @@
 /datum/symptom/heal/coma/proc/coma(mob/living/M)
 	if(deathgasp)
 		M.emote("deathgasp")
-	M.fakedeath("regenerative_coma")
+	M.fakedeath("regenerative_coma", TRUE)
 	M.update_stat()
-	M.update_canmove()
+	M.update_mobility()
 	addtimer(CALLBACK(src, .proc/uncoma, M), 300)

 /datum/symptom/heal/coma/proc/uncoma(mob/living/M)
@@ -288,7 +290,7 @@
 	active_coma = FALSE
 	M.cure_fakedeath("regenerative_coma")
 	M.update_stat()
-	M.update_canmove()
+	M.update_mobility()

 /datum/symptom/heal/coma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = 4 * actual_power
--- a/code/datums/diseases/heart_failure.dm
+++ b/code/datums/diseases/heart_failure.dm
@@ -44,7 +44,7 @@
 					if(prob(25))
 						affected_mob.vomit(95)
 					H.emote("cough")
-					H.Knockdown(40)
+					H.DefaultCombatKnockdown(40)
 					H.losebreath += 4
 				if(prob(3))
 					to_chat(H, "<span class='danger'>You feel very weak and dizzy...</span>")
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -13,7 +13,7 @@
 	stage_prob = 2
 	var/restcure = 0

-/datum/disease/dna_retrovirus/New()
+/datum/disease/dna_retrovirus/New(make_typecache = TRUE)
 	..()
 	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
 	if(prob(40))
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -2,7 +2,6 @@
 /////////////////////////// DNA DATUM
 /datum/dna
 	var/unique_enzymes
-	var/struc_enzymes
 	var/uni_identity
 	var/blood_type
 	var/datum/species/species = new /datum/species/human //The type of mutant race the player is if applicable (i.e. potato-man)
@@ -11,10 +10,13 @@
 	var/nameless = FALSE
 	var/custom_species	//siiiiigh I guess this is important
 	var/list/mutations = list()   //All mutations are from now on here
-	var/list/temporary_mutations = list() //Timers for temporary mutations
+	var/list/temporary_mutations = list() //Temporary changes to the UE
 	var/list/previous = list() //For temporary name/ui/ue/blood_type modifications
 	var/mob/living/holder
 	var/delete_species = TRUE //Set to FALSE when a body is scanned by a cloner to fix #38875
+	var/mutation_index[DNA_MUTATION_BLOCKS] //List of which mutations this carbon has and its assigned block
+	var/stability = 100
+	var/scrambled = FALSE //Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers.

 /datum/dna/New(mob/living/new_holder)
 	if(istype(new_holder))
@@ -42,8 +44,8 @@
 	destination.dna.unique_enzymes = unique_enzymes
 	destination.dna.uni_identity = uni_identity
 	destination.dna.blood_type = blood_type
-	destination.dna.features = features.Copy()
 	destination.set_species(species.type, icon_update=0)
+	destination.dna.features = features.Copy()
 	destination.dna.real_name = real_name
 	destination.dna.nameless = nameless
 	destination.dna.custom_species = custom_species
@@ -51,13 +53,14 @@
 	if(ishuman(destination))
 		var/mob/living/carbon/human/H = destination
 		H.give_genitals(TRUE)//This gives the body the genitals of this DNA. Used for any transformations based on DNA
-	destination.flavor_text = destination.dna.features["flavor_text"] //Update the flavor_text to use new dna text
 	if(transfer_SE)
-		destination.dna.struc_enzymes = struc_enzymes
+		destination.dna.mutation_index = mutation_index
+
+	SEND_SIGNAL(destination, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, src, transfer_SE)

 /datum/dna/proc/copy_dna(datum/dna/new_dna)
 	new_dna.unique_enzymes = unique_enzymes
-	new_dna.struc_enzymes = struc_enzymes
+	new_dna.mutation_index = mutation_index
 	new_dna.uni_identity = uni_identity
 	new_dna.blood_type = blood_type
 	new_dna.features = features.Copy()
@@ -67,26 +70,32 @@
 	new_dna.custom_species = custom_species
 	new_dna.mutations = mutations.Copy()

-/datum/dna/proc/add_mutation(mutation_name)
-	var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name]
-	HM.on_acquiring(holder)
+//See mutation.dm for what 'class' does. 'time' is time till it removes itself in decimals. 0 for no timer
+/datum/dna/proc/add_mutation(mutation, class = MUT_OTHER, time)
+	var/mutation_type = mutation
+	if(istype(mutation, /datum/mutation/human))
+		var/datum/mutation/human/HM = mutation
+		mutation_type = HM.type
+	if(get_mutation(mutation_type))
+		return
+	return force_give(new mutation_type (class, time, copymut = mutation))

-/datum/dna/proc/remove_mutation(mutation_name)
-	var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name]
-	HM.on_losing(holder)
+/datum/dna/proc/remove_mutation(mutation_type)
+	return force_lose(get_mutation(mutation_type))

-/datum/dna/proc/check_mutation(mutation_name)
-	var/datum/mutation/human/HM = GLOB.mutations_list[mutation_name]
-	return mutations.Find(HM)
+/datum/dna/proc/check_mutation(mutation_type)
+	return get_mutation(mutation_type)

-/datum/dna/proc/remove_all_mutations()
-	remove_mutation_group(mutations)
+/datum/dna/proc/remove_all_mutations(list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE)
+	remove_mutation_group(mutations, classes, mutadone)
+	scrambled = FALSE

-/datum/dna/proc/remove_mutation_group(list/group)
+/datum/dna/proc/remove_mutation_group(list/group, list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE)
 	if(!group)
 		return
 	for(var/datum/mutation/human/HM in group)
-		HM.force_lose(holder)
+		if((HM.class in classes) && !(HM.mutadone_proof && mutadone))
+			force_lose(HM)

 /datum/dna/proc/generate_uni_identity()
 	. = ""
@@ -136,19 +145,49 @@
 			. += random_string(DNA_BLOCK_SIZE,GLOB.hex_characters)
 	return .

-/datum/dna/proc/generate_struc_enzymes()
-	var/list/sorting = new /list(DNA_STRUC_ENZYMES_BLOCKS)
-	var/result = ""
-	for(var/datum/mutation/human/A in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations)
-		if(A.name == RACEMUT && ismonkey(holder))
-			sorting[A.dna_block] = num2hex(A.lowest_value + rand(0, 256 * 6), DNA_BLOCK_SIZE)
-			mutations |= A
-		else
-			sorting[A.dna_block] = random_string(DNA_BLOCK_SIZE, list("0","1","2","3","4","5","6"))
+/datum/dna/proc/generate_dna_blocks()
+	var/bonus
+	if(species && species.inert_mutation)
+		bonus = GET_INITIALIZED_MUTATION(species.inert_mutation)
+	var/list/mutations_temp = GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations + bonus
+	if(!LAZYLEN(mutations_temp))
+		return
+	mutation_index.Cut()
+	shuffle_inplace(mutations_temp)
+	if(ismonkey(holder))
+		mutations |= new RACEMUT(MUT_NORMAL)
+		mutation_index[RACEMUT] = GET_SEQUENCE(RACEMUT)
+	else
+		mutation_index[RACEMUT] = create_sequence(RACEMUT, FALSE)
+	for(var/i in 2 to DNA_MUTATION_BLOCKS)
+		var/datum/mutation/human/M = mutations_temp[i]
+		mutation_index[M.type] = create_sequence(M.type, FALSE,M.difficulty)
+	shuffle_inplace(mutation_index)

-	for(var/B in sorting)
-		result += B
-	return result
+//Used to generate original gene sequences for every mutation
+/proc/generate_gene_sequence(length=4)
+	var/static/list/active_sequences = list("AT","TA","GC","CG")
+	var/sequence
+	for(var/i in 1 to length*DNA_SEQUENCE_LENGTH)
+		sequence += pick(active_sequences)
+	return sequence
+
+//Used to create a chipped gene sequence
+/proc/create_sequence(mutation, active, difficulty)
+	if(!difficulty)
+		var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation) //leaves the possibility to change difficulty mid-round
+		if(!A)
+			return
+		difficulty = A.difficulty
+	difficulty += rand(-2,4)
+	var/sequence = GET_SEQUENCE(mutation)
+	if(active)
+		return sequence
+	while(difficulty)
+		var/randnum = rand(1, length(sequence))
+		sequence = copytext(sequence, 1, randnum) + "X" + copytext(sequence, randnum+1, length(sequence)+1)
+		difficulty--
+	return sequence

 /datum/dna/proc/generate_unique_enzymes()
 	. = ""
@@ -201,12 +240,57 @@
 		if(DNA_TAUR_BLOCK)
 			construct_block(GLOB.taur_list.Find(features["taur"]), GLOB.taur_list.len)

+//Please use add_mutation or activate_mutation instead
+/datum/dna/proc/force_give(datum/mutation/human/HM)
+	if(holder && HM)
+		if(HM.class == MUT_NORMAL)
+			set_se(1, HM)
+		. = HM.on_acquiring(holder)
+		if(.)
+			qdel(HM)
+		update_instability()
+
+//Use remove_mutation instead
+/datum/dna/proc/force_lose(datum/mutation/human/HM)
+	if(holder && (HM in mutations))
+		set_se(0, HM)
+		. = HM.on_losing(holder)
+		update_instability(FALSE)
+		return
+
 /datum/dna/proc/is_same_as(datum/dna/D)
-	if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name && nameless == D.nameless && custom_species == D.custom_species)
+	if(uni_identity == D.uni_identity && mutation_index == D.mutation_index && real_name == D.real_name && nameless == D.nameless && custom_species == D.custom_species)
 		if(species.type == D.species.type && features == D.features && blood_type == D.blood_type)
 			return 1
 	return 0

+/datum/dna/proc/update_instability(alert=TRUE)
+	stability = 100
+	for(var/datum/mutation/human/M in mutations)
+		if(M.class == MUT_EXTRA)
+			stability -= M.instability * GET_MUTATION_STABILIZER(M)
+	if(holder)
+		var/message
+		if(alert)
+			switch(stability)
+				if(70 to 90)
+					message = "<span class='warning'>You shiver.</span>"
+				if(60 to 69)
+					message = "<span class='warning'>You feel cold.</span>"
+				if(40 to 59)
+					message = "<span class='warning'>You feel sick.</span>"
+				if(20 to 39)
+					message = "<span class='warning'>It feels like your skin is moving.</span>"
+				if(1 to 19)
+					message = "<span class='warning'>You can feel your cells burning.</span>"
+				if(-INFINITY to 0)
+					message = "<span class='boldwarning'>You can feel your DNA exploding, we need to do something fast!</span>"
+		if(stability <= 0)
+			holder.apply_status_effect(STATUS_EFFECT_DNA_MELT)
+		if(message)
+			to_chat(holder, message)
+
+
 //used to update dna UI, UE, and dna.real_name.
 /datum/dna/proc/update_dna_identity()
 	uni_identity = generate_uni_identity()
@@ -217,8 +301,8 @@
 		blood_type = newblood_type
 	unique_enzymes = generate_unique_enzymes()
 	uni_identity = generate_uni_identity()
-	struc_enzymes = generate_struc_enzymes()
-	features = random_features()
+	generate_dna_blocks()
+	features = random_features(species?.id)


 /datum/dna/stored //subtype used by brain mob's stored_dna
@@ -232,10 +316,10 @@
 /datum/dna/stored/check_mutation(mutation_name)
 	return

-/datum/dna/stored/remove_all_mutations()
+/datum/dna/stored/remove_all_mutations(list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE)
 	return

-/datum/dna/stored/remove_mutation_group(list/group)
+/datum/dna/stored/remove_mutation_group(list/group, list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE)
 	return

 /////////////////////////// DNA MOB-PROCS //////////////////////
@@ -270,6 +354,7 @@
 	if(icon_update)
 		update_body()
 		update_hair()
+		update_body_parts()
 		update_mutations_overlay()// no lizard with human hulk overlay please.


@@ -280,11 +365,10 @@
 	return dna


-/mob/living/carbon/human/proc/hardset_dna(ui, se, newreal_name, newblood_type, datum/species/mrace, newfeatures)
+/mob/living/carbon/human/proc/hardset_dna(ui, list/mutation_index, newreal_name, newblood_type, datum/species/mrace, newfeatures)

 	if(newfeatures)
 		dna.features = newfeatures
-		flavor_text = dna.features["flavor_text"] //Update the flavor_text to use new dna text

 	if(mrace)
 		var/datum/species/newrace = new mrace.type
@@ -302,10 +386,12 @@
 		dna.uni_identity = ui
 		updateappearance(icon_update=0)

-	if(se)
-		dna.struc_enzymes = se
+	if(LAZYLEN(mutation_index))
+		dna.mutation_index = mutation_index.Copy()
 		domutcheck()

+	SEND_SIGNAL(src, COMSIG_HUMAN_HARDSET_DNA, ui, mutation_index, newreal_name, newblood_type, mrace, newfeatures)
+
 	if(mrace || newfeatures || ui)
 		update_body()
 		update_hair()
@@ -355,19 +441,63 @@
 /mob/proc/domutcheck()
 	return

-/mob/living/carbon/domutcheck(force_powers=0) //Set force_powers to 1 to bypass the power chance
+/mob/living/carbon/domutcheck()
 	if(!has_dna())
 		return

-	for(var/datum/mutation/human/A in GLOB.good_mutations | GLOB.bad_mutations | GLOB.not_good_mutations)
-		if(ismob(A.check_block(src, force_powers)))
+	for(var/mutation in dna.mutation_index)
+		if(ismob(dna.check_block(mutation)))
 			return //we got monkeyized/humanized, this mob will be deleted, no need to continue.

 	update_mutations_overlay()

+/datum/dna/proc/check_block(mutation)
+	var/datum/mutation/human/HM = get_mutation(mutation)
+	if(check_block_string(mutation))
+		if(!HM)
+			. = add_mutation(mutation, MUT_NORMAL)
+		return
+	return force_lose(HM)
+
+//Return the active mutation of a type if there is one
+/datum/dna/proc/get_mutation(A)
+	for(var/datum/mutation/human/HM in mutations)
+		if(HM.type == A)
+			return HM
+
+/datum/dna/proc/check_block_string(mutation)
+	if((LAZYLEN(mutation_index) > DNA_MUTATION_BLOCKS) || !(mutation in mutation_index))
+		return 0
+	return is_gene_active(mutation)
+
+/datum/dna/proc/is_gene_active(mutation)
+	return (mutation_index[mutation] == GET_SEQUENCE(mutation))
+
+/datum/dna/proc/set_se(on=TRUE, datum/mutation/human/HM)
+	if(!HM || !(HM.type in mutation_index) || (LAZYLEN(mutation_index) < DNA_MUTATION_BLOCKS))
+		return
+	. = TRUE
+	if(on)
+		mutation_index[HM.type] = GET_SEQUENCE(HM.type)
+	else if(GET_SEQUENCE(HM.type) == mutation_index[HM.type])
+		mutation_index[HM.type] = create_sequence(HM.type, FALSE, HM.difficulty)
+
+/datum/dna/proc/activate_mutation(mutation) //note that this returns a boolean and not a new mob
+	if(!mutation)
+		return FALSE
+	var/mutation_type = mutation
+	if(istype(mutation, /datum/mutation/human))
+		var/datum/mutation/human/M = mutation
+		mutation_type = M.type
+	if(!mutation_in_sequence(mutation_type)) //cant activate what we dont have, use add_mutation
+		return FALSE
+	add_mutation(mutation, MUT_NORMAL)
+	return TRUE
+


 /////////////////////////// DNA HELPER-PROCS //////////////////////////////
+
 /proc/getleftblocks(input,blocknumber,blocksize)
 	if(blocknumber > 1)
 		return copytext_char(input,1,((blocksize*blocknumber)-(blocksize-1)))
@@ -384,29 +514,47 @@
 		return 0
 	return getleftblocks(istring, blocknumber, blocksize) + replacement + getrightblocks(istring, blocknumber, blocksize)

+/datum/dna/proc/mutation_in_sequence(mutation)
+	if(!mutation)
+		return
+	if(istype(mutation, /datum/mutation/human))
+		var/datum/mutation/human/HM = mutation
+		if(HM.type in mutation_index)
+			return TRUE
+	else if(mutation in mutation_index)
+		return TRUE
+
 /mob/living/carbon/proc/randmut(list/candidates, difficulty = 2)
 	if(!has_dna())
 		return
-	var/datum/mutation/human/num = pick(candidates)
-	. = num.force_give(src)
+	var/mutation = pick(candidates)
+	. = dna.add_mutation(mutation)

-/mob/living/carbon/proc/randmutb()
+/mob/living/carbon/proc/easy_randmut(quality = POSITIVE + NEGATIVE + MINOR_NEGATIVE, scrambled = TRUE, sequence = TRUE, exclude_monkey = TRUE)
 	if(!has_dna())
 		return
-	var/datum/mutation/human/HM = pick((GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.mutations_list[RACEMUT])
-	. = HM.force_give(src)
+	var/list/mutations = list()
+	if(quality & POSITIVE)
+		mutations += GLOB.good_mutations
+	if(quality & NEGATIVE)
+		mutations += GLOB.bad_mutations
+	if(quality & MINOR_NEGATIVE)
+		mutations += GLOB.not_good_mutations
+	var/list/possible = list()
+	for(var/datum/mutation/human/A in mutations)
+		if((!sequence || dna.mutation_in_sequence(A.type)) && !dna.get_mutation(A.type))
+			possible += A.type
+	if(exclude_monkey)
+		possible.Remove(RACEMUT)
+	if(LAZYLEN(possible))
+		var/mutation = pick(possible)
+		. = dna.activate_mutation(mutation)
+		if(scrambled)
+			var/datum/mutation/human/HM = dna.get_mutation(mutation)
+			if(HM)
+				HM.scrambled = TRUE
+		return TRUE

-/mob/living/carbon/proc/randmutg()
-	if(!has_dna())
-		return
-	var/datum/mutation/human/HM = pick(GLOB.good_mutations)
-	. = HM.force_give(src)
-
-/mob/living/carbon/proc/randmutvg()
-	if(!has_dna())
-		return
-	var/datum/mutation/human/HM = pick((GLOB.good_mutations) - GLOB.mutations_list[HULK] - GLOB.mutations_list[DWARFISM])
-	. = HM.force_give(src)

 /mob/living/carbon/proc/randmuti()
 	if(!has_dna())
@@ -429,9 +577,9 @@
 	if(!M.has_dna())
 		return 0
 	if(se)
-		for(var/i=1, i<=DNA_STRUC_ENZYMES_BLOCKS, i++)
+		for(var/i=1, i<=DNA_MUTATION_BLOCKS, i++)
 			if(prob(probability))
-				M.dna.struc_enzymes = setblock(M.dna.struc_enzymes, i, random_string(DNA_BLOCK_SIZE, GLOB.hex_characters))
+				M.dna.generate_dna_blocks()
 		M.domutcheck()
 	if(ui)
 		for(var/i=1, i<=DNA_UNI_IDENTITY_BLOCKS, i++)
@@ -458,3 +606,41 @@
 	return value

 /////////////////////////// DNA HELPER-PROCS
+
+/mob/living/carbon/human/proc/something_horrible()
+	if(!has_dna()) //shouldn't ever happen anyway so it's just in really weird cases
+		return
+	if(dna.stability > 0)
+		return
+	var/instability = -dna.stability
+	dna.remove_all_mutations()
+	dna.stability = 100
+	if(prob(max(70-instability,0)))
+		switch(rand(0,3)) //not complete and utter death
+			if(0)
+				monkeyize()
+			if(1)
+				gain_trauma(/datum/brain_trauma/severe/paralysis)
+			if(2)
+				corgize()
+			if(3)
+				to_chat(src, "<span class='notice'>Oh, we actually feel quite alright!</span>")
+	else
+		switch(rand(0,3))
+			if(0)
+				gib()
+			if(1)
+				dust()
+
+			if(2)
+				death()
+				petrify(INFINITY)
+			if(3)
+				if(prob(90))
+					var/obj/item/bodypart/BP = get_bodypart(pick(BODY_ZONE_CHEST,BODY_ZONE_HEAD))
+					if(BP)
+						BP.dismember()
+					else
+						gib()
+				else
+					set_species(/datum/species/dullahan)
--- a/code/datums/elements/flavor_text.dm
+++ b/code/datums/elements/flavor_text.dm
@@ -0,0 +1,146 @@
+GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
+
+/datum/element/flavor_text
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	id_arg_index = 3
+	var/flavor_name = "Flavor Text"
+	var/list/texts_by_atom = list()
+	var/addendum = "This can also be used for OOC notes and preferences!"
+	var/always_show = FALSE
+	var/max_len = MAX_FLAVOR_LEN
+	var/can_edit = TRUE
+
+/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE)
+	. = ..()
+
+	if(. == ELEMENT_INCOMPATIBLE || !isatom(target)) //no reason why this shouldn't work on atoms too.
+		return ELEMENT_INCOMPATIBLE
+
+	if(_max_len)
+		max_len = _max_len
+	texts_by_atom[target] = copytext(text, 1, max_len)
+	if(_name)
+		flavor_name = _name
+	if(!isnull(addendum))
+		addendum = _addendum
+	always_show = _always_show
+	can_edit = _edit
+
+	RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/show_flavor)
+
+	if(can_edit && ismob(target)) //but only mobs receive the proc/verb for the time being
+		var/mob/M = target
+		LAZYOR(GLOB.mobs_with_editable_flavor_text[M], src)
+		M.verbs |= /mob/proc/manage_flavor_tests
+
+/datum/element/flavor_text/Detach(atom/A)
+	. = ..()
+	UnregisterSignal(A, COMSIG_PARENT_EXAMINE)
+	texts_by_atom -= A
+	if(can_edit && ismob(A))
+		var/mob/M = A
+		LAZYREMOVE(GLOB.mobs_with_editable_flavor_text[M], src)
+		if(!GLOB.mobs_with_editable_flavor_text[M])
+			GLOB.mobs_with_editable_flavor_text -= M
+			M.verbs -= /mob/proc/manage_flavor_tests
+
+/datum/element/flavor_text/proc/show_flavor(atom/target, mob/user, list/examine_list)
+	if(!always_show && isliving(target))
+		var/mob/living/L = target
+		var/unknown = L.get_visible_name() == "Unknown"
+		if(!unknown && iscarbon(target))
+			var/mob/living/carbon/C = L
+			unknown = (C.wear_mask && (C.wear_mask.flags_inv & HIDEFACE)) || (C.head && (C.head.flags_inv & HIDEFACE))
+		if(unknown)
+			if(!("...?" in examine_list)) //can't think of anything better in case of multiple flavor texts.
+				examine_list += "...?"
+			return
+	var/text = texts_by_atom[target]
+	if(!text)
+		return
+	var/msg = replacetext(text, "\n", " ")
+	if(length_char(msg) <= 40)
+		examine_list += "<span class='notice'>[msg]</span>"
+	else
+		examine_list += "<span class='notice'>[copytext_char(msg, 1, 37)]... <a href='?src=[REF(src)];show_flavor=[REF(target)]'>More...</span></a>"
+
+/datum/element/flavor_text/Topic(href, href_list)
+	. = ..()
+	if(.)
+		return
+	if(href_list["show_flavor"])
+		var/atom/target = locate(href_list["show_flavor"])
+		var/text = texts_by_atom[target]
+		if(text)
+			usr << browse("<HTML><HEAD><TITLE>[target.name]</TITLE></HEAD><BODY><TT>[replacetext(texts_by_atom[target], "\n", "<BR>")]</TT></BODY></HTML>", "window=[target.name];size=500x200")
+			onclose(usr, "[target.name]")
+		return TRUE
+
+/mob/proc/manage_flavor_tests()
+	set name = "Manage Flavor Texts"
+	set desc = "Used to manage your various flavor texts."
+	set category = "IC"
+
+	var/list/L = GLOB.mobs_with_editable_flavor_text[src]
+
+	if(length(L) == 1)
+		var/datum/element/flavor_text/F = L[1]
+		F.set_flavor(src)
+		return
+
+	var/list/choices = list()
+
+	for(var/i in L)
+		var/datum/element/flavor_text/F = i
+		choices[F.flavor_name] = F
+
+	var/chosen = input(src, "Which flavor text would you like to modify?") as null|anything in choices
+	if(!chosen)
+		return
+	var/datum/element/flavor_text/F = choices[chosen]
+	F.set_flavor(src)
+
+/datum/element/flavor_text/proc/set_flavor(mob/user)
+	if(!(user in texts_by_atom))
+		return FALSE
+
+	var/lower_name = lowertext(flavor_name)
+	var/new_text = stripped_multiline_input(user, "Set the [lower_name] displayed on 'examine'. [addendum]", flavor_name, texts_by_atom[usr], max_len, TRUE)
+	if(!isnull(new_text) && (user in texts_by_atom))
+		texts_by_atom[user] = html_decode(new_text)
+		to_chat(src, "Your [lower_name] has been updated.")
+		return TRUE
+	return FALSE
+
+//subtypes with additional hooks for DNA and preferences.
+/datum/element/flavor_text/carbon
+
+/datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE)
+	if(!iscarbon(target))
+		return ELEMENT_INCOMPATIBLE
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE)
+		return
+	RegisterSignal(target, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, .proc/update_dna_flavor_text)
+	if(ishuman(target))
+		RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, .proc/update_prefs_flavor_text)
+		RegisterSignal(target, COMSIG_HUMAN_HARDSET_DNA, .proc/update_dna_flavor_text)
+		RegisterSignal(target, COMSIG_HUMAN_ON_RANDOMIZE, .proc/unset_flavor)
+
+/datum/element/flavor_text/carbon/Detach(mob/living/carbon/C)
+	. = ..()
+	UnregisterSignal(C, list(COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, COMSIG_HUMAN_PREFS_COPIED_TO, COMSIG_HUMAN_HARDSET_DNA, COMSIG_HUMAN_ON_RANDOMIZE))
+
+/datum/element/flavor_text/carbon/proc/update_dna_flavor_text(mob/living/carbon/C)
+	texts_by_atom[C] = C.dna.features["flavor_text"]
+
+/datum/element/flavor_text/carbon/proc/update_prefs_flavor_text(mob/living/carbon/human/H, datum/preferences/P, icon_updates = TRUE, roundstart_checks = TRUE)
+	texts_by_atom[H] = P.features["flavor_text"]
+
+/datum/element/flavor_text/carbon/set_flavor(mob/living/carbon/user)
+	. = ..()
+	if(. && user.dna)
+		user.dna.features["flavor_text"] = texts_by_atom[user]
+
+/datum/element/flavor_text/carbon/proc/unset_flavor(mob/living/carbon/user)
+	texts_by_atom[user] = ""
--- a/code/datums/elements/mob_holder.dm
+++ b/code/datums/elements/mob_holder.dm
@@ -138,7 +138,7 @@
 			destination = get_turf(loc)
 		AM.forceMove(destination)

-/obj/item/clothing/head/mob_holder/dropped()
+/obj/item/clothing/head/mob_holder/dropped(mob/user)
 	. = ..()
 	if(held_mob && isturf(loc))//don't release on soft-drops
 		release()
--- a/code/datums/elements/sword_point.dm
+++ b/code/datums/elements/sword_point.dm
@@ -0,0 +1,18 @@
+/datum/element/sword_point
+	element_flags = ELEMENT_DETACH
+
+/datum/element/sword_point/Attach(datum/target)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE)
+		return
+	if(!istype(target))
+		return ELEMENT_INCOMPATIBLE
+	RegisterSignal(target, COMSIG_ITEM_ALT_AFTERATTACK, .proc/point)
+
+/datum/element/sword_point/Detach(datum/source)
+	. = ..()
+	UnregisterSignal(source, COMSIG_ITEM_ALT_AFTERATTACK)
+
+/datum/element/sword_point/proc/point(datum/source, atom/target, mob/user, proximity_flag, params)
+	if(!proximity_flag && ismob(target))
+		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -118,7 +118,8 @@
 				if(DEAD)
 					to_chat(user, "<span class='notice'>You cannot [key] while dead.</span>")
 			return FALSE
-		if(restraint_check && (user.IsStun() || user.IsKnockdown()))
+		var/mob/living/L = user
+		if(restraint_check && (istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE)))
 			if(!intentional)
 				return FALSE
 			to_chat(user, "<span class='notice'>You cannot [key] while stunned.</span>")
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -5,23 +5,20 @@
 	var/id = "" //ID, used by mind/has_martialartcode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proc
 	var/current_target
 	var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
-	var/deflection_chance = 0 //Chance to deflect projectiles
-	var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
 	var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
-	var/dodge_chance = 0
 	var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
 	var/help_verb
 	var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist.
 	var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts

 /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	return 0
+	return FALSE

 /datum/martial_art/proc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	return 0
+	return FALSE

 /datum/martial_art/proc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	return 0
+	return FALSE

 /datum/martial_art/proc/can_use(mob/living/carbon/human/H)
 	return TRUE
@@ -38,51 +35,6 @@
 	current_target = new_target
 	streak = ""

-/datum/martial_art/proc/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D)
-
-	var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
-
-	var/atk_verb = A.dna.species.attack_verb
-	if(D.lying)
-		atk_verb = "kick"
-
-	switch(atk_verb)
-		if("kick")
-			A.do_attack_animation(D, ATTACK_EFFECT_KICK)
-		if("slash")
-			A.do_attack_animation(D, ATTACK_EFFECT_CLAW)
-		if("smash")
-			A.do_attack_animation(D, ATTACK_EFFECT_SMASH)
-		else
-			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-
-	if(!damage)
-		playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1)
-		D.visible_message("<span class='warning'>[A] has attempted to [atk_verb] [D]!</span>", \
-			"<span class='userdanger'>[A] has attempted to [atk_verb] [D]!</span>", null, COMBAT_MESSAGE_RANGE)
-		log_combat(A, D, "attempted to [atk_verb]")
-		return 0
-
-	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
-	var/armor_block = D.run_armor_check(affecting, "melee")
-
-	playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)
-	D.visible_message("<span class='danger'>[A] has [atk_verb]ed [D]!</span>", \
-			"<span class='userdanger'>[A] has [atk_verb]ed [D]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-	D.apply_damage(damage, BRUTE, affecting, armor_block)
-
-	log_combat(A, D, "punched")
-
-	if((D.stat != DEAD) && damage >= A.dna.species.punchstunthreshold)
-		D.visible_message("<span class='danger'>[A] has knocked [D] down!!</span>", \
-								"<span class='userdanger'>[A] has knocked [D] down!</span>")
-		D.apply_effect(40, EFFECT_KNOCKDOWN, armor_block)
-		D.forcesay(GLOB.hit_appends)
-	else if(D.lying)
-		D.forcesay(GLOB.hit_appends)
-	return 1
-
 /datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)
 	if(!istype(H) || !H.mind)
 		return FALSE
@@ -121,3 +73,7 @@
 	if(help_verb)
 		H.verbs -= help_verb
 	return
+
+///Gets called when a projectile hits the owner. Returning anything other than BULLET_ACT_HIT will stop the projectile from hitting the mob.
+/datum/martial_art/proc/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+	return BULLET_ACT_HIT
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -42,19 +42,19 @@
 /datum/martial_art/cqc/proc/Slam(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
-	if(!D.stat || !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] slams [D] into the ground!</span>", \
 						  	"<span class='userdanger'>[A] slams you into the ground!</span>")
 		playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, 1, -1)
 		D.apply_damage(10, BRUTE)
-		D.Knockdown(120)
+		D.DefaultCombatKnockdown(120)
 		log_combat(A, D, "slammed (CQC)")
 	return TRUE

 /datum/martial_art/cqc/proc/Kick(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
-	if(!D.stat || !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] kicks [D] back!</span>", \
 							"<span class='userdanger'>[A] kicks you back!</span>")
 		playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
@@ -62,7 +62,7 @@
 		D.throw_at(throw_target, 1, 14, A)
 		D.apply_damage(10, BRUTE)
 		log_combat(A, D, "kicked (CQC)")
-	if(D.IsKnockdown() && !D.stat)
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND) && CHECK_MOBILITY(D, MOBILITY_USE))
 		log_combat(A, D, "knocked out (Head kick)(CQC)")
 		D.visible_message("<span class='warning'>[A] kicks [D]'s head, knocking [D.p_them()] out!</span>", \
 					  		"<span class='userdanger'>[A] kicks your head, knocking you out!</span>")
@@ -119,7 +119,7 @@
 		D.grabbedby(A, 1)
 		if(old_grab_state == GRAB_PASSIVE)
 			D.drop_all_held_items()
-			A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
+			A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent
 			log_combat(A, D, "grabbed", addition="aggressively")
 			D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
 								"<span class='userdanger'>[A] violently grabs you!</span>")
@@ -136,7 +136,7 @@
 	A.do_attack_animation(D)
 	var/picked_hit_type = pick("CQC'd", "Big Bossed")
 	var/bonus_damage = 13
-	if(D.IsKnockdown() || D.resting || D.lying)
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND))
 		bonus_damage += 5
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)
@@ -147,12 +147,12 @@
 	D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
 					  "<span class='userdanger'>[A] [picked_hit_type] you!</span>")
 	log_combat(A, D, "[picked_hit_type] (CQC)")
-	if(A.resting && !D.stat && !D.IsKnockdown())
+	if(!CHECK_MOBILITY(A, MOBILITY_STAND) && !D.stat && CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \
 							"<span class='userdanger'>[A] leg sweeps you!</span>")
 		playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 		D.apply_damage(10, BRUTE)
-		D.Knockdown(60)
+		D.DefaultCombatKnockdown(60)
 		log_combat(A, D, "sweeped (CQC)")
 	return TRUE

@@ -164,7 +164,7 @@
 	if(check_streak(A,D))
 		return TRUE
 	if(prob(65))
-		if(!D.stat || !D.IsKnockdown() || !restraining)
+		if(CHECK_MOBILITY(D, MOBILITY_MOVE) || !restraining)
 			I = D.get_active_held_item()
 			D.visible_message("<span class='warning'>[A] strikes [D]'s jaw with their hand!</span>", \
 								"<span class='userdanger'>[A] strikes your jaw, disorienting you!</span>")
@@ -185,7 +185,7 @@
 		D.SetSleeping(400)
 		restraining = FALSE
 		if(A.grab_state < GRAB_NECK)
-			A.grab_state = GRAB_NECK
+			A.setGrabState(GRAB_NECK)
 	else
 		restraining = FALSE
 		return FALSE
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -96,13 +96,13 @@
 	return 0

 /datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(D.lying || D.IsKnockdown())
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND))
 		return 0
 	D.visible_message("<span class='warning'>[A] leg sweeps [D]!</span>", \
 					  	"<span class='userdanger'>[A] leg sweeps you!</span>")
 	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 	D.apply_damage(5, BRUTE)
-	D.Knockdown(40, override_hardstun = 0.01, override_stamdmg = 25)
+	D.DefaultCombatKnockdown(40, override_hardstun = 0.01, override_stamdmg = 25)
 	log_combat(A, D, "leg sweeped")
 	return 1

@@ -138,7 +138,7 @@
 	log_combat(A, D, "punched")
 	var/picked_hit_type = pick("punches", "kicks")
 	var/bonus_damage = 10
-	if(D.IsKnockdown() || D.resting || D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		bonus_damage += 5
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)
--- a/code/datums/martial/mushpunch.dm
+++ b/code/datums/martial/mushpunch.dm
@@ -16,7 +16,7 @@
 	playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1)
 	var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 	D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
-	D.Knockdown(20)
+	D.DefaultCombatKnockdown(20)
 	if(atk_verb)
 		log_combat(A, D, "[atk_verb] (Mushroom Punch)")
 	return TRUE
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -12,16 +12,16 @@
 	if(findtext(streak,TORNADO_COMBO))
 		streak = ""
 		Tornado(A,D)
-		return 1
+		return TRUE
 	if(findtext(streak,THROWBACK_COMBO))
 		streak = ""
 		Throwback(A,D)
-		return 1
+		return TRUE
 	if(findtext(streak,PLASMA_COMBO))
 		streak = ""
 		Plasma(A,D)
-		return 1
-	return 0
+		return TRUE
+	return FALSE

 /datum/martial_art/plasma_fist/proc/TornadoAnimate(mob/living/carbon/human/A)
 	set waitfor = FALSE
@@ -66,23 +66,20 @@
 /datum/martial_art/plasma_fist/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("H",D)
 	if(check_streak(A,D))
-		return 1
-	basic_hit(A,D)
-	return 1
+		return TRUE
+	return FALSE

 /datum/martial_art/plasma_fist/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("D",D)
 	if(check_streak(A,D))
-		return 1
-	basic_hit(A,D)
-	return 1
+		return TRUE
+	return FALSE

 /datum/martial_art/plasma_fist/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("G",D)
 	if(check_streak(A,D))
-		return 1
-	basic_hit(A,D)
-	return 1
+		return TRUE
+	return FALSE

 /mob/living/carbon/human/proc/plasma_fist_help()
 	set name = "Recall Teachings"
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -34,10 +34,10 @@
 						log_combat(A, D, "grabbed", addition="aggressively")
 						D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
 						  "<span class='userdanger'>[A] violently grabs you!</span>")
-						A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
+						A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab
 					else
 						log_combat(A, D, "grabbed", addition="passively")
-						A.grab_state = GRAB_PASSIVE
+						A.setGrabState(GRAB_PASSIVE)
 		if(4)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = "headbutts"
@@ -49,7 +49,7 @@
 			if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
 				D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
 			A.Stun(rand(10,45))
-			D.Knockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
+			D.DefaultCombatKnockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
 		if(5,6)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = pick("punches", "kicks", "hits", "slams into")
@@ -59,10 +59,10 @@
 			playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1)
 			var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 			D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
-			D.Knockdown(60)
+			D.DefaultCombatKnockdown(60)
 		if(7,8)
-			basic_hit(A,D)
+			return FALSE

 	if(atk_verb)
 		log_combat(A, D, "[atk_verb] (Psychotic Brawling)")
-	return 1
+	return TRUE
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -1,14 +1,15 @@
-#define SIDE_KICK_COMBO "DH"
+#define REPULSE_PUNCH_COMBO "HDHD"
 #define SHOULDER_FLIP_COMBO "GHDGHH"
 #define FOOT_SMASH_COMBO "HH"
+#define SIDE_KICK_COMBO "skick"
+#define DEFT_SWITCH_COMBO "deft"

 /datum/martial_art/the_rising_bass
 	name = "The Rising Bass"
 	id = MARTIALART_RISINGBASS
-	dodge_chance = 100
 	allow_temp_override = FALSE
 	help_verb = /mob/living/carbon/human/proc/rising_bass_help
-	var/datum/action/risingbassmove/repulsepunch = new/datum/action/risingbassmove/repulsepunch()
+	var/datum/action/risingbassmove/sidekick = new/datum/action/risingbassmove/sidekick()
 	var/datum/action/risingbassmove/deftswitch = new/datum/action/risingbassmove/deftswitch()
 	var/repulsecool = 0

@@ -16,24 +17,24 @@
 	if(findtext(streak,SIDE_KICK_COMBO))
 		streak = ""
 		sideKick(A,D)
-		return 1
+		return TRUE
 	if(findtext(streak,SHOULDER_FLIP_COMBO))
 		streak = ""
 		shoulderFlip(A,D)
-		return 1
-	if(findtext(streak,"rplse"))
+		return TRUE
+	if(findtext(streak,REPULSE_PUNCH_COMBO))
 		streak = ""
 		repulsePunch(A,D)
-		return 1
+		return TRUE
 	if(findtext(streak,FOOT_SMASH_COMBO))
 		streak = ""
 		footSmash(A,D)
-		return 1
-	if(findtext(streak,"deft"))
+		return TRUE
+	if(findtext(streak,DEFT_SWITCH_COMBO))
 		streak = ""
 		deftSwitch(A,D)
-		return 1
-	return 0
+		return TRUE
+	return FALSE


 //Repulse Punch - Slams the opponent far away from you.
@@ -58,42 +59,46 @@
 		to_chat(H,"<span class='danger'>You get ready to use the [name] maneuver!</span>")
 		H.mind.martial_art.streak = "[movestreak]"

-/datum/action/risingbassmove/repulsepunch
-	name = "Repulse Punch"
-	button_icon_state = "repulsepunch"
-	movestreak = "rplse"
+/datum/action/risingbassmove/sidekick
+	name = "Side Kick"
+	button_icon_state = "sidekick"
+	movestreak = "skick"

 /datum/action/risingbassmove/deftswitch
 	name = "Deft Switch"
 	button_icon_state = "deftswitch"
 	movestreak = "deft"

+/datum/martial_art/the_rising_bass/proc/checkfordensity(turf/T,mob/M)
+	if (T.density)
+		return FALSE
+	for(var/obj/O in T)
+		if(!O.CanPass(M,T))
+			return FALSE
+	return TRUE

 /datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || D.lying == 0)
-		var/turf/H = get_step(D, A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH))
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
+		var/dir = A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH)
+		var/oppdir = dir == NORTH ? SOUTH : dir == SOUTH ? NORTH : dir == EAST ? WEST : EAST
+		var/turf/H = get_step(D, dir)
+		var/turf/K = get_step(D, oppdir)
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the side, sliding them over!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the side, forcing you to step away!</span>")
 		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 		D.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
-		D.Knockdown(60)
-		var/L = H
-		for(var/obj/i in H.contents)
-			if(!istype(i,/mob) && i.density == 1)
-				L = D.loc
+		D.DefaultCombatKnockdown(60)
+		var/L = !checkfordensity(H,D) ? (!checkfordensity(K,D) ? D.loc : K) : H
 		D.forceMove(L)
 		log_combat(A, D, "side kicked (Rising Bass)")
-		return 1
-	return basic_hit(A,D)
+		return TRUE
+	return TRUE

 /datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		var/turf/H = get_step(A, get_dir(D,A))
-		var/L = H
-		for(var/obj/i in H.contents)
-			if(!istype(i,/mob) && i.density == 1)//(i.anchored == 1 && i.density == 1) || istype(i,/obj/structure) || istype(i,/turf/closed)
-				L = A.loc
+		var/L = checkfordensity(H,D) ? H : A.loc
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] flips [D] over their shoulder, slamming them into the ground!</span>", \
 						  "<span class='userdanger'>[A] flips you over their shoulder, slamming you into the ground!</span>")
@@ -102,14 +107,14 @@
 		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
 		D.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
 		D.Sleeping(60)
-		D.Knockdown(300)
+		D.DefaultCombatKnockdown(300)
 		D.forceMove(L)
 		log_combat(A, D, "shoulder flipped (Rising Bass)")
-		return 1
-	return basic_hit(A,D)
+		return TRUE
+	return FALSE

 /datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying || repulsecool > world.time)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND) && repulsecool < world.time)
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] smashes [D] in the chest, throwing them away!</span>", \
 						  "<span class='userdanger'>[A] smashes you in the chest, repelling you away!</span>")
@@ -117,14 +122,14 @@
 		var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A)))
 		D.throw_at(F, 10, 1)
 		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
-		D.Knockdown(90)
+		D.DefaultCombatKnockdown(90)
 		log_combat(A, D, "repulse punched (Rising Bass)")
 		repulsecool = world.time + 3 SECONDS
-		return 1
-	return basic_hit(A,D)
+		return TRUE
+	return FALSE

 /datum/martial_art/the_rising_bass/proc/footSmash(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] smashes their foot down on [D]'s foot!</span>", \
 						  "<span class='userdanger'>[A] smashes your foot!</span>")
@@ -132,11 +137,11 @@
 		D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
 		D.dropItemToGround(D.get_active_held_item())
 		log_combat(A, D, "foot smashed (Rising Bass)")
-		return 1
-	return basic_hit(A,D)
+		return TRUE
+	return FALSE

 /datum/martial_art/the_rising_bass/proc/deftSwitch(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		if (D.get_active_held_item())
 			var/obj/item/G = D.get_active_held_item()
 			if (G && !(G.item_flags & (ABSTRACT|DROPDEL)) && D.temporarilyRemoveItemFromInventory(G))
@@ -144,34 +149,48 @@
 				D.visible_message("<span class='warning'>[A] slaps [D]'s hands, taking [G] from them!</span>", \
 					"<span class='userdanger'>[A] slaps you, taking [G] from you!</span>")
 				log_combat(A, D, "deft switched (Rising Bass)")
-				return 1
+				return TRUE
 			else
 				to_chat(A, "<i>[G] can't be taken out of [D]'s hands!</i>")
-	return 0
+	return FALSE

 /datum/martial_art/the_rising_bass/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("D",D)
 	if(check_streak(A,D))
-		return 1
+		return TRUE
 	return ..()

 /datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("H",D)
 	if(check_streak(A,D))
-		return 1
+		return TRUE
 	return ..()

 /datum/martial_art/the_rising_bass/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("G",D)
 	if(check_streak(A,D))
-		return 1
+		return TRUE
 	return ..()

 /datum/martial_art/the_rising_bass/add_to_streak(element,mob/living/carbon/human/D)
-	if (streak == "deft" || streak == "rplse")
+	if (streak == DEFT_SWITCH_COMBO || streak == SIDE_KICK_COMBO)
 		return
 	. = ..()

+/datum/martial_art/the_rising_bass/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+	. = ..()
+	if(A.incapacitated(FALSE, TRUE)) //NO STUN
+		return BULLET_ACT_HIT
+	if(!(A.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
+		return BULLET_ACT_HIT
+	if(A.dna && A.dna.check_mutation(HULK)) //NO HULK
+		return BULLET_ACT_HIT
+	if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS!
+		return BULLET_ACT_HIT
+	A.visible_message("<span class='danger'>[A] dodges the projectile cleanly, they're immune to ranged weapons!</span>", "<span class='userdanger'>You dodge out of the way of the projectile!</span>")
+	playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
+	return BULLET_ACT_FORCE_PIERCE
+
 /mob/living/carbon/human/proc/rising_bass_help()
 	set name = "Recall Teachings"
 	set desc = "Remember the martial techniques of the Rising Bass clan."
@@ -179,24 +198,24 @@

 	to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Rising Bass...</i></b>")

-	to_chat(usr, "<span class='notice'>Side Kick</span>: Disarm Harm. Forces opponent to step to the side.")
+	to_chat(usr, "<span class='notice'>Side Kick</span>: Forces opponent to step to the side.")
 	to_chat(usr, "<span class='notice'>Shoulder Flip</span>: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.")
-	to_chat(usr, "<span class='notice'>Repulse Punch</span>: Grab Harm Grab Harm. Slams the opponent far away from you.")
+	to_chat(usr, "<span class='notice'>Repulse Punch</span>: Harm Disarm Harm Disarm. Slams the opponent far away from you.")
 	to_chat(usr, "<span class='notice'>Foot Smash</span>: Harm Harm. Stuns opponent, minor damage.")
-	to_chat(usr, "<span class='notice'>Deft Switch</span>: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")
+	to_chat(usr, "<span class='notice'>Deft Switch</span>: Switches the opponent's held item for your own. Most useful with nothing in your hand.")

 /datum/martial_art/the_rising_bass/teach(mob/living/carbon/human/H, make_temporary = FALSE)
 	. = ..()
 	if(!.)
 		return
 	deftswitch.Grant(H)
-	repulsepunch.Grant(H)
+	sidekick.Grant(H)
 	ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
 	ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)

 /datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
 	. = ..()
 	deftswitch.Remove(H)
-	repulsepunch.Remove(H)
+	sidekick.Remove(H)
 	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
-	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -1,141 +1,101 @@
-#define WRIST_WRENCH_COMBO "DD"
-#define BACK_KICK_COMBO "HG"
-#define STOMACH_KNEE_COMBO "GH"
-#define HEAD_KICK_COMBO "DHH"
-#define ELBOW_DROP_COMBO "HDHDH"
+#define STRONG_PUNCH_COMBO "HH"
+#define LAUNCH_KICK_COMBO "HD"
+#define DROP_KICK_COMBO "HG"

 /datum/martial_art/the_sleeping_carp
 	name = "The Sleeping Carp"
 	id = MARTIALART_SLEEPINGCARP
-	deflection_chance = 100
-	reroute_deflection = TRUE
 	allow_temp_override = FALSE
 	help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
-	var/old_grab_state = null

 /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(findtext(streak,WRIST_WRENCH_COMBO))
+	if(findtext(streak,STRONG_PUNCH_COMBO))
 		streak = ""
-		wristWrench(A,D)
+		strongPunch(A,D)
 		return TRUE
-	if(findtext(streak,BACK_KICK_COMBO))
+	if(findtext(streak,LAUNCH_KICK_COMBO))
 		streak = ""
-		backKick(A,D)
+		launchKick(A,D)
 		return TRUE
-	if(findtext(streak,STOMACH_KNEE_COMBO))
+	if(findtext(streak,DROP_KICK_COMBO))
 		streak = ""
-		kneeStomach(A,D)
-		return TRUE
-	if(findtext(streak,HEAD_KICK_COMBO))
-		streak = ""
-		headKick(A,D)
-		return TRUE
-	if(findtext(streak,ELBOW_DROP_COMBO))
-		streak = ""
-		elbowDrop(A,D)
+		dropKick(A,D)
 		return TRUE
 	return FALSE

-/datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsStun() && !D.IsKnockdown())
-		log_combat(A, D, "wrist wrenched (Sleeping Carp)")
-		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-		D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \
-						  "<span class='userdanger'>[A] grabs your wrist and violently wrenches it to the side!</span>")
-		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-		D.emote("scream")
-		D.dropItemToGround(D.get_active_held_item())
-		D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-		D.Knockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
-		return TRUE
-	return basic_hit(A,D)
+///Gnashing Teeth: Harm Harm, consistent 20 force punch on every second harm punch, has a chance to crit
+/datum/martial_art/the_sleeping_carp/proc/strongPunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	///this var is so that the strong punch is always aiming for the body part the user is targeting and not trying to apply to the chest before deviating
+	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+	var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam")
+	///this is the critical hit damage added to the attack if it rolls, it starts at 0 because it'll be changed when rolled
+	var/crit_damage = 0
+	D.visible_message("<span class='danger'>[A] [atk_verb]s [D]!</span>", \
+					"<span class='userdanger'>[A] [atk_verb]s you!</span>", null, null, A)
+	to_chat(A, "<span class='danger'>You [atk_verb] [D]!</span>")
+	if(prob(10))
+		crit_damage += 20
+		playsound(get_turf(D), 'sound/weapons/bite.ogg', 50, TRUE, -1)
+		D.visible_message("<span class='warning'>[D] sputters blood as the blow strikes them with inhuman force!</span>", "<span class='userdanger'>You are struck with incredible precision by [A]!</span>")
+		log_combat(A, D, "critcal strong punched (Sleeping Carp)")//log it here because a critical can swing for 40 force and it's important for the sake of how hard they hit
+	else
+		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+		log_combat(A, D, "strong punched (Sleeping Carp)")//so as to not double up on logging
+	D.apply_damage(20 + crit_damage, BRUTE, affecting)
+	return

-/datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
-		if(A.dir == D.dir)
-			log_combat(A, D, "back-kicked (Sleeping Carp)")
-			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-			D.visible_message("<span class='warning'>[A] kicks [D] in the back!</span>", \
-							  "<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>")
-			step_to(D,get_step(D,D.dir),1)
-			D.Knockdown(80)
-			playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
-			return TRUE
-		else
-			log_combat(A, D, "missed a back-kick (Sleeping Carp) on")
-			D.visible_message("<span class='warning'>[A] tries to kick [D] in the back, but misses!</span>", \
-								"<span class='userdanger'>[A] tries to kick you in the back, but misses!</span>")
-	return basic_hit(A,D)
+///Crashing Wave Kick: Harm Disarm combo, throws people seven tiles backwards
+/datum/martial_art/the_sleeping_carp/proc/launchKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+	D.visible_message("<span class='warning'>[A] kicks [D] square in the chest, sending them flying!</span>", \
+					"<span class='userdanger'>You are kicked square in the chest by [A], sending you flying!</span>", "<span class='hear'>You hear a sickening sound of flesh hitting flesh!</span>", COMBAT_MESSAGE_RANGE, A)
+	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+	var/atom/throw_target = get_edge_target_turf(D, A.dir)
+	D.throw_at(throw_target, 7, 14, A)
+	D.apply_damage(15, BRUTE, BODY_ZONE_CHEST)
+	log_combat(A, D, "launchkicked (Sleeping Carp)")
+	return

-/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
-		log_combat(A, D, "stomach kneed (Sleeping Carp)")
-		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
-		D.visible_message("<span class='warning'>[A] knees [D] in the stomach!</span>", \
-						  "<span class='userdanger'>[A] winds you with a knee in the stomach!</span>")
-		D.audible_message("<b>[D]</b> gags!")
-		D.losebreath += 3
-		D.Knockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
-		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
-		return TRUE
-	return basic_hit(A,D)
-
-/datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
-		log_combat(A, D, "head kicked (Sleeping Carp)")
-		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
-		D.visible_message("<span class='warning'>[A] kicks [D] in the head!</span>", \
-						  "<span class='userdanger'>[A] kicks you in the jaw!</span>")
-		D.apply_damage(20, BRUTE, BODY_ZONE_HEAD)
+///Keelhaul: Harm Grab combo, knocks people down, deals stamina damage while they're on the floor
+/datum/martial_art/the_sleeping_carp/proc/dropKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+	if((D.mobility_flags & MOBILITY_STAND))
+		D.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
+		D.DefaultCombatKnockdown(50)
+		D.adjustStaminaLoss(40) //A cit specific change form the tg port to really punish anyone who tries to stand up
+		D.visible_message("<span class='warning'>[A] kicks [D] in the head, sending them face first into the floor!</span>", \
+					"<span class='userdanger'>You are kicked in the head by [A], sending you crashing to the floor!</span>", "<span class='hear'>You hear a sickening sound of flesh hitting flesh!</span>", COMBAT_MESSAGE_RANGE, A)
+	if(!(D.mobility_flags & MOBILITY_STAND))
+		D.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
+		D.adjustStaminaLoss(40)
 		D.drop_all_held_items()
-		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
-		D.Knockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
-		return TRUE
-	return basic_hit(A,D)
-
-/datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(D.IsKnockdown() || D.resting || D.stat)
-		log_combat(A, D, "elbow dropped (Sleeping Carp)")
-		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-		D.visible_message("<span class='warning'>[A] elbow drops [D]!</span>", \
-						  "<span class='userdanger'>[A] piledrives you with their elbow!</span>")
-		if(D.stat)
-			D.death() //FINISH HIM!
-		D.apply_damage(50, BRUTE, BODY_ZONE_CHEST)
-		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, 1, -1)
-		return TRUE
-	return basic_hit(A,D)
+		D.visible_message("<span class='warning'>[A] kicks [D] in the head!</span>", \
+					"<span class='userdanger'>You are kicked in the head by [A]!</span>", "<span class='hear'>You hear a sickening sound of flesh hitting flesh!</span>", COMBAT_MESSAGE_RANGE, A)
+	log_combat(A, D, "dropkicked (Sleeping Carp)")
+	return

 /datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(A.a_intent == INTENT_GRAB && A!=D) // A!=D prevents grabbing yourself
-		add_to_streak("G",D)
-		if(check_streak(A,D)) //if a combo is made no grab upgrade is done
-			return TRUE
-		old_grab_state = A.grab_state
-		D.grabbedby(A, 1)
-		if(old_grab_state  == GRAB_PASSIVE)
-			D.drop_all_held_items()
-			A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
-			log_combat(A, D, "grabbed", addition="aggressively")
-			D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
-			  "<span class='userdanger'>[A] violently grabs you!</span>")
+	add_to_streak("G",D)
+	if(check_streak(A,D))
 		return TRUE
-	return FALSE
+	log_combat(A, D, "grabbed (Sleeping Carp)")
+	return ..()

 /datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("H",D)
 	if(check_streak(A,D))
 		return TRUE
+	var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
 	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-	var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
-	D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
-					  "<span class='userdanger'>[A] [atk_verb] you!</span>")
-	D.apply_damage(rand(10,15), BRUTE)
-	playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
-	if(prob(D.getBruteLoss()) && !D.lying)
-		D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>")
-		D.Knockdown(80)
-	log_combat(A, D, "[atk_verb] (Sleeping Carp)")
+	var/atk_verb = pick("kick", "chop", "hit", "slam")
+	D.visible_message("<span class='danger'>[A] [atk_verb]s [D]!</span>", \
+					"<span class='userdanger'>[A] [atk_verb]s you!</span>", null, null, A)
+	to_chat(A, "<span class='danger'>You [atk_verb] [D]!</span>")
+	D.apply_damage(rand(10,15), BRUTE, affecting)
+	playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+	log_combat(A, D, "punched (Sleeping Carp)")
 	return TRUE


@@ -143,17 +103,58 @@
 	add_to_streak("D",D)
 	if(check_streak(A,D))
 		return TRUE
+	log_combat(A, D, "disarmed (Sleeping Carp)")
 	return ..()

+/datum/martial_art/the_sleeping_carp/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
+	. = ..()
+	if(A.incapacitated(FALSE, TRUE)) //NO STUN
+		return BULLET_ACT_HIT
+	if(!(A.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
+		return BULLET_ACT_HIT
+	if(A.dna && A.dna.check_mutation(HULK)) //NO HULK
+		return BULLET_ACT_HIT
+	if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS!
+		return BULLET_ACT_HIT
+	if(A.in_throw_mode)
+		A.visible_message("<span class='danger'>[A] effortlessly swats the projectile aside! They can deflect projectile with their bare hands!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
+		playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
+		P.firer = A
+		P.setAngle(rand(0, 360))//SHING
+		return BULLET_ACT_FORCE_PIERCE
+	return BULLET_ACT_HIT
+
 /datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary = FALSE)
 	. = ..()
 	if(!.)
 		return
 	ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
+	ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
+	ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+	H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it
+	H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant
+	H.physiology.stamina_mod *= 0.5 //stun batons prove to be one of the few ways to fight them. They have stun resistance already, so I think doubling down too hard on this resistance is a bit much.
+	H.physiology.stun_mod *= 0.3 //for those rare stuns
+	H.physiology.pressure_mod *= 0.3 //go hang out with carp
+	H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however
+	H.physiology.heat_mod *= 2 //this is mostly so sleeping carp has a viable weakness. Cooking them alive. Setting them on fire and heating them will be their biggest weakness. The reason for this is....filet jokes.
+
+	H.faction |= "carp" //:D

 /datum/martial_art/the_sleeping_carp/on_remove(mob/living/carbon/human/H)
 	. = ..()
 	REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+	H.physiology.brute_mod = initial(H.physiology.brute_mod)
+	H.physiology.burn_mod = initial(H.physiology.burn_mod)
+	H.physiology.stamina_mod = initial(H.physiology.stamina_mod)
+	H.physiology.stun_mod = initial(H.physiology.stun_mod)
+	H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies
+	H.physiology.cold_mod = initial(H.physiology.cold_mod)
+	H.physiology.heat_mod = initial(H.physiology.heat_mod)
+
+	H.faction -= "carp" //:(

 /mob/living/carbon/human/proc/sleeping_carp_help()
 	set name = "Recall Teachings"
@@ -162,11 +163,10 @@

 	to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Sleeping Carp...</i></b>")

-	to_chat(usr, "<span class='notice'>Wrist Wrench</span>: Disarm Disarm. Forces opponent to drop item in hand.")
-	to_chat(usr, "<span class='notice'>Back Kick</span>: Harm Grab. Opponent must be facing away. Knocks down.")
-	to_chat(usr, "<span class='notice'>Stomach Knee</span>: Grab Harm. Knocks the wind out of opponent and stuns.")
-	to_chat(usr, "<span class='notice'>Head Kick</span>: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.")
-	to_chat(usr, "<span class='notice'>Elbow Drop</span>: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.")
+	to_chat(usr, "<span class='notice'>Gnashing Teeth</span>: Harm Harm. Deal additional damage every second punch, with a chance for even more damage!")
+	to_chat(usr, "<span class='notice'>Crashing Wave Kick</span>: Harm Disarm. Launch people brutally across rooms, and away from you.")
+	to_chat(usr, "<span class='notice'>Keelhaul</span>: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.")
+	to_chat(usr, "<span class='notice'>In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and can block all projectiles in Throw Mode. However, you are not invincible, and sustained damage will take it's toll. Avoid heat at all costs!</span>")

 /obj/item/twohanded/bostaff
 	name = "bo staff"
@@ -192,7 +192,7 @@
 	add_fingerprint(user)
 	if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
 		to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>")
-		user.Knockdown(60)
+		user.DefaultCombatKnockdown(60)
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
 			H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD)
@@ -226,7 +226,7 @@
 		if(prob(10))
 			H.visible_message("<span class='warning'>[H] collapses!</span>", \
 								   "<span class='userdanger'>Your legs give out!</span>")
-			H.Knockdown(80)
+			H.DefaultCombatKnockdown(80)
 		if(H.staminaloss && !H.IsSleeping())
 			var/total_health = (H.health - H.staminaloss)
 			if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -207,7 +207,7 @@
 		if (T && isturf(T))
 			if (!D.stat)
 				D.emote("scream")
-			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/Knockdown, 20))
+			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/DefaultCombatKnockdown, 20))
 	log_combat(A, D, "has thrown with wrestling")
 	return 0

@@ -303,7 +303,7 @@
 		playsound(A.loc, "swing_hit", 50, 1)
 		if (!D.stat)
 			D.emote("scream")
-			D.Knockdown(40)
+			D.DefaultCombatKnockdown(40)

 			switch(rand(1,3))
 				if (2)
@@ -361,7 +361,7 @@

 	var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 	if (T && isturf(T))
-		D.Knockdown(20)
+		D.DefaultCombatKnockdown(20)
 		D.throw_at(T, 3, 2)
 	log_combat(A, D, "roundhouse-kicked")

@@ -400,7 +400,7 @@
 			if (falling == 1)
 				A.visible_message("<span class = 'danger'><B>...and dives head-first into the ground, ouch!</b></span>")
 				A.adjustBruteLoss(rand(10,20))
-				A.Knockdown(60)
+				A.DefaultCombatKnockdown(60)
 			to_chat(A, "[D] is too far away!")
 			return 0

@@ -429,7 +429,7 @@
 		else
 			D.adjustBruteLoss(rand(20,30))

-		D.Knockdown(40)
+		D.DefaultCombatKnockdown(40)

 		A.pixel_y = 0

--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -41,20 +41,21 @@ Simple datum which is instanced once per type and is used for every object of sa

 ///This proc is called when the material is added to an object specifically.
 /datum/material/proc/on_applied_obj(var/obj/o, amount, material_flags)
-	var/new_max_integrity = CEILING(o.max_integrity * integrity_modifier, 1)
-	o.modify_max_integrity(new_max_integrity)
-	o.force *= strength_modifier
-	o.throwforce *= strength_modifier
+	if(material_flags & MATERIAL_AFFECT_STATISTICS)
+		var/new_max_integrity = CEILING(o.max_integrity * integrity_modifier, 1)
+		o.modify_max_integrity(new_max_integrity)
+		o.force *= strength_modifier
+		o.throwforce *= strength_modifier

-	var/list/temp_armor_list = list() //Time to add armor modifiers!
+		var/list/temp_armor_list = list() //Time to add armor modifiers!

-	if(!istype(o.armor))
-		return
-	var/list/current_armor = o.armor?.getList()
+		if(!istype(o.armor))
+			return
+		var/list/current_armor = o.armor?.getList()

-	for(var/i in current_armor)
-		temp_armor_list[i] = current_armor[i] * armor_modifiers[i]
-	o.armor = getArmor(arglist(temp_armor_list))
+		for(var/i in current_armor)
+			temp_armor_list[i] = current_armor[i] * armor_modifiers[i]
+		o.armor = getArmor(arglist(temp_armor_list))

 ///This proc is called when the material is removed from an object.
 /datum/material/proc/on_removed(atom/source, material_flags)
@@ -71,7 +72,8 @@ Simple datum which is instanced once per type and is used for every object of sa

 ///This proc is called when the material is removed from an object specifically.
 /datum/material/proc/on_removed_obj(var/obj/o, amount, material_flags)
-	var/new_max_integrity = initial(o.max_integrity)
-	o.modify_max_integrity(new_max_integrity)
-	o.force = initial(o.force)
-	o.throwforce = initial(o.throwforce)
+	if(material_flags & MATERIAL_AFFECT_STATISTICS)
+		var/new_max_integrity = initial(o.max_integrity)
+		o.modify_max_integrity(new_max_integrity)
+		o.force = initial(o.force)
+		o.throwforce = initial(o.throwforce)
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -617,6 +617,10 @@
 	if(!(has_antag_datum(/datum/antagonist/traitor)))
 		add_antag_datum(/datum/antagonist/traitor)

+/datum/mind/proc/make_Contractor_Support()
+	if(!(has_antag_datum(/datum/antagonist/traitor/contractor_support)))
+		add_antag_datum(/datum/antagonist/traitor/contractor_support)
+
 /datum/mind/proc/make_Changeling()
 	var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
 	if(!C)
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -243,6 +243,11 @@
 	description = "<span class='boldwarning'>I have been scorched by the unforgiving rays of the sun.</span>\n"
 	mood_change = -6
 	timeout = 15 MINUTES
+
+/datum/mood_event/bloodsucker_disgust
+	description = "<span class='boldwarning'>Something I recently ate was horrifyingly disgusting.</span>\n"
+	mood_change = -5
+	timeout = 5 MINUTES
 	
 /datum/mood_event/nanite_sadness
 	description = "<span class='warning robot'>+++++++HAPPINESS SUPPRESSION+++++++</span>\n"
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations.dm
@@ -1,58 +1,55 @@
-GLOBAL_LIST_EMPTY(mutations_list)
-
 /datum/mutation

 	var/name

-/datum/mutation/New()
-	GLOB.mutations_list[name] = src
-
 /datum/mutation/human
-	var/dna_block
+	name = "mutation"
+	var/desc = "A mutation."
+	var/locked
 	var/quality
 	var/get_chance = 100
 	var/lowest_value = 256 * 8
 	var/text_gain_indication = ""
 	var/text_lose_indication = ""
 	var/list/mutable_appearance/visual_indicators = list()
+	var/obj/effect/proc_holder/spell/power
 	var/layer_used = MUTATIONS_LAYER //which mutation layer to use
 	var/list/species_allowed = list() //to restrict mutation to only certain species
 	var/health_req //minimum health required to acquire the mutation
 	var/limb_req //required limbs to acquire this mutation
 	var/time_coeff = 1 //coefficient for timed mutations
+	var/datum/dna/dna
+	var/mob/living/carbon/human/owner
+	var/instability = 0 //instability the holder gets when the mutation is not native
+	var/blocks = 4 //Amount of those big blocks with gene sequences
+	var/difficulty = 8 //Amount of missing sequences. Sometimes it removes an entire pair for 2 points
+	var/timed = FALSE   //Boolean to easily check if we're going to self destruct
+	var/alias           //'Mutation #49', decided every round to get some form of distinction between undiscovered mutations
+	var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen
+	var/class           //Decides player accesibility, sorta
+	//MUT_NORMAL - A mutation that can be activated and deactived by completing a sequence
+	//MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console
+	//MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate

-/datum/mutation/human/proc/force_give(mob/living/carbon/human/owner)
-	set_block(owner)
-	. = on_acquiring(owner)
+	var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never,  1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one
+	var/chromosome_name   //purely cosmetic
+	var/modified = FALSE  //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers
+	var/mutadone_proof = FALSE

-/datum/mutation/human/proc/force_lose(mob/living/carbon/human/owner)
-	set_block(owner, 0)
-	. = on_losing(owner)
+	//Chromosome stuff - set to -1 to prevent people from changing it. Example: It'd be a waste to decrease cooldown on mutism
+	var/stabilizer_coeff = 1 //genetic stability coeff
+	var/synchronizer_coeff = -1 //makes the mutation hurt the user less
+	var/power_coeff = -1 //boosts mutation strength
+	var/energy_coeff = -1 //lowers mutation cooldown

-/datum/mutation/human/proc/set_se(se_string, on = 1)
-	if(!se_string || length(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
-		return
-	var/before = copytext_char(se_string, 1, ((dna_block - 1) * DNA_BLOCK_SIZE) + 1)
-	var/injection = num2hex(on ? rand(lowest_value, (256 * 16) - 1) : rand(0, lowest_value - 1), DNA_BLOCK_SIZE)
-	var/after = copytext_char(se_string, (dna_block * DNA_BLOCK_SIZE) + 1, 0)
-	return before + injection + after
-
-/datum/mutation/human/proc/set_block(mob/living/carbon/owner, on = 1)
-	if(owner && owner.has_dna())
-		owner.dna.struc_enzymes = set_se(owner.dna.struc_enzymes, on)
-
-/datum/mutation/human/proc/check_block_string(se_string)
-	if(!se_string || length(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
-		return 0
-	if(hex2num(getblock(se_string, dna_block)) >= lowest_value)
-		return 1
-
-/datum/mutation/human/proc/check_block(mob/living/carbon/human/owner, force_powers=0)
-	if(check_block_string(owner.dna.struc_enzymes))
-		if(prob(get_chance)||force_powers)
-			. = on_acquiring(owner)
-	else
-		. = on_losing(owner)
+/datum/mutation/human/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
+	. = ..()
+	class = class_
+	if(timer)
+		addtimer(CALLBACK(src, .proc/remove), timer)
+		timed = TRUE
+	if(copymut && istype(copymut, /datum/mutation/human))
+		copy_mutation(copymut)

 /datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/owner)
 	if(!owner || !istype(owner) || owner.stat == DEAD || (src in owner.dna.mutations))
@@ -63,7 +60,8 @@ GLOBAL_LIST_EMPTY(mutations_list)
 		return TRUE
 	if(limb_req && !owner.get_bodypart(limb_req))
 		return TRUE
-	owner.dna.mutations.Add(src)
+	dna = owner.dna
+	dna.mutations += src
 	if(text_gain_indication)
 		to_chat(owner, text_gain_indication)
 	if(visual_indicators.len)
@@ -75,6 +73,10 @@ GLOBAL_LIST_EMPTY(mutations_list)
 		owner.overlays_standing[layer_used] = mut_overlay
 		owner.apply_overlay(layer_used)

+	grant_spell(owner)
+	if(!modified)
+		addtimer(CALLBACK(src, .proc/modify, 5)) //gonna want children calling ..() to run first
+
 /datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner)
 	return

@@ -102,26 +104,80 @@ GLOBAL_LIST_EMPTY(mutations_list)
 			mut_overlay.Remove(get_visual_indicator(owner))
 			owner.overlays_standing[layer_used] = mut_overlay
 			owner.apply_overlay(layer_used)
+		if(power)
+			owner.RemoveSpell(power)
+			qdel(src)
 		return 0
 	return 1

+/datum/mutation/human/proc/say_mod(message)
+	if(message)
+		return message
+
+/datum/mutation/human/proc/get_spans()
+	return list()
+
 /mob/living/carbon/proc/update_mutations_overlay()
 	return

 /mob/living/carbon/human/update_mutations_overlay()
 	for(var/datum/mutation/human/CM in dna.mutations)
 		if(CM.species_allowed.len && !CM.species_allowed.Find(dna.species.id))
-			CM.force_lose(src) //shouldn't have that mutation at all
+			dna.force_lose(CM) //shouldn't have that mutation at all
 			continue
 		if(CM.visual_indicators.len)
 			var/list/mut_overlay = list()
 			if(overlays_standing[CM.layer_used])
 				mut_overlay = overlays_standing[CM.layer_used]
-			var/mutable_appearance/V = CM.get_visual_indicator(src)
+			var/mutable_appearance/V = CM.get_visual_indicator()
 			if(!mut_overlay.Find(V)) //either we lack the visual indicator or we have the wrong one
 				remove_overlay(CM.layer_used)
-				for(var/mutable_appearance/MA in CM.visual_indicators)
+				for(var/mutable_appearance/MA in CM.visual_indicators[CM.type])
 					mut_overlay.Remove(MA)
 				mut_overlay |= V
 				overlays_standing[CM.layer_used] = mut_overlay
 				apply_overlay(CM.layer_used)
+
+
+/datum/mutation/human/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone
+	if(modified || !power || !owner)
+		return
+	power.charge_max *= GET_MUTATION_ENERGY(src)
+	power.charge_counter *= GET_MUTATION_ENERGY(src)
+	modified = TRUE
+
+/datum/mutation/human/proc/copy_mutation(datum/mutation/human/HM)
+	if(!HM)
+		return
+	chromosome_name = HM.chromosome_name
+	stabilizer_coeff = HM.stabilizer_coeff
+	synchronizer_coeff = HM.synchronizer_coeff
+	power_coeff = HM.power_coeff
+	energy_coeff = HM.energy_coeff
+	mutadone_proof = HM.mutadone_proof
+	can_chromosome = HM.can_chromosome
+
+/datum/mutation/human/proc/remove_chromosome()
+	stabilizer_coeff = initial(stabilizer_coeff)
+	synchronizer_coeff = initial(synchronizer_coeff)
+	power_coeff = initial(power_coeff)
+	energy_coeff = initial(energy_coeff)
+	mutadone_proof = initial(mutadone_proof)
+	can_chromosome = initial(can_chromosome)
+	chromosome_name = null
+
+/datum/mutation/human/proc/remove()
+	if(dna)
+		dna.force_lose(src)
+	else
+		qdel(src)
+
+/datum/mutation/human/proc/grant_spell(mob/living/carbon/human/owner)
+	if(!ispath(power) || !owner)
+		return FALSE
+
+	power = new power()
+	power.action_background_icon_state = "bg_tech_blue_on"
+	power.panel = "Genetic"
+	owner.AddSpell(power)
+	return TRUE
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -0,0 +1,503 @@
+/datum/mutation/human/telepathy
+	name = "Telepathy"
+	desc = "A rare mutation that allows the user to telepathically communicate to others."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>You can hear your own voice echoing in your mind!</span>"
+	text_lose_indication = "<span class='notice'>You don't hear your mind echo anymore.</span>"
+	difficulty = 12
+	power = /obj/effect/proc_holder/spell/targeted/telepathy/genetic
+	instability = 10
+	energy_coeff = 1
+
+/datum/mutation/human/telepathy/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+
+/datum/mutation/human/telepathy/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+
+/obj/effect/proc_holder/spell/targeted/telepathy/genetic
+	magic_check = FALSE
+
+/datum/mutation/human/firebreath
+	name = "Fire Breath"
+	desc = "An ancient mutation that gives lizards breath of fire."
+	quality = POSITIVE
+	difficulty = 12
+	locked = TRUE
+	text_gain_indication = "<span class='notice'>Your throat is burning!</span>"
+	text_lose_indication = "<span class='notice'>Your throat is cooling down.</span>"
+	power = /obj/effect/proc_holder/spell/aimed/firebreath
+	instability = 30
+	energy_coeff = 1
+	power_coeff = 1
+
+/datum/mutation/human/firebreath/modify()
+	if(power)
+		var/obj/effect/proc_holder/spell/aimed/firebreath/S = power
+		S.strength = 4 + GET_MUTATION_POWER(src)
+
+/obj/effect/proc_holder/spell/aimed/firebreath
+	name = "Fire Breath"
+	desc = "You can breathe fire at a target."
+	school = "evocation"
+	charge_max = 1200
+	clothes_req = FALSE
+	range = 20
+	base_icon_state = "fireball"
+	action_icon_state = "fireball0"
+	sound = 'sound/magic/demon_dies.ogg' //horrifying lizard noises
+	active_msg = "You built up heat in your mouth."
+	deactive_msg = "You swallow the flame."
+	var/strength = 4
+
+/obj/effect/proc_holder/spell/aimed/firebreath/before_cast(list/targets)
+	. = ..()
+	if(iscarbon(usr))
+		var/mob/living/carbon/C = usr
+		if(C.is_mouth_covered())
+			C.adjust_fire_stacks(2)
+			C.IgniteMob()
+			to_chat(C,"<span class='warning'>Something in front of your mouth caught fire!</span>")
+			return FALSE
+
+/obj/effect/proc_holder/spell/aimed/firebreath/cast(list/targets, mob/living/user)
+	var/turf/T = user.loc
+	if(!isturf(T))
+		return FALSE
+	firecone(T,user.dir,strength)
+	remove_ranged_ability()
+	charge_counter = 0
+	start_recharge()
+	on_deactivation(user)
+
+/proc/firecone(loc,dir,length)
+	var/addsides = FALSE
+	var/list/turf/recentturf = list(loc)
+	for (var/i = 0;i < length;i++)
+		var/list/turf/h = list()
+		for (var/turf/g in recentturf)
+			var/frontturf = get_step(g,dir)
+			if (addsides)
+				var/rightturf = get_step(frontturf,turn(dir,90))
+				var/leftturf = get_step(frontturf,turn(dir,270))
+				if (!(rightturf in h))
+					h += rightturf
+				if (!(leftturf in h))
+					h += leftturf
+			if (!(frontturf in h))
+				h += frontturf
+		for (var/turf/j in h)
+			if (j.blocks_air)
+				h -= j
+				continue
+			for (var/obj/o in j)
+				if (o.CanAtmosPass == ATMOS_PASS_PROC ? !o.CanAtmosPass(loc) : !o.CanAtmosPass)
+					h -= j
+					continue
+		for (var/turf/l in h)
+			new /obj/effect/hotspot(l)
+			l.hotspot_expose(700,50,1)
+		sleep(1)
+		recentturf = h
+		addsides = !addsides
+
+/datum/mutation/human/void
+	name = "Void Magnet"
+	desc = "A rare genome that attracts odd forces not usually observed."
+	quality = MINOR_NEGATIVE //upsides and downsides
+	text_gain_indication = "<span class='notice'>You feel a heavy, dull force just beyond the walls watching you.</span>"
+	instability = 30
+	power = /obj/effect/proc_holder/spell/self/void
+	energy_coeff = 1
+	synchronizer_coeff = 1
+
+/datum/mutation/human/void/on_life(mob/living/carbon/human/owner)
+	if(!isturf(owner.loc))
+		return
+	if(prob((0.5+((100-dna.stability)/20))) * GET_MUTATION_SYNCHRONIZER(src)) //very rare, but enough to annoy you hopefully. +0.5 probability for every 10 points lost in stability
+		new /obj/effect/immortality_talisman/void(get_turf(owner), owner)
+
+/obj/effect/proc_holder/spell/self/void
+	name = "Convoke Void" //magic the gathering joke here
+	desc = "A rare genome that attracts odd forces not usually observed. May sometimes pull you in randomly."
+	school = "evocation"
+	clothes_req = FALSE
+	charge_max = 600
+	invocation = "DOOOOOOOOOOOOOOOOOOOOM!!!"
+	invocation_type = "shout"
+	action_icon_state = "void_magnet"
+	var/in_use = FALSE //so it doesnt cast while you are already deep innit
+
+/obj/effect/proc_holder/spell/self/void/can_cast(mob/user = usr)
+	. = ..()
+	if(!isturf(user.loc))
+		return FALSE
+
+/obj/effect/proc_holder/spell/self/void/cast(mob/user = usr)
+	. = ..()
+	new /obj/effect/immortality_talisman/void(get_turf(user), user)
+
+/datum/mutation/human/shock
+	name = "Shock Touch"
+	desc = "The affected can channel excess electricity through their hands without shocking themselves, allowing them to shock others."
+	quality = POSITIVE
+	locked = TRUE
+	difficulty = 16
+	text_gain_indication = "<span class='notice'>You feel power flow through your hands.</span>"
+	text_lose_indication = "<span class='notice'>The energy in your hands subsides.</span>"
+	power = /obj/effect/proc_holder/spell/targeted/touch/shock
+	instability = 30
+
+/obj/effect/proc_holder/spell/targeted/touch/shock
+	name = "Shock Touch"
+	desc = "Channel electricity to your hand to shock people with."
+	drawmessage = "You channel electricity into your hand."
+	dropmessage = "You let the electricity from your hand dissipate."
+	hand_path = /obj/item/melee/touch_attack/shock
+	charge_max = 400
+	clothes_req = FALSE
+	action_icon_state = "zap"
+
+/obj/item/melee/touch_attack/shock
+	name = "\improper shock touch"
+	desc = "This is kind of like when you rub your feet on a shag rug so you can zap your friends, only a lot less safe."
+	catchphrase = null
+	on_use_sound = 'sound/weapons/zapbang.ogg'
+	icon_state = "zapper"
+	item_state = "zapper"
+
+/obj/item/melee/touch_attack/shock/afterattack(atom/target, mob/living/carbon/user, proximity)
+	if(!proximity || !isliving(target))
+		return
+	if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(C.electrocute_act(15, user, 1, SHOCK_NOSTUN))//doesnt stun. never let this stun
+			C.dropItemToGround(C.get_active_held_item())
+			C.dropItemToGround(C.get_inactive_held_item())
+			C.confused += 10
+			C.visible_message("<span class='danger'>[user] electrocutes [target]!</span>","<span class='userdanger'>[user] electrocutes you!</span>")
+			return ..()
+		else
+			user.visible_message("<span class='warning'>[user] fails to electrocute [target]!</span>")
+			return ..()
+	else if(isliving(target))
+		var/mob/living/L = target
+		L.electrocute_act(15, user, 1, SHOCK_NOSTUN)
+		L.visible_message("<span class='danger'>[user] electrocutes [target]!</span>","<span class='userdanger'>[user] electrocutes you!</span>")
+		return ..()
+	else
+		to_chat(user,"<span class='warning'>The electricity doesn't seem to affect [target]...</span>")
+		return ..()
+
+
+/datum/mutation/human/olfaction
+	name = "Transcendent Olfaction"
+	desc = "Your sense of smell is comparable to that of a canine."
+	quality = POSITIVE
+	difficulty = 12
+	text_gain_indication = "<span class='notice'>Smells begin to make more sense...</span>"
+	text_lose_indication = "<span class='notice'>Your sense of smell goes back to normal.</span>"
+	power = /obj/effect/proc_holder/spell/targeted/olfaction
+	instability = 30
+	synchronizer_coeff = 1
+	var/reek = 200
+
+/datum/mutation/human/olfaction/modify()
+	if(power)
+		var/obj/effect/proc_holder/spell/targeted/olfaction/S = power
+		S.sensitivity = GET_MUTATION_SYNCHRONIZER(src)
+
+/obj/effect/proc_holder/spell/targeted/olfaction
+	name = "Remember the Scent"
+	desc = "Get a scent off of the item you're currently holding to track it. With an empty hand, you'll track the scent you've remembered."
+	charge_max = 100
+	clothes_req = FALSE
+	range = -1
+	include_user = TRUE
+	action_icon_state = "nose"
+	var/mob/living/carbon/tracking_target
+	var/list/mob/living/carbon/possible = list()
+	var/sensitivity = 1
+
+/obj/effect/proc_holder/spell/targeted/olfaction/cast(list/targets, mob/living/user = usr)
+	//can we sniff? is there miasma in the air?
+	var/datum/gas_mixture/air = user.loc.return_air()
+	var/list/cached_gases = air.gases
+
+	if(cached_gases[/datum/gas/miasma])
+		user.adjust_disgust(sensitivity * 45)
+		to_chat(user, "<span class='warning'>With your overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!</span>")
+		return
+
+	var/atom/sniffed = user.get_active_held_item()
+	if(sniffed)
+		var/old_target = tracking_target
+		possible = list()
+		for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+			if(md5(H.dna.uni_identity) in sniffed.fingerprints)
+				possible |= H
+		if(!length(possible))
+			to_chat(user,"<span class='warning'>Despite your best efforts, there are no scents to be found on [sniffed]...</span>")
+			return
+		tracking_target = input(user, "Choose a scent to remember.", "Scent Tracking") as null|anything in sortNames(possible)
+		if(!tracking_target)
+			if(!old_target)
+				to_chat(user,"<span class='warning'>You decide against remembering any scents. Instead, you notice your own nose in your peripheral vision. This goes on to remind you of that one time you started breathing manually and couldn't stop. What an awful day that was.</span>")
+				return
+			tracking_target = old_target
+			on_the_trail(user)
+			return
+		to_chat(user,"<span class='notice'>You pick up the scent of [tracking_target]. The hunt begins.</span>")
+		on_the_trail(user)
+		return
+
+	if(!tracking_target)
+		to_chat(user,"<span class='warning'>You're not holding anything to smell, and you haven't smelled anything you can track. You smell your skin instead; it's kinda salty.</span>")
+		return
+
+	on_the_trail(user)
+
+/obj/effect/proc_holder/spell/targeted/olfaction/proc/on_the_trail(mob/living/user)
+	if(!tracking_target)
+		to_chat(user,"<span class='warning'>You're not tracking a scent, but the game thought you were. Something's gone wrong! Report this as a bug.</span>")
+		return
+	if(tracking_target == user)
+		to_chat(user,"<span class='warning'>You smell out the trail to yourself. Yep, it's you.</span>")
+		return
+	if(usr.z < tracking_target.z)
+		to_chat(user,"<span class='warning'>The trail leads... way up above you? Huh. They must be really, really far away.</span>")
+		return
+	else if(usr.z > tracking_target.z)
+		to_chat(user,"<span class='warning'>The trail leads... way down below you? Huh. They must be really, really far away.</span>")
+		return
+	var/direction_text = "[dir2text(get_dir(usr, tracking_target))]"
+	if(direction_text)
+		to_chat(user,"<span class='notice'>You consider [tracking_target]'s scent. The trail leads <b>[direction_text].</b></span>")
+
+
+/datum/mutation/human/self_amputation
+	name = "Autotomy"
+	desc = "Allows a creature to voluntary discard a random appendage."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your joints feel loose.</span>"
+	instability = 30
+	power = /obj/effect/proc_holder/spell/self/self_amputation
+
+	energy_coeff = 1
+	synchronizer_coeff = 1
+
+/obj/effect/proc_holder/spell/self/self_amputation
+	name = "Drop a limb"
+	desc = "Concentrate to make a random limb pop right off your body."
+	clothes_req = FALSE
+	human_req = FALSE
+	charge_max = 100
+	action_icon_state = "autotomy"
+
+/obj/effect/proc_holder/spell/self/self_amputation/cast(list/targets, mob/user = usr)
+	if(!iscarbon(user))
+		return
+
+	var/mob/living/carbon/C = user
+	if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
+		return
+
+	var/list/parts = list()
+	for(var/X in C.bodyparts)
+		var/obj/item/bodypart/BP = X
+		if(BP.body_part != HEAD && BP.body_part != CHEST)
+			if(BP.dismemberable)
+				parts += BP
+	if(!parts.len)
+		to_chat(usr, "<span class='notice'>You can't shed any more limbs!</span>")
+		return
+
+	var/obj/item/bodypart/BP = pick(parts)
+	BP.dismember()
+
+//spider webs
+/datum/mutation/human/webbing
+	name = "Webbing Production"
+	desc = "Allows the user to lay webbing, and travel through it."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your skin feels webby.</span>"
+	instability = 15
+	power = /obj/effect/proc_holder/spell/self/lay_genetic_web
+
+/obj/effect/proc_holder/spell/self/lay_genetic_web
+	name = "Lay Web"
+	desc = "Drops a web. Only you will be able to traverse your web easily, making it pretty good for keeping you safe."
+	clothes_req = FALSE
+	human_req = FALSE
+	charge_max = 4 SECONDS //the same time to lay a web
+	action_icon = 'icons/mob/actions/actions_genetic.dmi'
+	action_icon_state = "lay_web"
+
+/obj/effect/proc_holder/spell/self/lay_genetic_web/cast(list/targets, mob/user = usr)
+	var/failed = FALSE
+	if(!isturf(user.loc))
+		to_chat(user, "<span class='warning'>You can't lay webs here!</span>")
+		failed = TRUE
+	var/turf/T = get_turf(user)
+	var/obj/structure/spider/stickyweb/genetic/W = locate() in T
+	if(W)
+		to_chat(user, "<span class='warning'>There's already a web here!</span>")
+		failed = TRUE
+	if(failed)
+		revert_cast(user)
+		return FALSE
+
+	user.visible_message("<span class='notice'>[user] begins to secrete a sticky substance.</span>","<span class='notice'>You begin to lay a web.</span>")
+	if(!do_after(user, 4 SECONDS, target = T))
+		to_chat(user, "<span class='warning'>Your web spinning was interrupted!</span>")
+		return
+	else
+		new /obj/structure/spider/stickyweb/genetic(T, user)
+
+
+/datum/mutation/human/tongue_spike
+	name = "Tongue Spike"
+	desc = "Allows a creature to voluntary shoot their tongue out as a deadly weapon."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your feel like you can throw your voice.</span>"
+	instability = 15
+	power = /obj/effect/proc_holder/spell/self/tongue_spike
+
+	energy_coeff = 1
+	synchronizer_coeff = 1
+
+/obj/effect/proc_holder/spell/self/tongue_spike
+	name = "Launch spike"
+	desc = "Shoot your tongue out in the direction you're facing, embedding it and dealing damage until they remove it."
+	clothes_req = FALSE
+	human_req = TRUE
+	charge_max = 100
+	action_icon = 'icons/mob/actions/actions_genetic.dmi'
+	action_icon_state = "spike"
+	var/spike_path = /obj/item/hardened_spike
+
+/obj/effect/proc_holder/spell/self/tongue_spike/cast(list/targets, mob/user = usr)
+	if(!iscarbon(user))
+		return
+
+	var/mob/living/carbon/C = user
+	if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
+		return
+	var/obj/item/organ/tongue/tongue
+	for(var/org in C.internal_organs)
+		if(istype(org, /obj/item/organ/tongue))
+			tongue = org
+			break
+
+	if(!tongue)
+		to_chat(C, "<span class='notice'>You don't have a tongue to shoot!</span>")
+		return
+
+	tongue.Remove(C, special = TRUE)
+	var/obj/item/hardened_spike/spike = new spike_path(get_turf(C), C)
+	tongue.forceMove(spike)
+	spike.throw_at(get_edge_target_turf(C,C.dir), 14, 4, C)
+
+/obj/item/hardened_spike
+	name = "biomass spike"
+	desc = "Hardened biomass, shaped into a spike. Very pointy!"
+	icon_state = "tonguespike"
+	force = 2
+	throwforce = 15 //15 + 2 (WEIGHT_CLASS_SMALL) * 4 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = i didnt do the math
+	throw_speed = 4
+	embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 100, "embedded_fall_chance" = 0)
+	w_class = WEIGHT_CLASS_SMALL
+	sharpness = IS_SHARP
+	var/mob/living/carbon/human/fired_by
+
+/obj/item/hardened_spike/Initialize(mapload, firedby)
+	. = ..()
+	fired_by = firedby
+	addtimer(CALLBACK(src, .proc/checkembedded), 5 SECONDS)
+
+/obj/item/hardened_spike/proc/checkembedded()
+	if(ishuman(loc))
+		var/mob/living/carbon/human/embedtest = loc
+		for(var/l in embedtest.bodyparts)
+			var/obj/item/bodypart/limb = l
+			if(src in limb.embedded_objects)
+				return limb
+	unembedded()
+
+/obj/item/hardened_spike/unembedded()
+	var/turf/T = get_turf(src)
+	visible_message("<span class='warning'>[src] cracks and twists, changing shape!</span>")
+	for(var/i in contents)
+		var/obj/o = i
+		o.forceMove(T)
+	qdel(src)
+
+/datum/mutation/human/tongue_spike/chem
+	name = "Chem Spike"
+	desc = "Allows a creature to voluntary shoot their tongue out as biomass, allowing a long range transfer of chemicals."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your feel like you can really connect with people by throwing your voice.</span>"
+	instability = 15
+	locked = TRUE
+	power = /obj/effect/proc_holder/spell/self/tongue_spike/chem
+	energy_coeff = 1
+	synchronizer_coeff = 1
+
+/obj/effect/proc_holder/spell/self/tongue_spike/chem
+	name = "Launch chem spike"
+	desc = "Shoot your tongue out in the direction you're facing, embedding it for a very small amount of damage. While the other person has the spike embedded, you can transfer your chemicals to them."
+	action_icon_state = "spikechem"
+	spike_path = /obj/item/hardened_spike/chem
+
+/obj/item/hardened_spike/chem
+	name = "chem spike"
+	desc = "Hardened biomass, shaped into... something."
+	icon_state = "tonguespikechem"
+	throwforce = 2 //2 + 2 (WEIGHT_CLASS_SMALL) * 0 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = i didnt do the math again but very low or smthin
+	embedding = list("embedded_pain_multiplier" = 0, "embed_chance" = 100, "embedded_fall_chance" = 0, "embedded_pain_chance" = 0, "embedded_ignore_throwspeed_threshold" = TRUE) //never hurts once it's in you
+	var/been_places = FALSE
+	var/datum/action/innate/send_chems/chems
+
+/obj/item/hardened_spike/chem/embedded(mob/living/carbon/human/embedded_mob)
+	if(been_places)
+		return
+	been_places = TRUE
+	chems = new
+	chems.transfered = embedded_mob
+	chems.spikey = src
+	to_chat(fired_by, "<span class='notice'>Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!</span>")
+	chems.Grant(fired_by)
+
+/obj/item/hardened_spike/chem/unembedded()
+	to_chat(fired_by, "<span class='warning'>Link lost!</span>")
+	QDEL_NULL(chems)
+	..()
+
+/datum/action/innate/send_chems
+	icon_icon = 'icons/mob/actions/actions_genetic.dmi'
+	background_icon_state = "bg_spell"
+	check_flags = AB_CHECK_CONSCIOUS
+	button_icon_state = "spikechemswap"
+	name = "Transfer Chemicals"
+	desc = "Send all of your reagents into whomever the chem spike is embedded in. One use."
+	var/obj/item/hardened_spike/chem/spikey
+	var/mob/living/carbon/human/transfered
+
+/datum/action/innate/send_chems/Activate()
+	if(!ishuman(transfered) || !ishuman(owner))
+		return
+	var/mob/living/carbon/human/transferer = owner
+
+	to_chat(transfered, "<span class='warning'>You feel a tiny prick!</span>")
+	transferer.reagents.trans_to(transfered, transferer.reagents.total_volume, 1, 1, 0)
+
+	var/obj/item/bodypart/L = spikey.checkembedded()
+
+	L.embedded_objects -= spikey
+	//this is where it would deal damage, if it transfers chems it removes itself so no damage
+	spikey.forceMove(get_turf(L))
+	transfered.visible_message("<span class='notice'>[spikey] falls out of [transfered]!</span>")
+	if(!transfered.has_embedded_objects())
+		transfered.clear_alert("embeddedobject")
+		SEND_SIGNAL(transfered, COMSIG_CLEAR_MOOD_EVENT, "embedded")
+	spikey.unembedded()
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -0,0 +1,108 @@
+/datum/mutation/human/antenna
+	name = "Antenna"
+	desc = "The affected person sprouts an antenna. This is known to allow them to access common radio channels passively."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>You feel an antenna sprout from your forehead.</span>"
+	text_lose_indication = "<span class='notice'>Your antenna shrinks back down.</span>"
+	instability = 5
+	difficulty = 8
+	var/obj/item/implant/radio/antenna/linked_radio
+
+/obj/item/implant/radio/antenna
+	name = "internal antenna organ"
+	desc = "The internal organ part of the antenna. Science has not yet given it a good name."
+	icon = 'icons/obj/radio.dmi'//maybe make a unique sprite later. not important
+	icon_state = "walkietalkie"
+
+/obj/item/implant/radio/antenna/Initialize(mapload)
+	..()
+	if (radio)
+		radio.name = "internal antenna"
+
+/datum/mutation/human/antenna/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	linked_radio = new(owner)
+	linked_radio.implant(owner, null, TRUE, TRUE)
+
+/datum/mutation/human/antenna/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	if(linked_radio)
+		linked_radio.Destroy()
+
+/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
+	..()
+	if(!(type in visual_indicators))
+		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
+
+/datum/mutation/human/antenna/get_visual_indicator(mob/living/carbon/human/owner)
+	return visual_indicators[type][1]
+
+/datum/mutation/human/mindreader
+	name = "Mind Reader"
+	desc = "The affected person can look into the recent memories of others."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>You hear distant voices at the corners of your mind.</span>"
+	text_lose_indication = "<span class='notice'>The distant voices fade.</span>"
+	power = /obj/effect/proc_holder/spell/targeted/mindread
+	instability = 40
+	difficulty = 8
+	locked = TRUE
+
+/obj/effect/proc_holder/spell/targeted/mindread
+	name = "Mindread"
+	desc = "Read the target's mind."
+	charge_max = 300
+	range = 7
+	clothes_req = FALSE
+	action_icon_state = "mindread"
+
+/obj/effect/proc_holder/spell/targeted/mindread/cast(list/targets, mob/living/carbon/human/user = usr)
+	for(var/mob/living/M in targets)
+		if(usr.anti_magic_check(FALSE, FALSE, TRUE, 0) || M.anti_magic_check(FALSE, FALSE, TRUE, 0))
+			to_chat(usr, "<span class='warning'>As you reach out with your mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.</span>")
+			return
+		if(M.stat == DEAD)
+			to_chat(user, "<span class='boldnotice'>[M] is dead!</span>")
+			return
+		if(M.mind)
+			to_chat(user, "<span class='boldnotice'>You plunge into [M]'s mind...</span>")
+			if(prob(20))
+				to_chat(M, "<span class='danger'>You feel something foreign enter your mind.</span>")//chance to alert the read-ee
+			var/list/recent_speech = list()
+			var/list/say_log = list()
+			var/log_source = M.logging
+			for(var/log_type in log_source)//this whole loop puts the read-ee's say logs into say_log in an easy to access way
+				var/nlog_type = text2num(log_type)
+				if(nlog_type & LOG_SAY)
+					var/list/reversed = log_source[log_type]
+					if(islist(reversed))
+						say_log = reverseRange(reversed.Copy())
+						break
+			if(LAZYLEN(say_log))
+				for(var/spoken_memory in say_log)
+					if(recent_speech.len >= 3)//up to 3 random lines of speech, favoring more recent speech
+						break
+					if(prob(50))
+						recent_speech[spoken_memory] = say_log[spoken_memory]
+			if(recent_speech.len)
+				to_chat(user, "<span class='boldnotice'>You catch some drifting memories of their past conversations...</span>")
+				for(var/spoken_memory in recent_speech)
+					to_chat(user, "<span class='notice'>[recent_speech[spoken_memory]]</span>")
+			if(iscarbon(M))
+				var/mob/living/carbon/human/H = M
+				to_chat(user, "<span class='boldnotice'>You find that their intent is to [H.a_intent]...</span>")
+				var/datum/dna/the_dna = H.has_dna()
+				if(the_dna)
+					to_chat(user, "<span class='boldnotice'>You uncover that [H.p_their()] true identity is [the_dna.real_name].</span>")
+		else
+			to_chat(user, "<span class='warning'>You can't find a mind to read inside of [M]!</span>")
+
+/datum/mutation/human/mindreader/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
+	..()
+	if(!(type in visual_indicators))
+		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
+
+/datum/mutation/human/mindreader/get_visual_indicator(mob/living/carbon/human/owner)
+	return visual_indicators[type][1]
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -3,16 +3,19 @@
 //Epilepsy gives a very small chance to have a seizure every life tick, knocking you unconscious.
 /datum/mutation/human/epilepsy
 	name = "Epilepsy"
+	desc = "A genetic defect that sporadically causes seizures."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You get a headache.</span>"
+	synchronizer_coeff = 1
+	power_coeff = 1

 /datum/mutation/human/epilepsy/on_life(mob/living/carbon/human/owner)
-	if(prob(1) && owner.stat == CONSCIOUS)
+	if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
 		owner.visible_message("<span class='danger'>[owner] starts having a seizure!</span>", "<span class='userdanger'>You have a seizure!</span>")
-		owner.Unconscious(200)
-		owner.Jitter(1000)
+		owner.Unconscious(200 * GET_MUTATION_POWER(src))
+		owner.Jitter(1000 * GET_MUTATION_POWER(src))
 		SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy)
-		addtimer(CALLBACK(src, .proc/jitter_less, owner), 90)
+		addtimer(CALLBACK(src, .proc/jitter_less), 90)

 /datum/mutation/human/epilepsy/proc/jitter_less(mob/living/carbon/human/owner)
 	if(owner)
@@ -22,19 +25,23 @@
 //Unstable DNA induces random mutations!
 /datum/mutation/human/bad_dna
 	name = "Unstable DNA"
+	desc = "Strange mutation that causes the holder to randomly mutate."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You feel strange.</span>"
+	locked = TRUE

 /datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
 	to_chat(owner, text_gain_indication)
 	var/mob/new_mob
 	if(prob(95))
 		if(prob(50))
-			new_mob = owner.randmutb()
+			new_mob = owner.easy_randmut(NEGATIVE + MINOR_NEGATIVE)
 		else
 			new_mob = owner.randmuti()
 	else
-		new_mob = owner.randmutg()
+		new_mob = owner.easy_randmut(POSITIVE)
 	if(new_mob && ismob(new_mob))
 		owner = new_mob
 	. = owner
@@ -44,21 +51,31 @@
 //Cough gives you a chronic cough that causes you to drop items.
 /datum/mutation/human/cough
 	name = "Cough"
+	desc = "A chronic cough."
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='danger'>You start coughing.</span>"
+	synchronizer_coeff = 1
+	power_coeff = 1

 /datum/mutation/human/cough/on_life(mob/living/carbon/human/owner)
-	if(prob(5) && owner.stat == CONSCIOUS)
+	if(prob(5 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
 		owner.drop_all_held_items()
 		owner.emote("cough")

+		if(GET_MUTATION_POWER(src) > 1)
+			var/cough_range = GET_MUTATION_POWER(src) * 4
+			var/turf/target = get_ranged_target_turf(owner, turn(owner.dir, 180), cough_range)
+			owner.throw_at(target, cough_range, GET_MUTATION_POWER(src))
+

 //Dwarfism shrinks your body and lets you pass tables.
 /datum/mutation/human/dwarfism
 	name = "Dwarfism"
+	desc = "A mutation believed to be the cause of dwarfism."
 	quality = POSITIVE
-	get_chance = 15
-	lowest_value = 256 * 12
+	difficulty = 16
+	instability = 5
+	locked = TRUE    // Default intert species for now, so locked from regular pool.

 /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
@@ -78,6 +95,7 @@
 //Clumsiness has a very large amount of small drawbacks depending on item.
 /datum/mutation/human/clumsy
 	name = "Clumsiness"
+	desc = "A genome that inhibits certain brain functions, causing the holder to appear clumsy. Honk"
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='danger'>You feel lightheaded.</span>"

@@ -95,11 +113,13 @@
 //Tourettes causes you to randomly stand in place and shout.
 /datum/mutation/human/tourettes
 	name = "Tourette's Syndrome"
+	desc = "A chronic twitch that forces the user to use colorful language."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You twitch.</span>"
+	synchronizer_coeff = 1

 /datum/mutation/human/tourettes/on_life(mob/living/carbon/human/owner)
-	if(prob(10) && owner.stat == CONSCIOUS && !owner.IsStun())
+	if(prob(10 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS && !owner.IsStun())
 		owner.Stun(200)
 		switch(rand(1, 3))
 			if(1)
@@ -117,6 +137,7 @@
 //Deafness makes you deaf.
 /datum/mutation/human/deaf
 	name = "Deafness"
+	desc = "The holder of this genome is completely deaf."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You can't seem to hear anything.</span>"

@@ -134,8 +155,10 @@
 //Monified turns you into a monkey.
 /datum/mutation/human/race
 	name = "Monkified"
+	desc = "A strange genome, believing to be what differentiates monkeys from humans."
 	quality = NEGATIVE
 	time_coeff = 2
+	locked = TRUE //Species specific, keep out of actual gene pool

 /datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
@@ -145,3 +168,202 @@
 /datum/mutation/human/race/on_losing(mob/living/carbon/monkey/owner)
 	if(owner && istype(owner) && owner.stat != DEAD && (owner.dna.mutations.Remove(src)))
 		. = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+
+
+/datum/mutation/human/glow
+	name = "Glowy"
+	desc = "You permanently emit a light with a random color and intensity."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your skin begins to glow softly.</span>"
+	instability = 5
+	var/obj/effect/dummy/luminescent_glow/glowth //shamelessly copied from luminescents
+	var/glow = 1.5
+	power_coeff = 1
+
+/datum/mutation/human/glow/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	glowth = new(owner)
+	glowth.set_light(glow, glow, dna.features["mcolor"])
+
+/datum/mutation/human/glow/modify(mob/living/carbon/human/owner)
+	if(glowth)
+		glowth.set_light(glow + GET_MUTATION_POWER(src) , glow + GET_MUTATION_POWER(src), dna.features["mcolor"])
+
+/datum/mutation/human/glow/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	qdel(glowth)
+
+/datum/mutation/human/strong
+	name = "Strength"
+	desc = "The user's muscles slightly expand."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>You feel strong.</span>"
+	difficulty = 16
+
+/datum/mutation/human/fire
+	name = "Fiery Sweat"
+	desc = "The user's skin will randomly combust, but is generally alot more resilient to burning."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='warning'>You feel hot.</span>"
+	text_lose_indication = "<span class'notice'>You feel a lot cooler.</span>"
+	difficulty = 14
+	synchronizer_coeff = 1
+	power_coeff = 1
+
+/datum/mutation/human/fire/on_life(mob/living/carbon/human/owner)
+	if(prob((1+(100-dna.stability)/10)) * GET_MUTATION_SYNCHRONIZER(src))
+		owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src))
+		owner.IgniteMob()
+
+/datum/mutation/human/fire/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	owner.physiology.burn_mod *= 0.5
+
+/datum/mutation/human/fire/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	owner.physiology.burn_mod *= 2
+
+/datum/mutation/human/insulated
+	name = "Insulated"
+	desc = "The affected person does not conduct electricity."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your fingertips go numb.</span>"
+	text_lose_indication = "<span class='notice'>Your fingertips regain feeling.</span>"
+	difficulty = 16
+	instability = 25
+
+/datum/mutation/human/insulated/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
+
+/datum/mutation/human/insulated/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "genetics")
+
+
+/datum/mutation/human/glow/anti
+	name = "Anti-Glow"
+	desc = "Your skin seems to attract and absorb nearby light creating 'darkness' around you."
+	text_gain_indication = "<span class='notice'>Your light around you seems to disappear.</span>"
+	glow = -3.5 //Slightly stronger, since negating light tends to be harder than making it.
+	locked = TRUE
+
+/datum/mutation/human/stimmed
+	name = "Stimmed"
+	desc = "The user's chemical balance is more robust."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>You feel stimmed.</span>"
+	difficulty = 16
+
+/datum/mutation/human/paranoia
+	name = "Paranoia"
+	desc = "Subject is easily terrified, and may suffer from hallucinations."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='danger'>You feel screams echo through your mind...</span>"
+	text_lose_indication = "<span class'notice'>The screaming in your mind fades.</span>"
+
+/datum/mutation/human/paranoia/on_life(mob/living/carbon/human/owner)
+	if(prob(5) && owner.stat == CONSCIOUS)
+		owner.emote("scream")
+		owner.jitteriness = min(max(0, owner.jitteriness + 5), 30)
+		if(prob(25))
+			to_chat(owner,"<span class='warning'>You feel someone creeping in on you...</span>")
+			owner.hallucination += 20
+
+
+/datum/mutation/human/badblink
+	name = "Spatial Instability"
+	desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='warning'>The space around you twists sickeningly.</span>"
+	text_lose_indication = "<span class'notice'>The space around you settles back to normal.</span>"
+	difficulty = 18//high so it's hard to unlock and abuse
+	instability = 10
+	synchronizer_coeff = 1
+	energy_coeff = 1
+	power_coeff = 1
+	var/warpchance = 0
+
+/datum/mutation/human/badblink/on_life()
+	if (!owner)
+		return
+	if(prob(warpchance))
+		var/warpmessage = pick(
+		"<span class='warning'>With a sickening 720-degree twist of [owner.p_their()] back, [owner] vanishes into thin air.</span>",
+		"<span class='warning'>[owner] does some sort of strange backflip into another dimension. It looks pretty painful.</span>",
+		"<span class='warning'>[owner] does a jump to the left, a step to the right, and warps out of reality.</span>",
+		"<span class='warning'>[owner]'s torso starts folding inside out until it vanishes from reality, taking [owner] with it.</span>",
+		"<span class='warning'>One moment, you see [owner]. The next, [owner] is gone.</span>")
+		owner.visible_message(warpmessage, "<span class='userdanger'>You feel a wave of nausea as you fall through reality!</span>")
+		var/warpdistance = rand(10,15) * GET_MUTATION_POWER(src)
+		do_teleport(owner, get_turf(owner), warpdistance, channel = TELEPORT_CHANNEL_FREE)
+		owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (warpchance * warpdistance))
+		warpchance = 0
+		owner.visible_message("<span class='danger'>[owner] appears out of nowhere!</span>")
+	else
+		warpchance += 0.25 * GET_MUTATION_ENERGY(src)
+
+/datum/mutation/human/acidflesh
+	name = "Acidic Flesh"
+	desc = "Subject has acidic chemicals building up underneath the skin. This is often lethal."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='userdanger'>A horrible burning sensation envelops you as your flesh turns to acid!</span>"
+	text_lose_indication = "<span class'notice'>A feeling of relief fills you as your flesh goes back to normal.</span>"
+	difficulty = 18//high so it's hard to unlock and use on others
+	var/msgcooldown = 0
+
+/datum/mutation/human/acidflesh/on_life()
+	if(prob(25))
+		if(world.time > msgcooldown)
+			to_chat(owner, "<span class='danger'>Your acid flesh bubbles...</span>")
+			msgcooldown = world.time + 200
+		if(prob(15))
+			owner.acid_act(rand(30,50), 10)
+			owner.visible_message("<span class='warning'>[owner]'s skin bubbles and pops.</span>", "<span class='userdanger'>Your bubbling flesh pops! It burns!</span>")
+			playsound(owner,'sound/weapons/sear.ogg', 50, TRUE)
+
+/datum/mutation/human/gigantism
+	name = "Gigantism"//negative version of dwarfism
+	desc = "The cells within the subject spread out to cover more area, making the subject appear larger."
+	quality = MINOR_NEGATIVE
+	difficulty = 12
+
+/datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	owner.resize = 1.25
+	owner.update_transform()
+	owner.visible_message("<span class='danger'>[owner] suddenly grows!</span>", "<span class='notice'>Everything around you seems to shrink..</span>")
+
+/datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	owner.resize = 0.8
+	owner.update_transform()
+	owner.visible_message("<span class='danger'>[owner] suddenly shrinks!</span>", "<span class='notice'>Everything around you seems to grow..</span>")
+
+/datum/mutation/human/spastic
+	name = "Spastic"
+	desc = "Subject suffers from muscle spasms."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='warning'>You flinch.</span>"
+	text_lose_indication = "<span class'notice'>Your flinching subsides.</span>"
+	difficulty = 16
+
+/datum/mutation/human/spastic/on_acquiring()
+	if(..())
+		return
+	if (owner)
+		owner.apply_status_effect(STATUS_EFFECT_SPASMS)
+
+/datum/mutation/human/spastic/on_losing()
+	if(..())
+		return
+	if (owner)
+		owner.remove_status_effect(STATUS_EFFECT_SPASMS)
--- a/code/datums/mutations/chameleon.dm
+++ b/code/datums/mutations/chameleon.dm
@@ -1,12 +1,13 @@
 //Chameleon causes the owner to slowly become transparent when not moving.
 /datum/mutation/human/chameleon
 	name = "Chameleon"
+	desc = "A genome that causes the holder's skin to become transparent over time."
 	quality = POSITIVE
-	get_chance = 20
-	lowest_value = 256 * 12
+	difficulty = 16
 	text_gain_indication = "<span class='notice'>You feel one with your surroundings.</span>"
 	text_lose_indication = "<span class='notice'>You feel oddly exposed.</span>"
 	time_coeff = 5
+	instability = 25

 /datum/mutation/human/chameleon/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
--- a/code/datums/mutations/cold.dm
+++ b/code/datums/mutations/cold.dm
@@ -0,0 +1,43 @@
+/datum/mutation/human/geladikinesis
+	name = "Geladikinesis"
+	desc = "Allows the user to concentrate moisture and sub-zero forces into snow."
+	quality = POSITIVE
+	text_gain_indication = "<span class='notice'>Your hand feels cold.</span>"
+	instability = 10
+	difficulty = 10
+	synchronizer_coeff = 1
+	power = /obj/effect/proc_holder/spell/targeted/conjure_item/snow
+
+/obj/effect/proc_holder/spell/targeted/conjure_item/snow
+	name = "Create Snow"
+	desc = "Concentrates cryokinetic forces to create snow, useful for snow-like construction."
+	item_type = /obj/item/stack/sheet/mineral/snow
+	charge_max = 50
+	action_icon_state = "snow"
+	delete_old = FALSE
+
+
+/datum/mutation/human/cryokinesis
+	name = "Cryokinesis"
+	desc = "Draws negative energy from the sub-zero void to freeze surrounding temperatures at subject's will."
+	quality = POSITIVE //upsides and downsides
+	text_gain_indication = "<span class='notice'>Your hand feels cold.</span>"
+	instability = 20
+	difficulty = 12
+	synchronizer_coeff = 1
+	power = /obj/effect/proc_holder/spell/aimed/cryo
+
+/obj/effect/proc_holder/spell/aimed/cryo
+	name = "Cryobeam"
+	desc = "This power fires a frozen bolt at a target."
+	charge_max = 150
+	cooldown_min = 150
+	clothes_req = FALSE
+	range = 3
+	projectile_type = /obj/item/projectile/temp/cryo
+	base_icon_state = "icebeam"
+	action_icon_state = "icebeam"
+	active_msg = "You focus your cryokinesis!"
+	deactive_msg = "You relax."
+	active = FALSE
+
--- a/code/datums/mutations/cold_resistance.dm
+++ b/code/datums/mutations/cold_resistance.dm
@@ -1,32 +0,0 @@
-//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold.
-/datum/mutation/human/cold_resistance
-	name = "Cold Resistance"
-	quality = POSITIVE
-	get_chance = 25
-	lowest_value = 256 * 12
-	text_gain_indication = "<span class='notice'>Your body feels warm!</span>"
-	time_coeff = 5
-
-/datum/mutation/human/cold_resistance/New()
-	..()
-	visual_indicators |= mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER)
-
-/datum/mutation/human/cold_resistance/get_visual_indicator(mob/living/carbon/human/owner)
-	return visual_indicators[1]
-
-/datum/mutation/human/cold_resistance/on_acquiring(mob/living/carbon/human/owner)
-	if(..())
-		return
-	ADD_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
-//	ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")  CITADEL CHANGE
-
-/datum/mutation/human/cold_resistance/on_losing(mob/living/carbon/human/owner)
-	if(..())
-		return
-	REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
-//	REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")   CITADEL CHANGE
-
-/datum/mutation/human/cold_resistance/on_life(mob/living/carbon/human/owner)
-	if(owner.getFireLoss())
-		if(prob(1))
-			owner.heal_bodypart_damage(0,1)   //Is this really needed?
--- a/code/datums/mutations/combined.dm
+++ b/code/datums/mutations/combined.dm
@@ -0,0 +1,32 @@
+/datum/generecipe
+	var/required = "" //it hurts so bad but initial is not compatible with lists
+	var/result = null
+
+/proc/get_mixed_mutation(mutation1, mutation2)
+	if(!mutation1 || !mutation2)
+		return FALSE
+	if(mutation1 == mutation2) //this could otherwise be bad
+		return FALSE
+	for(var/A in GLOB.mutation_recipes)
+		if(findtext(A, "[mutation1]") && findtext(A, "[mutation2]"))
+			return GLOB.mutation_recipes[A]
+
+/datum/generecipe/x_ray
+	required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive"
+	result = /datum/mutation/human/thermal/x_ray
+
+/datum/generecipe/shock
+	required = "/datum/mutation/human/insulated; /datum/mutation/human/radioactive"
+	result = SHOCKTOUCH
+
+/datum/generecipe/mindread
+	required = "/datum/mutation/human/antenna; /datum/mutation/human/paranoia"
+	result = MINDREAD
+
+/datum/generecipe/antiglow
+	required = "/datum/mutation/human/glow; /datum/mutation/human/void"
+	result = ANTIGLOWY
+
+/datum/generecipe/tonguechem
+	required = "/datum/mutation/human/tongue_spike; /datum/mutation/human/stimmed"
+	result = TONGUESPIKECHEM
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -1,12 +1,13 @@
 //Hulk turns your skin green, and allows you to punch through walls.
 /datum/mutation/human/hulk
 	name = "Hulk"
+	desc = "A poorly understood genome that causes the holder's muscles to expand, inhibit speech and gives the person a bad skin condition."
 	quality = POSITIVE
-	get_chance = 15
-	lowest_value = 256 * 12
+	locked = TRUE
+	difficulty = 16
 	text_gain_indication = "<span class='notice'>Your muscles hurt!</span>"
-	species_allowed = list("fly") //no skeleton/lizard hulk
 	health_req = 25
+	instability = 40

 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
@@ -18,7 +19,7 @@
 	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
 	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)

-/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
+/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner,atom/target, proximity)
 	if(proximity) //no telekinetic hulk attack
 		return target.attack_hulk(owner)

@@ -32,7 +33,7 @@
 		return
 	REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
 	REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
-	ADD_TRAIT(owner, TRAIT_CHUNKYFINGERS, TRAIT_HULK)
+	REMOVE_TRAIT(owner, TRAIT_CHUNKYFINGERS, TRAIT_HULK)
 	owner.update_body_parts()
 	SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
 	UnregisterSignal(owner, COMSIG_MOB_SAY)
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -0,0 +1,19 @@
+/datum/mutation/human/radioactive
+	name = "Radioactivity"
+	desc = "A volatile mutation that causes the host to sent out deadly beta radiation. This affects both the hosts and their surroundings."
+	quality = NEGATIVE
+	text_gain_indication = "<span class='warning'>You can feel it in your bones!</span>"
+	time_coeff = 5
+	instability = 5
+	difficulty = 8
+
+/datum/mutation/human/radioactive/on_life(mob/living/carbon/human/owner)
+	radiation_pulse(owner, 20)
+
+/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
+	..()
+	if(!(type in visual_indicators))
+		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER))
+
+/datum/mutation/human/radioactive/get_visual_indicator()
+	return visual_indicators[type][1]
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -1,6 +1,7 @@
 //Nearsightedness restricts your vision by several tiles.
 /datum/mutation/human/nearsight
 	name = "Near Sightness"
+	desc = "The holder of this mutation has poor eyesight."
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='danger'>You can't see very well.</span>"

@@ -18,6 +19,7 @@
 //Blind makes you blind. Who knew?
 /datum/mutation/human/blind
 	name = "Blindness"
+	desc = "Renders the subject completely blind."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You can't seem to see anything.</span>"

@@ -32,43 +34,58 @@
 	owner.cure_blind(GENETIC_MUTATION)


-//X-ray Vision lets you see through walls.
-/datum/mutation/human/x_ray
-	name = "X Ray Vision"
+///Thermal Vision lets you see mobs through walls
+/datum/mutation/human/thermal
+	name = "Thermal Vision"
+	desc = "The user of this genome can visually percieve the unique human thermal signature."
 	quality = POSITIVE
-	get_chance = 25
-	lowest_value = 256 * 12
-	text_gain_indication = "<span class='notice'>The walls suddenly disappear!</span>"
+	difficulty = 18
+	text_gain_indication = "<span class='notice'>You can see the heat rising off of your skin...</span>"
 	time_coeff = 2
+	instability = 25
+	var/visionflag = TRAIT_THERMAL_VISION

-/datum/mutation/human/x_ray/on_acquiring(mob/living/carbon/human/owner)
+/datum/mutation/human/thermal/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return

+	ADD_TRAIT(owner, visionflag, GENETIC_MUTATION)
 	owner.update_sight()

-/datum/mutation/human/x_ray/on_losing(mob/living/carbon/human/owner)
+/datum/mutation/human/thermal/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
+	REMOVE_TRAIT(owner, visionflag, GENETIC_MUTATION)
 	owner.update_sight()

+///X-ray Vision lets you see through walls.
+/datum/mutation/human/thermal/x_ray
+	name = "X Ray Vision"
+	desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb
+	text_gain_indication = "<span class='notice'>The walls suddenly disappear!</span>"
+	instability = 35
+	locked = TRUE
+	visionflag = TRAIT_XRAY_VISION
+

 //Laser Eyes lets you shoot lasers from your eyes!
 /datum/mutation/human/laser_eyes
 	name = "Laser Eyes"
+	desc = "Reflects concentrated light back from the eyes."
 	quality = POSITIVE
-	dna_block = NON_SCANNABLE
+	locked = TRUE
+	difficulty = 16
 	text_gain_indication = "<span class='notice'>You feel pressure building up behind your eyes.</span>"
 	layer_used = FRONT_MUTATIONS_LAYER
 	limb_req = BODY_ZONE_HEAD

-/datum/mutation/human/laser_eyes/New()
+/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
 	..()
 	visual_indicators |= mutable_appearance('icons/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER)

-/datum/mutation/human/laser_eyes/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/laser_eyes/get_visual_indicator()
 	return visual_indicators[1]

-/datum/mutation/human/laser_eyes/on_ranged_attack(mob/living/carbon/human/owner, atom/target, mouseparams)
+/datum/mutation/human/laser_eyes/on_ranged_attack(atom/target, mouseparams)
 	if(owner.a_intent == INTENT_HARM)
 		owner.LaserEyes(target, mouseparams)
--- a/code/datums/mutations/space_adaptation.dm
+++ b/code/datums/mutations/space_adaptation.dm
@@ -0,0 +1,30 @@
+//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold.
+/datum/mutation/human/space_adaptation
+	name = "Space Adaptation"
+	desc = "A strange mutation that renders the host immune to the vacuum if space. Will still need an oxygen supply."
+	quality = POSITIVE
+	difficulty = 16
+	text_gain_indication = "<span class='notice'>Your body feels warm!</span>"
+	time_coeff = 5
+	instability = 30
+
+/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
+	..()
+	if(!(type in visual_indicators))
+		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
+
+/datum/mutation/human/space_adaptation/get_visual_indicator(mob/living/carbon/human/owner)
+	return visual_indicators[type][1]
+
+/datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner)
+	if(..())
+		return
+	ADD_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
+	ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")
+
+/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner)
+	if(..())
+		return
+	REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
+	REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")
+
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -3,6 +3,7 @@

 /datum/mutation/human/nervousness
 	name = "Nervousness"
+	desc = "Causes the holder to stutter."
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='danger'>You feel nervous.</span>"

@@ -13,6 +14,7 @@

 /datum/mutation/human/wacky
 	name = "Wacky"
+	desc = "<span class='sans'>Unknown.</span>"
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='sans'>You feel an off sensation in your voicebox.</span>"
 	text_lose_indication = "<span class='notice'>The off sensation passes.</span>"
@@ -34,6 +36,7 @@

 /datum/mutation/human/mute
 	name = "Mute"
+	desc = "Completely inhibits the vocal section of the brain."
 	quality = NEGATIVE
 	text_gain_indication = "<span class='danger'>You feel unable to express yourself at all.</span>"
 	text_lose_indication = "<span class='danger'>You feel able to speak freely again.</span>"
@@ -53,8 +56,8 @@

 /datum/mutation/human/smile
 	name = "Smile"
+	desc = "Causes the user to be in constant mania."
 	quality = MINOR_NEGATIVE
-	dna_block = NON_SCANNABLE
 	text_gain_indication = "<span class='notice'>You feel so happy. Nothing can be wrong with anything. :)</span>"
 	text_lose_indication = "<span class='notice'>Everything is terrible again. :(</span>"

@@ -95,7 +98,6 @@
 		message = replacetext(message," ugly "," beautiful ")
 		message = replacetext(message," douchbag "," nice guy ")
 		message = replacetext(message," whore "," lady ")
-		message = replacetext(message," gamer "," intellectual ")
 		message = replacetext(message," nerd "," smarty pants ")
 		message = replacetext(message," moron "," fun person ")
 		message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ")
@@ -121,8 +123,8 @@

 /datum/mutation/human/unintelligible
 	name = "Unintelligible"
+	desc = "Partially inhibits the vocal center of the brain, severely distorting speech."
 	quality = NEGATIVE
-	dna_block = NON_SCANNABLE
 	text_gain_indication = "<span class='danger'>You can't seem to form any coherent thoughts!</span>"
 	text_lose_indication = "<span class='danger'>Your mind feels more clear.</span>"

@@ -141,8 +143,9 @@

 /datum/mutation/human/swedish
 	name = "Swedish"
+	desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
 	quality = MINOR_NEGATIVE
-	dna_block = NON_SCANNABLE
+	locked = TRUE
 	text_gain_indication = "<span class='notice'>You feel Swedish, however that works.</span>"
 	text_lose_indication = "<span class='notice'>The feeling of Swedishness passes.</span>"

@@ -173,8 +176,8 @@

 /datum/mutation/human/chav
 	name = "Chav"
+	desc = "Unknown"
 	quality = MINOR_NEGATIVE
-	dna_block = NON_SCANNABLE
 	text_gain_indication = "<span class='notice'>Ye feel like a reet prat like, innit?</span>"
 	text_lose_indication = "<span class='notice'>You no longer feel like being rude and sassy.</span>"

@@ -220,12 +223,13 @@

 /datum/mutation/human/elvis
 	name = "Elvis"
+	desc = "A terrifying mutation named after its 'patient-zero'."
 	quality = MINOR_NEGATIVE
-	dna_block = NON_SCANNABLE
+	locked = TRUE
 	text_gain_indication = "<span class='notice'>You feel pretty good, honeydoll.</span>"
 	text_lose_indication = "<span class='notice'>You feel a little less conversation would be great.</span>"

-/datum/mutation/human/elvis/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/elvis/on_life()
 	switch(pick(1,2))
 		if(1)
 			if(prob(15))
@@ -266,8 +270,9 @@

 /datum/mutation/human/stoner
 	name = "Stoner"
+	desc = "A common mutation that severely decreases intelligence."
 	quality = NEGATIVE
-	dna_block = NON_SCANNABLE
+	locked = TRUE
 	text_gain_indication = "<span class='notice'>You feel...totally chill, man!</span>"
 	text_lose_indication = "<span class='notice'>You feel like you have a better sense of time.</span>"

--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -1,18 +1,20 @@
 //Telekinesis lets you interact with objects from range, and gives you a light blue halo around your head.
 /datum/mutation/human/telekinesis
 	name = "Telekinesis"
+	desc = "A strange mutation that allows the holder to interact with objects through thought."
 	quality = POSITIVE
-	get_chance = 20
-	lowest_value = 256 * 12
+	difficulty = 18
 	text_gain_indication = "<span class='notice'>You feel smarter!</span>"
 	limb_req = BODY_ZONE_HEAD
+	instability = 30

-/datum/mutation/human/telekinesis/New()
+/datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
 	..()
-	visual_indicators |= mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)
+	if(!(type in visual_indicators))
+		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))

 /datum/mutation/human/telekinesis/get_visual_indicator(mob/living/carbon/human/owner)
-	return visual_indicators[1]
+	return visual_indicators[type][1]

 /datum/mutation/human/telekinesis/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
-	target.attack_tk(owner)
+	target.attack_tk(owner)
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -11,7 +11,7 @@
 /datum/progressbar/New(mob/User, goal_number, atom/target)
 	. = ..()
 	if (!istype(target))
-		EXCEPTION("Invalid target given")
+		CRASH("Invalid target given")
 	if (goal_number)
 		goal = goal_number
 	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", HUD_LAYER)
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -168,7 +168,8 @@
 	id = "alien-nest"
 	description = "Not even Necropolis is safe from alien infestation. The competition for hosts has locked the legion and aliens in an endless conflict that can only be resolved by a PKA."
 	suffix = "lavaland_surface_alien_nest.dmm"
-	cost = 20
+	cost = 10
+	allow_duplicates = FALSE

 /datum/map_template/ruin/lavaland/fountain
 	name = "Fountain Hall"
@@ -176,6 +177,7 @@
 	description = "The fountain has a warning on the side. DANGER: May have undeclared side effects that only become obvious when implemented."
 	suffix = "lavaland_surface_fountain_hall.dmm"
 	cost = 5
+	allow_duplicates = FALSE

 /datum/map_template/ruin/lavaland/survivalcapsule
 	name = "Survival Capsule Ruins"
@@ -198,7 +200,7 @@
 	description = "A place of vile worship, the scrawling of blood in the middle glowing eerily. A demonic laugh echoes throughout the caverns"
 	suffix = "lavaland_surface_cultaltar.dmm"
 	allow_duplicates = FALSE
-	cost = 10
+	cost = 5

 /datum/map_template/ruin/lavaland/hermit
 	name = "Makeshift Shelter"
@@ -244,6 +246,7 @@
 	description = "A strange tumor which houses a powerful beast..."
 	suffix = "lavaland_surface_elite_tumor.dmm"
 	cost = 5
+	placement_weight = 3
 	always_place = TRUE
 	allow_duplicates = TRUE

@@ -255,4 +258,4 @@
 	suffix = "miningbase.dmm"
 	cost = 0
 	always_place = TRUE
-	unpickable = TRUE
+	unpickable = TRUE
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -322,3 +322,70 @@
 	suffix = "advancedlab.dmm"
 	name = "Abductor Replication Lab"
 	description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien."
+
+//Space ruins for the station z
+/datum/map_template/ruin/spacenearstation
+	prefix = "_maps/RandomRuins/SpaceRuinsStation/"
+	cost = 1
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/spacenearstation/roid1
+	id = "roid1"
+	suffix = "roid1.dmm"
+	name = "Mineable Asteroid 1"
+	description = "Mineral asteroid 1."
+	allow_duplicates = TRUE
+
+/datum/map_template/ruin/spacenearstation/roid2
+	id = "roid2"
+	suffix = "roid2.dmm"
+	name = "Crab Roid"
+	description = "Mineral asteroid. Ft. Crabs."
+
+/datum/map_template/ruin/spacenearstation/roid3
+	id = "roid3"
+	suffix = "roid3.dmm"
+	name = "Dorm Roid"
+	description = "Mineral asteroid. Ft. Dorm."
+
+/datum/map_template/ruin/spacenearstation/roid4
+	id = "roid4"
+	suffix = "roid4.dmm"
+	name = "Mineable Asteroid 2"
+	description = "Mineral asteroid 2."
+
+/datum/map_template/ruin/spacenearstation/roid5
+	id = "roid5"
+	suffix = "roid5.dmm"
+	name = "Mineable Asteroid 3"
+	description = "Mineral asteroid. Ft. Holofans."
+
+/datum/map_template/ruin/spacenearstation/roid6
+	id = "roid6"
+	suffix = "roid6.dmm"
+	name = "Mineable Asteroid 4"
+	description = "Mineral asteroid. Ft. Crashed escape pod."
+
+/datum/map_template/ruin/spacenearstation/roid7
+	id = "roid7"
+	suffix = "roid7.dmm"
+	name = "Mineable Asteroid 5"
+	description = "Mineral asteroid. Ft. Derelict space bar."
+
+/datum/map_template/ruin/spacenearstation/roid8
+	id = "roid8"
+	suffix = "roid8.dmm"
+	name = "Dead wizard Roid"
+	description = "Mineral asteroid. Ft. Dead wizard and toilet paradox bag."
+
+/datum/map_template/ruin/spacenearstation/roid9
+	id = "roid9"
+	suffix = "roid9.dmm"
+	name = "Monitoring Roid"
+	description = "Mineral asteroid. Ft. Station monitoring, syndie toolbox and erp."
+
+/datum/map_template/ruin/spacenearstation/roid10
+	id = "roid10"
+	suffix = "roid10.dmm"
+	name = "Maze Roid"
+	description = "Mineral asteroid. Ft. Brief maze."
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -73,8 +73,7 @@
 	owner.log_message("gained Vanguard stun immunity", LOG_ATTACK)
 	owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!")
 	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
-	owner.SetStun(0, FALSE)
-	owner.SetKnockdown(0)
+	owner.SetAllImmobility(0, FALSE)
 	owner.setStaminaLoss(0, FALSE)
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
@@ -97,7 +96,7 @@
 			if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"])
 				otheractiveabsorptions = TRUE
 		if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions)
-			owner.Knockdown(stuns_blocked)
+			owner.DefaultCombatKnockdown(stuns_blocked)
 			message_to_owner = "<span class='boldwarning'>The weight of the Vanguard's protection crashes down upon you!</span>"
 			if(stuns_blocked >= 300)
 				message_to_owner += "\n<span class='userdanger'>You faint from the exertion!</span>"
@@ -226,9 +225,8 @@
 	return ..()

 /datum/status_effect/wish_granters_gift/on_remove()
-	owner.revive(full_heal = 1, admin_revive = 1)
+	owner.revive(full_heal = TRUE, admin_revive = TRUE)
 	owner.visible_message("<span class='warning'>[owner] appears to wake from the dead, having healed all wounds!</span>", "<span class='notice'>You have regenerated.</span>")
-	owner.update_canmove()

 /obj/screen/alert/status_effect/wish_granters_gift
 	name = "Wish Granter's Immortality"
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -12,12 +12,12 @@
 	. = ..()
 	if(.)
 		if(updating_canmove)
-			owner.update_canmove()
+			owner.update_mobility()
 			if(needs_update_stat || issilicon(owner))
 				owner.update_stat()

 /datum/status_effect/incapacitating/on_remove()
-	owner.update_canmove()
+	owner.update_mobility()
 	if(needs_update_stat || issilicon(owner)) //silicons need stat updates in addition to normal canmove updates
 		owner.update_stat()

@@ -29,10 +29,22 @@
 /datum/status_effect/incapacitating/knockdown
 	id = "knockdown"

-/datum/status_effect/incapacitating/knockdown/tick()
+//IMMOBILIZED
+/datum/status_effect/incapacitating/immobilized
+	id = "immobilized"
+
+//PARALYZED
+/datum/status_effect/incapacitating/paralyzed
+	id = "paralyzed"
+
+/datum/status_effect/incapacitating/paralyzed/tick()
 	if(owner.getStaminaLoss())
 		owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds

+//DAZED
+/datum/status_effect/incapacitating/dazed
+	id = "dazed"
+
 //UNCONSCIOUS
 /datum/status_effect/incapacitating/unconscious
 	id = "unconscious"
@@ -116,6 +128,7 @@

 /datum/status_effect/electrode
 	id = "tased"
+	alert_type = null
 	var/slowdown = 1.5
 	var/slowdown_priority = 50		//to make sure the stronger effect overrides
 	var/affect_crawl = FALSE
@@ -143,7 +156,11 @@
 /datum/status_effect/electrode/tick()
 	var/diff = world.time - last_tick
 	if(owner)
-		owner.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
+		var/mob/living/carbon/C = owner
+		if(HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
+			qdel(src)
+		else
+			C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
 	last_tick = world.time

 /datum/status_effect/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
@@ -160,6 +177,8 @@
 	. = ..()
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
+		if(HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
+			return
 		if(C.combatmode)
 			C.toggle_combat_mode(TRUE)

@@ -211,7 +230,7 @@
 	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(chargecost = 0) && number_legs)
 		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
 			if(GLOB.ratvar_awakens)
-				owner.Knockdown(20)
+				owner.DefaultCombatKnockdown(20)
 			if(iscultist(owner))
 				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_L_LEG)
 				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_R_LEG)
@@ -558,7 +577,7 @@
 	var/old_oxyloss

 /datum/status_effect/kindle/tick()
-	owner.Knockdown(15, TRUE, FALSE, 15)
+	owner.DefaultCombatKnockdown(15, TRUE, FALSE, 15)
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
 		C.silent = max(2, C.silent)
@@ -782,3 +801,26 @@ datum/status_effect/pacify
 					to_chat(owner, "<span class='warning'>Your arm spasms!</span>")
 					owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK)
 					owner.throw_item(pick(targets))
+
+/datum/status_effect/dna_melt
+	id = "dna_melt"
+	duration = 600
+	status_type = STATUS_EFFECT_REPLACE
+	alert_type = /obj/screen/alert/status_effect/dna_melt
+	var/kill_either_way = FALSE //no amount of removing mutations is gonna save you now
+
+/datum/status_effect/dna_melt/on_creation(mob/living/new_owner, set_duration, updating_canmove)
+	. = ..()
+	to_chat(new_owner, "<span class='boldwarning'>My body can't handle the mutations! I need to get my mutations removed fast!</span>")
+
+/datum/status_effect/dna_melt/on_remove()
+	if(!ishuman(owner))
+		owner.gib() //fuck you in particular
+		return
+	var/mob/living/carbon/human/H = owner
+	H.something_horrible(kill_either_way)
+
+/obj/screen/alert/status_effect/dna_melt
+	name = "Genetic Breakdown"
+	desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
+	icon_state = "dna_melt"
--- a/code/datums/status_effects/gas.dm
+++ b/code/datums/status_effects/gas.dm
@@ -17,11 +17,11 @@
 		to_chat(owner, "<span class='userdanger'>You become frozen in a cube!</span>")
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
 	owner.add_overlay(cube)
-	owner.update_canmove()
+	owner.update_mobility()
 	return ..()

 /datum/status_effect/freon/tick()
-	owner.update_canmove()
+	owner.update_mobility()
 	if(can_melt && owner.bodytemperature >= BODYTEMP_NORMAL)
 		qdel(src)

@@ -31,14 +31,14 @@
 		if(!QDELETED(src))
 			to_chat(owner, "You break out of the ice cube!")
 			owner.remove_status_effect(/datum/status_effect/freon)
-			owner.update_canmove()
+			owner.update_mobility()

 /datum/status_effect/freon/on_remove()
 	if(!owner.stat)
 		to_chat(owner, "The cube melts!")
 	owner.cut_overlay(cube)
 	owner.adjust_bodytemperature(100)
-	owner.update_canmove()
+	owner.update_mobility()
 	UnregisterSignal(owner, COMSIG_LIVING_RESIST)

 /datum/status_effect/freon/watcher
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -106,9 +106,9 @@

 /datum/quirk/musician/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
-	var/obj/item/instrument/guitar/guitar = new(get_turf(H))
-	H.put_in_hands(guitar)
-	H.equip_to_slot(guitar, SLOT_IN_BACKPACK)
+	var/obj/item/choice_beacon/music/B = new(get_turf(H))
+	H.put_in_hands(B)
+	H.equip_to_slot(B, SLOT_IN_BACKPACK)
 	var/obj/item/musicaltuner/musicaltuner = new(get_turf(H))
 	H.put_in_hands(musicaltuner)
 	H.equip_to_slot(musicaltuner, SLOT_IN_BACKPACK)
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -18,7 +18,7 @@

 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison)
+	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation)
 	target_trait = ZTRAIT_STATION

 	immunity_type = "rad"
--- a/code/datums/wires/robot.dm
+++ b/code/datums/wires/robot.dm
@@ -22,7 +22,7 @@
 	status += "The law sync module is [R.lawupdate ? "on" : "off"]."
 	status += "The intelligence link display shows [R.connected_ai ? R.connected_ai.name : "NULL"]."
 	status += "The camera light is [!isnull(R.builtInCamera) && R.builtInCamera.status ? "on" : "off"]."
-	status += "The lockdown indicator is [R.lockcharge ? "on" : "off"]."
+	status += "The lockdown indicator is [R.locked_down ? "on" : "off"]."
 	status += "The reset module hardware light is [R.has_module() ? "on" : "off"]."
 	return status

@@ -54,7 +54,7 @@
 				R.lawsync()
 				R.show_laws()
 		if(WIRE_LOCKDOWN)
-			R.SetLockdown(!R.lockcharge) // Toggle
+			R.SetLockdown(!R.locked_down) // Toggle
 		if(WIRE_RESET_MODULE)
 			if(R.has_module())
 				R.visible_message("[R]'s module servos twitch.", "Your module display flickers.")
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -172,7 +172,7 @@
 	.["security_level"] = get_security_level()
 	.["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
 	// Amount of world's ticks in seconds, useful for calculating round duration
-	
+
 	//Time dilation stats.
 	.["time_dilation_current"] = SStime_track.time_dilation_current
 	.["time_dilation_avg"] = SStime_track.time_dilation_avg
@@ -187,3 +187,4 @@

 	if(!key_valid)
 		GLOB.topic_status_cache = .
+