removes the gel

code/__DEFINES/equipment.dm

@@ -82,8 +82,6 @@
 #define NOTABLEMERGE (1<<13)
 /// Has heat source but isn't 'on fire' and thus can be stored
 #define IGNITING_ITEM (1<<14)
-/// Is in the process of falling apart.
-#define ITEM_DISSOLVING (1<<15)
 //==========================================================================================
 
 

code/game/objects/items.dm

@@ -272,8 +272,6 @@ cases. Override_icon_state should be a list.*/
 		. += desc
 	if(desc_lore)
 		. += SPAN_NOTICE("This has an <a href='byond://?src=\ref[src];desc_lore=1'>extended lore description</a>.")
-	if(flags_item & ITEM_DISSOLVING)
-		. += SPAN_WARNING("It is currently dissolving into bits!")
 
 /obj/item/attack_hand(mob/user)
 	if (!user)
@@ -312,10 +310,6 @@ cases. Override_icon_state should be a list.*/
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACKED, W, user) & COMPONENT_CANCEL_ITEM_ATTACK)
 		return
 
-	if((flags_item & ITEM_PREDATOR) && (istype(W, /obj/item/tool/yautja_cleaner)))
-		if(handle_dissolve(user))
-			return
-
 	if(istype(W,/obj/item/storage))
 		var/obj/item/storage/S = W
 		if(S.storage_flags & STORAGE_CLICK_GATHER && isturf(loc))
@@ -1070,45 +1064,3 @@ cases. Override_icon_state should be a list.*/
 	animate(attack_image, alpha = 175, transform = copy_transform.Scale(0.75), pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
 	animate(time = 1)
 	animate(alpha = 0, time = 3, easing = CIRCULAR_EASING|EASE_OUT)
-
-/obj/item/proc/handle_dissolve(mob/user)
-	if(!(flags_item & ITEM_PREDATOR))
-		return FALSE
-	if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH))
-		to_chat(user, SPAN_WARNING("You have no idea what this even does..."))
-		return FALSE
-	if(istype(src, /obj/item/tool/yautja_cleaner))
-		to_chat(user, SPAN_WARNING("You cannot dissolve more dissolving fluid..."))
-		return FALSE
-	if(usr.alpha < 255)
-		to_chat(user, SPAN_BOLDWARNING("It would not be safe to attempt this while cloaked!"))
-		return FALSE
-	if(anchored)
-		to_chat(user, SPAN_WARNING("\The [src] cannot be moved by any means, why dissolve it?"))
-		return FALSE
-
-	var/mob/living/location = loc
-	var/mob/living/true_location = loc.loc
-	if(istype(location) || istype(true_location))
-		to_chat(user, SPAN_WARNING("You cannot dissolve this while it is being held!"))
-		return FALSE
-
-	dissolve(user)
-	return TRUE
-
-/obj/item/proc/dissolve(mob/user)
-	user.visible_message(SPAN_DANGER("[user] uncaps a vial and begins to pour out a vibrant blue liquid over \the [src]!"), \
-				SPAN_NOTICE("You begin to spread dissolving gel onto \the [src]!"))
-	if(do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE))
-		user.visible_message(SPAN_DANGER("[user] pours blue liquid all over \the [src]!"), \
-					SPAN_NOTICE("You cover \the [src] with dissolving gel!"))
-		add_filter("dissolve_gel", 1, list("type" = "outline", "color" = "#3333FFff", "size" = 1))
-		addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), 15 SECONDS)
-		addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, visible_message), SPAN_WARNING("[src] crumbles into pieces!")), 15 SECONDS)
-		flags_item |= ITEM_DISSOLVING
-		log_attack("[key_name(user)] dissolved [src] with Yautja Cleaner!")
-		return TRUE
-	else
-		user.visible_message(SPAN_WARNING("[user] stops pouring liquid on to \the [src]!"), \
-					SPAN_WARNING("You decide not to cover \the [src] with dissolving gel."))
-		return FALSE

code/modules/cm_preds/smartdisc.dm

@@ -59,12 +59,6 @@
 	var/list/L = hearers(src, dist)
 	return L
 
-/obj/item/explosive/grenade/spawnergrenade/smartdisc/attackby(obj/item/object, mob/user)
-	if(istype(object, /obj/item/tool/yautja_cleaner))
-		if(handle_dissolve(user))
-			return
-	..()
-
 /obj/item/explosive/grenade/spawnergrenade/smartdisc/attack_self(mob/user)
 	..()
 

code/modules/cm_preds/yaut_items.dm

@@ -248,12 +248,6 @@
 	flags_cold_protection = flags_armor_protection
 	flags_heat_protection = flags_armor_protection
 
-/obj/item/clothing/shoes/yautja/attackby(obj/item/object, mob/user)
-	if(istype(object, /obj/item/tool/yautja_cleaner))
-		if(handle_dissolve(user))
-			return
-	..()
-
 /obj/item/clothing/shoes/yautja/hunter
 	name = "clan greaves"
 	desc = "A pair of armored, perfectly balanced boots. Perfect for running through the jungle."
@@ -345,12 +339,6 @@
 			to_chat(hellhound, "\[Radio\]: [M.real_name] [verb], '<B>[message]</b>'.")
 	..()
 
-/obj/item/device/radio/headset/yautja/attackby(obj/item/object, mob/user)
-	if(istype(object, /obj/item/tool/yautja_cleaner))
-		if(handle_dissolve(user))
-			return
-	..()
-
 /obj/item/device/radio/headset/yautja/elder //primarily for use in another MR
 	name = "\improper Elder Communicator"
 	volume_settings = list(RADIO_VOLUME_QUIET_STR, RADIO_VOLUME_RAISED_STR, RADIO_VOLUME_IMPORTANT_STR, RADIO_VOLUME_CRITICAL_STR)
@@ -905,17 +893,6 @@
 	flags_item = ITEM_PREDATOR|DELONDROP|NODROP
 	paygrade = null
 
-/obj/item/tool/yautja_cleaner
-	name = "cleanser gel vial"
-	desc = "Used for dissolving the gear of the fallen whilst in the field."
-	icon = 'icons/obj/items/hunter/pred_gear.dmi'
-	icon_state = "blue_gel"
-	force = 0
-	throwforce = 1
-	w_class = SIZE_SMALL
-	flags_item = ITEM_PREDATOR
-	black_market_value = 150
-
 /obj/item/storage/medicomp
 	name = "medicomp"
 	desc = "A complex kit of alien tools and medicines."

code/modules/cm_preds/yaut_weapons.dm

@@ -778,12 +778,6 @@
 		. = list()
 		. += SPAN_NOTICE("Looks like some kind of...mechanical donut.")
 
-/obj/item/weapon/gun/launcher/spike/attackby(obj/item/object, mob/user)
-	if(istype(object, /obj/item/tool/yautja_cleaner))
-		if(handle_dissolve(user))
-			return
-	..()
-
 /obj/item/weapon/gun/launcher/spike/update_icon()
 	..()
 	var/new_icon_state = spikes <=1 ? null : icon_state + "[round(spikes/4, 1)]"
@@ -827,12 +821,6 @@
 		WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi'
 	)
 
-/obj/item/weapon/gun/energy/yautja/attackby(obj/item/object, mob/user)
-	if(istype(object, /obj/item/tool/yautja_cleaner))
-		if(handle_dissolve(user))
-			return
-	..()
-
 /obj/item/weapon/gun/energy/yautja/plasmarifle
 	name = "plasma rifle"
 	desc = "A long-barreled heavy plasma weapon capable of taking down large game. It has a mounted scope for distant shots and an integrated battery."