i probably should resolve conflicts with desktop

code/game/atoms.dm

@@ -869,10 +869,11 @@ Proc for attack log creation, because really why not
 			return filters[filter_data.Find(name)]
 
 /atom/movable/proc/remove_filter(name)
-	if(filter_data[name])
-		filter_data -= name
-		update_filters()
-		return TRUE
+	if(filter_data)
+		if(filter_data[name])
+			filter_data -= name
+			update_filters()
+			return TRUE
 
 /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1)
 	. |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels)

code/modules/hydroponics/grown/peas.dm

@@ -31,11 +31,11 @@
 
 // Laughing Peas
 /obj/item/seeds/peas/laugh
-	name = "pack of laughin' peas"
-	desc = "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
+	name = "pack of laughing peas"
+	desc = "These seeds give off a very soft purple glow.. they should grow into Laughing Peas."
 	icon_state = "seed-laughpeas"
 	species = "laughpeas"
-	plantname = "Laughin' Peas"
+	plantname = "Laughing Peas"
 	product = /obj/item/reagent_containers/food/snacks/grown/laugh
 	maturation = 7
 	potency = 10
@@ -53,7 +53,7 @@
 
 /obj/item/reagent_containers/food/snacks/grown/laugh
 	seed = /obj/item/seeds/peas/laugh
-	name = "pod of laughin' peas"
+	name = "pod of laughing peas"
 	desc = "Ridens Cicer, guaranteed to improve your mood dramatically upon consumption!"
 	icon_state = "laughpeas"
 	filling_color = "#ee7bee"