diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index dd68e1a2f6e..25e9f43b588 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -124,7 +124,7 @@ var/global/max_secret_rooms = 6
 			treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/ambrosia/deus=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2,
 			/obj/item/seeds/coffee/robusta=2, /obj/item/seeds/tobacco/space=2)
 			fluffitems = list(/obj/item/weapon/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1,
-							  /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2,
+							  /obj/structure/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2,
 							  /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3)
 
 		/*if("poly")
@@ -194,7 +194,7 @@ var/global/max_secret_rooms = 6
 					A.fullUpdateMineralOverlays()
 		T = pick(emptyturfs)
 		if(T)
-			new /obj/effect/glowshroom/single(T) //Just to make it a little more visible
+			new /obj/structure/glowshroom/single(T) //Just to make it a little more visible
 			var/surprise = null
 			surprise = pickweight(treasureitems)
 			new surprise(T)//here's the prize
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index 6bcc43f97af..fd63864442d 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -109,7 +109,7 @@
 		charge_counter = charge_max
 		return
 	to_chat(user, "<span class='shadowling'>You silently disable all nearby lights.</span>")
-	for(var/obj/effect/glowshroom/G in orange(2, user)) //Why the fuck was this in the loop below?
+	for(var/obj/structure/glowshroom/G in orange(2, user)) //Why the fuck was this in the loop below?
 		G.visible_message("<span class='warning'>\The [G] withers away!</span>")
 		qdel(G)
 	for(var/turf/T in targets)
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 1f28e089832..4df0c51ed4d 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -1,6 +1,6 @@
 //separate dm since hydro is getting bloated already
 
-/obj/effect/glowshroom
+/obj/structure/glowshroom
 	name = "glowshroom"
 	desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
 	anchored = 1
@@ -16,32 +16,32 @@
 	var/spreadIntoAdjacentChance = 60
 	var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom
 
-/obj/effect/glowshroom/glowcap
+/obj/structure/glowshroom/glowcap
 	name = "glowcap"
 	desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent."
 	icon_state = "glowcap"
 	myseed = /obj/item/seeds/glowshroom/glowcap
 
-/obj/effect/glowshroom/shadowshroom
+/obj/structure/glowshroom/shadowshroom
 	name = "shadowshroom"
 	desc = "Mycena Umbra, a species of mushroom that emits shadow instead of light."
 	icon_state = "shadowshroom"
 	myseed = /obj/item/seeds/glowshroom/shadowshroom
 
-/obj/effect/glowshroom/single/Spread()
+/obj/structure/glowshroom/single/Spread()
 	return
 
-/obj/effect/glowshroom/examine(mob/user)
+/obj/structure/glowshroom/examine(mob/user)
 	. = ..()
 	to_chat(user, "This is a [generation]\th generation [name]!")
 
-/obj/effect/glowshroom/Destroy()
+/obj/structure/glowshroom/Destroy()
 	if(myseed)
 		qdel(myseed)
 		myseed = null
 	return ..()
 
-/obj/effect/glowshroom/New(loc, obj/item/seeds/newseed, mutate_stats)
+/obj/structure/glowshroom/New(loc, obj/item/seeds/newseed, mutate_stats)
 	..()
 	if(newseed)
 		myseed = newseed.Copy()
@@ -76,7 +76,7 @@
 
 	addtimer(src, "Spread", delay, FALSE)
 
-/obj/effect/glowshroom/proc/Spread()
+/obj/structure/glowshroom/proc/Spread()
 	var/turf/ownturf = get_turf(src)
 	var/shrooms_planted = 0
 	for(var/i in 1 to myseed.yield)
@@ -90,7 +90,7 @@
 			for(var/turf/simulated/floor/earth in view(3,src))
 				if(!ownturf.CanAtmosPass(earth))
 					continue
-				if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
+				if(spreadsIntoAdjacent || !locate(/obj/structure/glowshroom) in view(1,earth))
 					possibleLocs += earth
 				CHECK_TICK
 
@@ -101,7 +101,7 @@
 
 			var/shroomCount = 0 //hacky
 			var/placeCount = 1
-			for(var/obj/effect/glowshroom/shroom in newLoc)
+			for(var/obj/structure/glowshroom/shroom in newLoc)
 				shroomCount++
 			for(var/wallDir in cardinal)
 				var/turf/isWall = get_step(newLoc,wallDir)
@@ -110,7 +110,7 @@
 			if(shroomCount >= placeCount)
 				continue
 
-			var/obj/effect/glowshroom/child = new type(newLoc, myseed, TRUE)
+			var/obj/structure/glowshroom/child = new type(newLoc, myseed, TRUE)
 			child.generation = generation + 1
 			shrooms_planted++
 
@@ -121,7 +121,7 @@
 		myseed.yield -= shrooms_planted
 		addtimer(src, "Spread", delay, FALSE)
 
-/obj/effect/glowshroom/proc/CalcDir(turf/location = loc)
+/obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
 	var/direction = 16
 
 	for(var/wallDir in cardinal)
@@ -129,7 +129,7 @@
 		if(newTurf.density)
 			direction |= wallDir
 
-	for(var/obj/effect/glowshroom/shroom in location)
+	for(var/obj/structure/glowshroom/shroom in location)
 		if(shroom == src)
 			continue
 		if(shroom.floor) //special
@@ -153,13 +153,13 @@
 	floor = 1
 	return 1
 
-/obj/effect/glowshroom/attackby(obj/item/I, mob/user)
+/obj/structure/glowshroom/attackby(obj/item/I, mob/user)
 	..()
 	if(I.damtype != STAMINA)
 		endurance -= I.force
 		CheckEndurance()
 
-/obj/effect/glowshroom/ex_act(severity)
+/obj/structure/glowshroom/ex_act(severity)
 	switch(severity)
 		if(1)
 			qdel(src)
@@ -170,11 +170,11 @@
 			if(prob(5))
 				qdel(src)
 
-/obj/effect/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/structure/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
 		endurance -= 5
 		CheckEndurance()
 
-/obj/effect/glowshroom/proc/CheckEndurance()
+/obj/structure/glowshroom/proc/CheckEndurance()
 	if(endurance <= 0)
 		qdel(src)
diff --git a/code/game/smoothwall.dm b/code/game/smoothwall.dm
index 48d150dfb85..20dea8de7b0 100644
--- a/code/game/smoothwall.dm
+++ b/code/game/smoothwall.dm
@@ -83,7 +83,7 @@
 
 	// JESUS WHY
 	for(var/direction in cardinal)
-		for(var/obj/effect/glowshroom/shroom in get_step(src,direction))
+		for(var/obj/structure/glowshroom/shroom in get_step(src,direction))
 			if(!shroom.floor) //shrooms drop to the floor
 				shroom.floor = 1
 				shroom.icon_state = "glowshroomf"
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 935730efd9b..f923d08c694 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -229,7 +229,7 @@
 	desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark."
 	icon_state = "glowshroom"
 	filling_color = "#00FA9A"
-	var/effect_path = /obj/effect/glowshroom
+	var/effect_path = /obj/structure/glowshroom
 	origin_tech = "biotech=4;plasmatech=6"
 	light_color = "#006622"
 
@@ -245,7 +245,7 @@
 		var/turf/simulated/wall = get_step(user.loc, tempdir)
 		if(istype(wall))
 			maxcount++
-	for(var/obj/effect/glowshroom/G in user.loc)
+	for(var/obj/structure/glowshroom/G in user.loc)
 		count++
 	if(count >= maxcount)
 		to_chat(user, "<span class='warning'>There are too many shrooms here to plant [src].</span>")
@@ -277,7 +277,7 @@
 	desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
 	icon_state = "glowcap"
 	filling_color = "#00FA9A"
-	effect_path = /obj/effect/glowshroom/glowcap
+	effect_path = /obj/structure/glowshroom/glowcap
 	origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
 	light_color = "#8E0300"
 
@@ -324,5 +324,5 @@
 	name = "shadowshroom cluster"
 	desc = "<I>Mycena Umbra</I>: This species of mushroom emits shadow instead of light."
 	icon_state = "shadowshroom"
-	effect_path = /obj/effect/glowshroom/shadowshroom
+	effect_path = /obj/structure/glowshroom/shadowshroom
 	origin_tech = "biotech=4;plasmatech=4;magnets=4"
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 2ca2ae6aa72..8c0d4fb32e3 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -269,7 +269,7 @@
 						M.take_organ_damage(0,20)
 
 /datum/reagent/sacid/reaction_obj(obj/O, volume)
-	if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))
+	if((istype(O,/obj/item) || istype(O,/obj/structure/glowshroom)) && prob(40))
 		if(!O.unacidable)
 			var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
 			I.desc = "Looks like this was \an [O] some time ago."
@@ -615,7 +615,7 @@
 					H.status_flags |= DISFIGURED
 
 /datum/reagent/facid/reaction_obj(obj/O, volume)
-	if((istype(O, /obj/item) || istype(O, /obj/effect/glowshroom)))
+	if((istype(O, /obj/item) || istype(O, /obj/structure/glowshroom)))
 		if(!O.unacidable)
 			var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
 			I.desc = "Looks like this was \an [O] some time ago."
@@ -924,7 +924,7 @@
 		var/obj/structure/alien/weeds/alien_weeds = O
 		alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
 		alien_weeds.healthcheck()
-	else if(istype(O, /obj/effect/glowshroom)) //even a small amount is enough to kill it
+	else if(istype(O, /obj/structure/glowshroom)) //even a small amount is enough to kill it
 		qdel(O)
 	else if(istype(O,/obj/structure/spacevine))
 		var/obj/structure/spacevine/SV = O