Merge pull request #3567 from X0-11/vicfix2.0

new places to start processing for vehicles
HaloSpaceStation · Jul 21, 2024 · b907368 · b907368
2 parents 78f53b9 + c29483e
commit b907368
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/code/modules/halo/vehicles/vehicle_occupant.dm b/code/modules/halo/vehicles/vehicle_occupant.dm
@@ -95,6 +95,8 @@
 	return null
 
 /obj/vehicles/proc/enter_as_position(var/mob/user,var/position = "passenger",var/forced_by_faction = null)
+	if(!is_processing)
+		START_PROCESSING(SSobj,src)
 	var/driver_faction = get_driver_faction()
 	var/faction_use = user.faction
 	if(forced_by_faction && forced_by_faction != "neutral")

diff --git a/code/modules/halo/vehicles/vehiclebase.dm b/code/modules/halo/vehicles/vehiclebase.dm
@@ -141,7 +141,6 @@
 	comp_prof = new comp_prof(src)
 	if(melee_type)
 		melee_weapon = new melee_type(null)
-	START_PROCESSING(SSobj, src)
 	update_object_sprites()
 	if(light_range != 0)
 		verbs += /obj/vehicles/verb/toggle_headlights
@@ -162,6 +161,7 @@
 		internal_air.temperature = T20C
 
 	GLOB.emp_candidates.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/vehicles/lost_in_space()
 	if(!can_space_move)