Fixes roller beds and Pursuit RIG sprites

code/game/objects/buckling.dm

@@ -135,7 +135,7 @@
 	//		step_towards(M, src)
 
 	. = buckle_mob(M, forced)
-	playsound(src, 'sound/effects/seatbelt.ogg', 50, 1)
+	playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
 	if(.)
 		var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom.
 		if(!silent)
@@ -163,7 +163,7 @@
 
 /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
 	var/mob/living/M = unbuckle_mob(buckled_mob)
-	playsound(src, 'sound/effects/seatbelt.ogg', 50, 1)
+	playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
 	if(M)
 		if(M != user)
 			M.visible_message(\

code/modules/clothing/spacesuits/rig/suits/station_ch.dm

@@ -10,7 +10,7 @@
 	offline_slowdown = 3
 	offline_vision_restriction = 1
 	siemens_coefficient= 0.7
-
+	chest_type = /obj/item/clothing/suit/space/rig/ch
 	helm_type = /obj/item/clothing/head/helmet/space/rig/ch/pursuit
 
 	allowed = list(
@@ -50,7 +50,7 @@
 		
 		
 ////////////////////////////////////////////////////////////////////////////////////////		
-//Backend stuff to make the sprites work. Copied and pasted from rig_pieces_vr.dm, but added ch to everything. Only reason for this to be touched is to add or remove species.
+//Backend stuff to make the sprites work. Copied and pasted from rig_pieces_vr.dm, but added ch to everything. Only reason for this to be touched is to add or remove species. This might just need to go in a new file named rig_pieces_ch.dm.
 /obj/item/clothing/head/helmet/space/rig/ch
 	sprite_sheets = list(
 		SPECIES_HUMAN			= 'icons/mob/head_ch.dmi',
@@ -85,6 +85,7 @@
 		SPECIES_TESHARI 		= 'icons/mob/species/seromi/suit_ch.dmi'
 		)
 
+/*
 /obj/item/clothing/head/helmet/space/rig/ch
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW/*ywedit*/)
 	flags = PHORONGUARD //YAWN Edit
@@ -100,3 +101,4 @@
 /obj/item/clothing/suit/space/rig/ch
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW/*ywedit*/)
 	flags = PHORONGUARD //YAWN Edit
+*/

code/modules/mob/living/living.dm

@@ -206,7 +206,7 @@ default behaviour is:
 		/* VOREStation Removal - See above
 		if(confused && prob(50) && m_intent=="run")
 			Weaken(2)
-			playsound(src, "punch", 25, 1, -1)
+			playsound(loc, "punch", 25, 1, -1)
 			visible_message("<span class='warning'>[src] [pick("ran", "slammed")] into \the [AM]!</span>")
 			src.apply_damage(5, BRUTE)
 			to_chat(src, "<span class='warning'>You just [pick("ran", "slammed")] into \the [AM]!</span>")
@@ -817,7 +817,7 @@ default behaviour is:
 
 /mob/living/proc/dragged(var/mob/living/dragger, var/oldloc)
 	var/area/A = get_area(src)
-	if(lying && !buckled && pull_damage() && A.has_gravity() && (prob(getBruteLoss() * 200 / maxHealth)))
+	if(lying && !buckled && pull_damage() && A.has_gravity && (prob(getBruteLoss() * 200 / maxHealth)))
 		adjustBruteLoss(2)
 		visible_message("<span class='danger'>\The [src]'s [isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>")
 
@@ -826,18 +826,19 @@ default behaviour is:
 	handle_footstep(loc)
 
 	if(pulling) // we were pulling a thing and didn't lose it during our move.
-		var/pull_dir = get_dir(src, pulling)
-		
 		if(pulling.anchored || !isturf(pulling.loc))
 			stop_pulling()
-			
-		else if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) // puller and pullee more than one tile away or in diagonal position
+			return
+
+		var/pull_dir = get_dir(src, pulling)
+		if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) // puller and pullee more than one tile away or in diagonal position
 			// If it is too far away or across z-levels from old location, stop pulling.
 			if(get_dist(pulling.loc, oldloc) > 1 || pulling.loc.z != oldloc?.z)
 				stop_pulling()
+				return
 
 			// living might take damage from drags
-			else if(isliving(pulling))
+			if(isliving(pulling))
 				var/mob/living/M = pulling
 				M.dragged(src, oldloc)
 
@@ -845,35 +846,6 @@ default behaviour is:
 			if(pulling && get_dist(src, pulling) > 1) // the pullee couldn't keep up
 				stop_pulling()
 
-	if(!isturf(loc))
-		return	
-	else if(lastarea?.has_gravity == 0)
-		inertial_drift()
-	//VOREStation Edit Start
-	else if(flying)
-		inertial_drift()
-		make_floating(1)
-	//VOREStation Edit End
-	else if(!isspace(loc))
-		inertia_dir = 0
-		make_floating(0)
-
-/mob/living/proc/inertial_drift()
-	if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy))
-		if(Process_Spacemove(1))
-			inertia_dir = 0
-			return
-		
-		var/locthen = loc
-		spawn(5)
-			if(!anchored && !pulledby && loc == locthen)
-				var/stepdir = inertia_dir ? inertia_dir : last_move
-				if(!stepdir)
-					return
-				var/turf/T = get_step(src, stepdir)
-				if(!T)
-					return
-				Move(T, stepdir, 5)
 
 /mob/living/proc/handle_footstep(turf/T)
 	return FALSE
@@ -1038,7 +1010,7 @@ default behaviour is:
 
 					Stun(5)
 					src.visible_message("<span class='warning'>[src] throws up!</span>","<span class='warning'>You throw up!</span>")
-					playsound(src, 'sound/effects/splat.ogg', 50, 1)
+					playsound(loc, 'sound/effects/splat.ogg', 50, 1)
 
 					var/turf/simulated/T = get_turf(src)	//TODO: Make add_blood_floor remove blood from human mobs
 					if(istype(T))