Merge branch 'CHOMPStation2:master' into master

code/datums/autolathe/tools.dm

@@ -63,3 +63,7 @@
 /datum/category_item/autolathe/tools/rsf
 	name = "rapid service fabricator"
 	path = /obj/item/weapon/rsf
+	
+/datum/category_item/autolathe/tools/cable_coil //CHOMPEdit  -- defaults to 1,5,10x with a 30x stack max, need to figure out 30x eventually
+	name = "cable coil"
+	path =/obj/item/stack/cable_coil

code/game/turfs/simulated/floor_types.dm

@@ -112,7 +112,7 @@
 /turf/simulated/shuttle/proc/underlay_update()
 	if(!takes_underlays)
 		//Basically, if it's not forced, and we don't care, don't do it.
-		return 0
+		return //CHOMP Edit removed 0. Sarcastically quoting the above comment ^ "Basically, if it's not stupposed to store a fucking value, don't store a fucking value."
 
 	var/turf/under //May be a path or a turf
 	var/mutable_appearance/us = new(src) //We'll use this for changes later

code/modules/vore/eating/belly_obj_vr.dm

@@ -237,6 +237,8 @@
 // Called whenever an atom enters this belly
 /obj/belly/Entered(atom/movable/thing, atom/OldLoc)
 	thing.belly_cycles = 0 //CHOMPEdit: reset cycle count
+	if(istype(thing, /mob/observer)) //CHOMPEdit. Silence, spook.
+		return
 	if(OldLoc in contents)
 		return //Someone dropping something (or being stripdigested)
 
@@ -630,7 +632,9 @@
 	//Incase they have the loop going, let's double check to stop it.
 	M.stop_sound_channel(CHANNEL_PREYLOOP)
 	// Delete the digested mob
-	M.ghostize() // Make sure they're out, so we can copy attack logs and such.
+	var/mob/observer/G = M.ghostize() //CHOMPEdit start. Make sure they're out, so we can copy attack logs and such.
+	if(G)
+		G.forceMove(src) //CHOMPEdit end.
 	qdel(M)
 
 // Handle a mob being absorbed

code/modules/vore/eating/contaminate_vr.dm

@@ -18,6 +18,7 @@ var/list/gurgled_overlays = list(
 
 /obj/item
 	var/gurgled = FALSE
+	var/oldname //CHOMPEdit
 	var/cleanname
 	var/cleandesc
 	var/gurgled_color

code/modules/vore/eating/digest_act_vr.dm

@@ -54,9 +54,9 @@
 					if(0)
 						d_stage_name = "ruined"
 				if(d_stage_name)
-					if(!cleanname)
-						cleanname = name
-					cleanname = "[d_stage_name] [initial(cleanname)]"
+					if(!oldname)
+						oldname = cleanname ? cleanname : name
+					cleanname = "[d_stage_name] [oldname]"
 					decontaminate()
 					gurgled_color = B.contamination_color //Apply the correct color setting so uncontaminable things can still have the right overlay.
 					gurgle_contaminate(B, B.contamination_flavor, B.contamination_color) //CHOMPEdit End