Deconflict

code/datums/diseases/advance/symptoms/sensory.dm

@@ -24,35 +24,31 @@ Bonus
 	level = 5
 	severity = 0
 
-/datum/symptom/sensory_restoration/proc/check_and_add(reagent, check, add, mob/living/M)
-	if(M.reagents.get_reagent_amount(reagent) < check)
-		M.reagents.add_reagent(reagent, add)
-		return 1
-
 /datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB * 3))
 		var/mob/living/M = A.affected_mob
+		var/datum/reagents/RD = M.reagents
 
 		switch(A.stage)
 			if(2)
-				if(check_and_add("oculine", 10, 10, M))
+				if(RD.check_and_add("oculine", 10, 10))
 					to_chat(M, "<span class='notice'>Your hearing feels clearer and crisp.</span>")
 			if(3)
-				if(check_and_add("antihol", 10, 10, M))
+				if(RD.check_and_add("antihol", 10, 10))
 					to_chat(M, "<span class='notice'>You feel sober.</span>")
-				check_and_add("oculine", 10, 10, M)
+				RD.check_and_add("oculine", 10, 10)
 			if(4)
-				if(check_and_add("synaphydramine", 10, 5, M))
+				if(RD.check_and_add("synaphydramine", 10, 5))
 					to_chat(M, "<span class='notice'>You feel focused.</span>")
-				check_and_add("antihol", 10, 10, M)
-				check_and_add("oculine", 10, 10, M)
+				RD.check_and_add("antihol", 10, 10)
+				RD.check_and_add("oculine", 10, 10)
 			if(5)
-				if(check_and_add("mannitol", 10, 10, M))
+				if(RD.check_and_add("mannitol", 10, 10))
 					to_chat(M, "<span class='notice'>Your mind feels relaxed.</span>")
-				check_and_add("synaphydramine", 10, 5, M)
-				check_and_add("antihol", 10, 10, M)
-				check_and_add("oculine", 10, 10, M)
+				RD.check_and_add("synaphydramine", 10, 5)
+				RD.check_and_add("antihol", 10, 10)
+				RD.check_and_add("oculine", 10, 10)
 
 	return
 

code/datums/spell.dm

@@ -261,9 +261,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		if(istype(target,/mob/living) && message)
 			to_chat(target, text("[message]"))
 		if(sparks_spread)
-			var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread()
-			sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is
-			sparks.start()
+			do_sparks(sparks_amt, 0, location)
 		if(smoke_spread)
 			if(smoke_spread == 1)
 				var/datum/effect_system/smoke_spread/smoke = new
@@ -328,10 +326,10 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 
 /obj/effect/proc_holder/spell/targeted/choose_targets(mob/user = usr)
 	var/list/targets = list()
-	
+
 	switch(max_targets)
 		if(0) //unlimited
-		
+
 			if(!humans_only)
 				for(var/mob/living/target in view_or_range(range, user, selection_type))
 					targets += target
@@ -344,7 +342,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 				targets += user
 			else
 				var/possible_targets = list()
-				
+
 				if(!humans_only)
 					for(var/mob/living/M in view_or_range(range, user, selection_type))
 						if(!include_user && user == M)

code/datums/uplink_item.dm

@@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 5
 	job = list("Chief Medical Officer", "Medical Doctor", "Geneticist", "Psychiatrist",	"Chemist", "Paramedic", "Coroner", "Virologist")
 
-/datum/uplink_item/dangerous/cat_grenade
+/datum/uplink_item/jobspecific/cat_grenade
 	name = "Feral Cat Delivery Grenade"
 	desc = "The feral cat delivery grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
 	item = /obj/item/grenade/spawnergrenade/feral_cats
@@ -960,6 +960,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 1
 	surplus = 20
 
+/datum/uplink_item/stealthy_tools/clownkit
+	name = "Honk Brand Infiltration Kit"
+	desc = "All the tools you need to play the best prank Nanotrasen has ever seen. Includes a voice changer clown mask, magnetic clown shoes, and standard clown outfit, tools, and backpack."
+	reference = "HBIK"
+	item = /obj/item/storage/backpack/clown/syndie
+	cost = 6
+	gamemodes = list(/datum/game_mode/nuclear)
+	surplus = 0
+
 // DEVICE AND TOOLS
 
 /datum/uplink_item/device_tools