fixes

code/game/objects/items/RCD.dm

@@ -135,6 +135,14 @@ RLD
 			flick("[icon_state]_empty", src)	//somewhat hacky thing to make RCDs with ammo counters actually have a blinking yellow light
 	return .
 
+
+/obj/item/construction/proc/check_menu(mob/living/user)
+	if(!istype(user))
+		return FALSE
+	if(user.incapacitated() || !user.Adjacent(src))
+		return FALSE
+	return TRUE
+
 /obj/item/construction/proc/range_check(atom/A, mob/user)
 	if(!(A in range(custom_range, get_turf(user))))
 		to_chat(user, "<span class='warning'>The \'Out of Range\' light on [src] blinks red.</span>")
@@ -276,13 +284,6 @@ RLD
 	//Not scaling these down to button size because they look horrible then, instead just bumping up radius.
 	return MA
 
-/obj/item/construction/rcd/proc/check_menu(mob/living/user)
-	if(!istype(user))
-		return FALSE
-	if(user.incapacitated() || !user.Adjacent(src))
-		return FALSE
-	return TRUE
-
 /obj/item/construction/rcd/proc/change_computer_dir(mob/user)
 	if(!user)
 		return
@@ -915,9 +916,9 @@ RLD
 		if(O.density) //let's not built ontop of dense stuff, like big machines and other obstacles, it kills my immershion
 			return FALSE
 
-/obj/item/construction/plumbing/afterattack(atom/A, mob/user, proximity)
+/obj/item/construction/plumbing/afterattack(atom/A, mob/user)
 	. = ..()
-	if(!prox_check(proximity))
+	if(!range_check(A, user))
 		return
 	if(istype(A, /obj/machinery/plumbing))
 		var/obj/machinery/plumbing/P = A

code/game/objects/structures/geyser.dm

@@ -1,74 +0,0 @@
-//If you look at the "geyser_soup" overlay icon_state, you'll see that the first frame has 25 ticks.
-//That's because the first 18~ ticks are completely skipped for some ungodly weird fucking byond reason
-
-/obj/structure/geyser
-	name = "geyser"
-	icon = 'icons/obj/lavaland/terrain.dmi'
-	icon_state = "geyser"
-	anchored = TRUE
-	var/decay = 0 //reagents/tick removed
-	var/erupting_state = null //set to null to get it greyscaled from "[icon_state]_soup". Not very usable with the whole random thing, but more types can be added if you change the spawn prob
-	var/activated = FALSE //whether we are active and generating chems
-	var/reagent_id = "oil"
-	var/potency = 2 //how much reagents we add every process (2 seconds)
-	var/max_volume = 500
-	var/start_volume = 50
-
-/obj/structure/geyser/proc/start_chemming()
-	activated = TRUE
-	create_reagents(max_volume, DRAINABLE)
-	reagents.add_reagent(reagent_id, start_volume)
-	START_PROCESSING(SSfluids, src) //It's main function is to be plumbed, so use SSfluids
-	if(erupting_state)
-		icon_state = erupting_state
-	else
-		var/mutable_appearance/I = mutable_appearance('icons/obj/lavaland/terrain.dmi', "[icon_state]_soup")
-		I.color = mix_color_from_reagents(reagents.reagent_list)
-		add_overlay(I)
-
-/obj/structure/geyser/process()
-	if(activated && reagents.total_volume <= reagents.maximum_volume) //this is also evaluated in add_reagent, but from my understanding proc calls are expensive and should be avoided in continous
-		reagents.add_reagent(reagent_id, potency)						   //processes
-		if(potency > 0)
-			potency =- decay //decaying!
-
-/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user, _reinforced)
-	if(!_reinforced)
-		to_chat(user, "<span class='warning'>The [P.name] isn't strong enough!</span>")
-		return
-	if(activated)
-		to_chat(user, "<span class'warning'>The [name] is already active!")
-		return
-
-	to_chat(user, "<span class='notice'>You start vigorously plunging [src]!")
-	if(do_after(user, 50*P.plunge_mod, target = src) && !activated)
-		start_chemming()
-
-/obj/structure/geyser/random
-	erupting_state = null
-	var/list/options = list("oil" = 2, "clf3" = 1) //formerly crudeoil, 2,1
-/obj/structure/geyser/random/Initialize()
-	. = ..()
-	reagent_id = pickweight(options)
-
-/obj/item/plunger
-	name = "plunger"
-	desc = "It's a plunger for plunging."
-	icon = 'icons/obj/watercloset.dmi'
-	icon_state = "plunger"
-	slot_flags = ITEM_SLOT_MASK
-
-	var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object
-	var/reinforced = FALSE //whether we do heavy duty stuff like geysers
-
-/obj/item/plunger/attack_obj(obj/O, mob/living/user)
-	if(!O.plunger_act(src, user, reinforced))
-		return ..()
-
-/obj/item/plunger/reinforced
-	name = "reinforced plunger"
-	desc = " It's an M. 7 Reinforced Plunger for heavy duty plunging."
-	icon_state = "reinforced_plunger"
-
-	reinforced = TRUE
-	plunge_mod = 0.8