Merge pull request #11527 from Ghommie/Ghommie-cit628

More bug reports yee'd their last haw.

code/modules/antagonists/blood_contract/blood_contract.dm

@@ -27,7 +27,7 @@
 	INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine
 
 	for(var/mob/living/carbon/human/P in GLOB.player_list)
-		if(P == H)
+		if(P == H || HAS_TRAIT(P, TRAIT_NO_MIDROUND_ANTAG))
 			continue
 		to_chat(P, "<span class='userdanger'>You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!</span>")
 		P.put_in_hands(new /obj/item/kitchen/knife/butcher(P), TRUE)

code/modules/events/holiday/vday.dm

@@ -16,13 +16,14 @@
 	..()
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
 		H.put_in_hands(new /obj/item/valentine)
-		var/obj/item/storage/backpack/b = locate() in H.contents
-		new /obj/item/reagent_containers/food/snacks/candyheart(b)
-		new /obj/item/storage/fancy/heart_box(b)
+		var/obj/item/storage/backpack/B = locate() in H.contents
+		if(B)
+			new /obj/item/reagent_containers/food/snacks/candyheart(B)
+			new /obj/item/storage/fancy/heart_box(B)
 
 	var/list/valentines = list()
 	for(var/mob/living/M in GLOB.player_list)
-		if(!M.stat && M.client && M.mind)
+		if(!M.stat && M.client && M.mind && !HAS_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG))
 			valentines |= M
 
 

code/modules/mining/lavaland/necropolis_chests.dm

@@ -136,7 +136,7 @@
 	desc = "A device which causes kinetic accelerators to permanently gain damage against creature types killed with it."
 	id = "bountymod"
 	materials = list(/datum/material/iron = 4000, /datum/material/silver = 4000, /datum/material/gold = 4000, /datum/material/bluespace = 4000)
-	reagents_list = list("blood" = 40)
+	reagents_list = list(/datum/reagent/blood = 40)
 	build_path = /obj/item/borg/upgrade/modkit/bounty
 
 //Spooky special loot

code/modules/mob/living/blood.dm

@@ -237,7 +237,7 @@
 		return /datum/reagent/blood/jellyblood
 	if(dna?.species?.exotic_blood)
 		return dna.species.exotic_blood
-	else if((NOBLOOD in dna.species.species_traits) || (HAS_TRAIT(src, TRAIT_NOCLONE)))
+	else if((dna && (NOBLOOD in dna.species.species_traits)) || HAS_TRAIT(src, TRAIT_NOCLONE))
 		return
 	else
 		return /datum/reagent/blood

code/modules/mob/living/carbon/human/species_types/skeletons.dm

@@ -24,7 +24,7 @@
 	id = "spaceskeleton"
 	limbs_id = "skeleton"
 	blacklisted = 1
-	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)
+	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT, TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)
 
 /datum/species/skeleton/space/check_roundstart_eligible()
 	return FALSE

code/modules/projectiles/guns/energy/dueling.dm

@@ -28,6 +28,16 @@
 /datum/duel/New()
 	id = next_id++
 
+/datum/duel/Destroy()
+	if(gun_A)
+		gun_A.duel = null
+		gun_A = null
+	if(gun_B)
+		gun_B.duel = null
+		gun_B = null
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
 /datum/duel/proc/try_begin()
 	//Check if both guns are held and if so begin.
 	var/mob/living/A = get_duelist(gun_A)
@@ -45,13 +55,13 @@
 
 	message_duelists("<span class='notice'>Set your gun setting and move [required_distance] steps away from your opponent.</span>")
 
-	START_PROCESSING(SSobj,src)
+	START_PROCESSING(SSobj, src)
 
-/datum/duel/proc/get_duelist(obj/gun)
-	var/mob/living/G = gun.loc
-	if(!istype(G) || !G.is_holding(gun))
-		return null
-	return G
+/datum/duel/proc/get_duelist(obj/item/gun/energy/dueling/G)
+	var/mob/living/L = G.loc
+	if(!istype(L) || !L.is_holding(G))
+		return
+	return L
 
 /datum/duel/proc/message_duelists(message)
 	var/mob/living/LA = get_duelist(gun_A)
@@ -66,7 +76,7 @@
 
 /datum/duel/proc/end()
 	message_duelists("<span class='notice'>Duel finished. Re-engaging safety.</span>")
