Merge pull request #9282 from Zuhayr/dev

Fixes

code/modules/hydroponics/seed_machines.dm

@@ -88,7 +88,7 @@
 		if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
 			user << "That seed is not compatible with our genetics technology."
 		else
-			user.remove_from_mob(W)
+			user.drop_from_inventory(W)
 			W.loc = src
 			seed = W
 			user << "You load [W] into [src]."
@@ -120,7 +120,7 @@
 					user << "That disk does not have any gene data loaded."
 					return
 
-			user.remove_from_mob(W)
+			user.drop_from_inventory(W)
 			W.loc = src
 			loaded_disk = W
 			user << "You load [W] into [src]."

code/modules/hydroponics/spreading/spreading_response.dm

@@ -13,8 +13,10 @@
 		spawn(1)
 			entangle(M)
 
-/obj/effect/plant/attack_hand(mob/user as mob)
-	// Todo, cause damage.
+/obj/effect/plant/attack_hand(var/mob/user)
+	manual_unbuckle(user)
+
+/obj/effect/plant/attack_generic(var/mob/user)
 	manual_unbuckle(user)
 
 /obj/effect/plant/proc/trodden_on(var/mob/living/victim)
@@ -76,7 +78,7 @@
 		if(can_grab)
 			src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
 			victim.loc = src.loc
-	
+
 	//entangling people
 	if(victim.loc == src.loc)
 		buckle_mob(victim)

code/modules/materials/materials.dm

@@ -40,6 +40,9 @@ var/list/name_to_material
 	if(!display_name)
 		display_name = name
 
+/material/placeholder
+	name = "placeholder"
+
 /material/proc/place_dismantled_girder(var/turf/target, var/material/reinf_material)
 	var/obj/structure/girder/G = new(target)
 	if(reinf_material)