Merge pull request #275 from ReoDaProtovali/FactorioFeeding

Industrial Feeding Tubes

code/datums/traits/neutral.dm

@@ -191,10 +191,10 @@
 	medical_record_text = "Patient has been observed eating inedible garbage."
 
 /datum/quirk/trashcan/add()
-	quirk_holder.verbs += /mob/living/proc/eat_trash
+	add_verb(quirk_holder, /mob/living/proc/eat_trash)
 
 /datum/quirk/trashcan/remove()
-	quirk_holder.verbs -= /mob/living/proc/eat_trash
+	remove_verb(quirk_holder, /mob/living/proc/eat_trash)
 
 /datum/quirk/universal_diet
 	name = "Universal diet"

code/modules/recycling/disposal/outlet.dm

@@ -16,6 +16,10 @@
 
 /obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from)
 	. = ..()
+	//GS Add: Hacky Solution, but it works.
+	if(type == /obj/structure/disposaloutlet/industrial_feeding_tube)
+		return
+	//GS Add End.
 	if(make_from)
 		setDir(make_from.dir)
 		make_from.forceMove(src)

code/modules/recycling/disposal/pipe.dm

@@ -264,6 +264,9 @@
 
 	var/obj/structure/disposaloutlet/O = locate() in T
 	if(O)
+		//GS add: Fixes a minor issue where the trunk gets linked to feeding tube improperly
+		if(O.type = /obj/structure/disposaloutlet/industrial_feeding_tube)
+			return
 		linked = O