-	STOP_PROCESSING(SSobj,src)
+	STOP_PROCESSING(SSobj, src)
 	state = DUEL_IDLE
 
 /datum/duel/process()
@@ -129,10 +139,11 @@
 		return FALSE
 	if(!isturf(A.loc) || !isturf(B.loc))
 		return FALSE
-	if(get_dist(A,B) != required_distance)
+	if(get_dist(A, B) != required_distance)
 		return FALSE
-	for(var/turf/T in getline(get_turf(A),get_turf(B)))
-		if(is_blocked_turf(T,TRUE))
+	for(var/i in getline(A.loc, B.loc))
+		var/turf/T = i
+		if(is_blocked_turf(T, TRUE))
 			return FALSE
 	return TRUE
 
@@ -180,7 +191,6 @@
 	return "duel_red"
 
 /obj/item/gun/energy/dueling/attack_self(mob/living/user)
-	. = ..()
 	if(duel.state == DUEL_IDLE)
 		duel.try_begin()
 	else
@@ -205,12 +215,9 @@
 		add_overlay(setting_overlay)
 
 /obj/item/gun/energy/dueling/Destroy()
-	. = ..()
-	if(duel.gun_A == src)
-		duel.gun_A = null
-	if(duel.gun_B == src)
-		duel.gun_B = null
-	duel = null
+	if(duel)
+		qdel(duel)
+	return ..()
 
 /obj/item/gun/energy/dueling/can_trigger_gun(mob/living/user)
 	. = ..()
@@ -234,10 +241,8 @@
 	if(duel.state == DUEL_READY)
 		duel.confirmations[src] = TRUE
 		to_chat(user,"<span class='notice'>You confirm your readiness.</span>")
-		return
 	else if(!is_duelist(target)) //I kinda want to leave this out just to see someone shoot a bystander or missing.
 		to_chat(user,"<span class='warning'>[src] safety system prevents shooting anyone but your designated opponent.</span>")
-		return
 	else
 		duel.fired[src] = TRUE
 		. = ..()

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -356,7 +356,6 @@
 		replace_beaker(user, B)
 		to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
 		updateUsrDialog()
-		update_icon()
 	else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/card/emag))
 		to_chat(user, "<span class='warning'>You can't load [I] into [src]!</span>")
 		return ..()

code/modules/research/rdconsole.dm

@@ -55,6 +55,10 @@ Nothing else in the console has ID requirements.
 	if (istype(ID, /datum/material))
 		var/datum/material/material = ID
 		return material.name
+
+	else if(GLOB.chemical_reagents_list[ID])
+		var/datum/reagent/reagent = GLOB.chemical_reagents_list[ID]
+		return reagent.name
 	return ID
 
 /obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).

code/modules/research/xenobiology/xenobiology.dm

@@ -705,8 +705,9 @@
 	desc = "A miraculous chemical mix that grants human like intelligence to living beings. It has been modified with Syndicate technology to also grant an internal radio implant to the target and authenticate with identification systems."
 
 /obj/item/slimepotion/slime/sentience/nuclear/after_success(mob/living/user, mob/living/simple_animal/SM)
-	var/obj/item/implant/radio/syndicate/imp = new
-	imp.implant(SM, user)
+	if(SM.can_be_implanted())
+		var/obj/item/implant/radio/syndicate/imp = new
+		imp.implant(SM, user)
 
 	SM.access_card = new /obj/item/card/id/syndicate(SM)
 	ADD_TRAIT(SM.access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
@@ -961,11 +962,12 @@
 	icon_state = "potgrey"
 
 /obj/item/slimepotion/slime/slimeradio/attack(mob/living/M, mob/user)
-	if(!ismob(M))
-		return
 	if(!isanimal(M))
 		to_chat(user, "<span class='warning'>[M] is too complex for the potion!</span>")
 		return
+	if(!M.can_be_implanted())
+		to_chat(user, "<span class='warning'>[M] is incompatible with the potion!</span>")
+		return
 	if(M.stat)
 		to_chat(user, "<span class='warning'>[M] is dead!</span>")
 		return

code/modules/spells/spell_types/rightandwrong.dm

@@ -163,7 +163,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 
 	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		var/turf/T = get_turf(H)
-		if(T && is_away_level(T.z))
+		if((T && is_away_level(T.z)) || HAS_TRAIT(H, TRAIT_NO_MIDROUND_ANTAG))
 			continue
 		if(summon_type == SUMMON_MAGIC)
 			give_magic(H)