Merge pull request #3562 from X0-11/subsystemgamermanual

Vehicle weapons fix
HaloSpaceStation · Jun 9, 2024 · 404ad31 · 404ad31
2 parents 9639d24 + 3162493
commit 404ad31
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 9 deletions.
diff --git a/code/modules/halo/misc/payload.dm b/code/modules/halo/misc/payload.dm
@@ -104,6 +104,12 @@
 /obj/payload/Process()
 	checkexplode()
 
+/obj/payload/CanPass(atom/movable/mover)
+	if(istype(mover,/obj/item/projectile))
+		return 1
+
+	. = ..()
+
 //SELF DESTRUCT PAYLOAD DOES NOT MOVE//
 /obj/payload/self_destruct
 	anchored = 1

diff --git a/code/modules/halo/research/machines/dissembler.dm b/code/modules/halo/research/machines/dissembler.dm
@@ -46,7 +46,7 @@
 /obj/machinery/research/component_dissembler/attempt_load_item(var/obj/item/I, var/mob/user as mob)
 	. = ..()
 	if(.)
-		START_PROCESSING(SSobj, src)
+		START_PROCESSING(SSmachines, src)
 		update_use_power(2)
 		icon_state = "h_lathe_wloop"
 		flick("h_lathe_load", src)
@@ -66,7 +66,7 @@
 				qdel(loaded_item)
 				loaded_item = null
 				progress = 0
-				STOP_PROCESSING(SSobj, src)
+				STOP_PROCESSING(SSmachines, src)
 				icon_state = "h_lathe"
 		else
 			progress += decon_speed

diff --git a/code/modules/halo/vehicles/types/bull.dm b/code/modules/halo/vehicles/types/bull.dm
@@ -9,6 +9,7 @@
 
 	bound_height = 64
 	bound_width = 96
+	pixel_y = 10
 
 	comp_prof = /datum/component_profile/bull
 

diff --git a/code/modules/halo/vehicles/types/cobra.dm b/code/modules/halo/vehicles/types/cobra.dm
@@ -9,6 +9,7 @@
 
 	bound_height = 64
 	bound_width = 96
+	pixel_y = 10
 
 	comp_prof = /datum/component_profile/cobra
 

diff --git a/code/modules/halo/vehicles/types/scorpion.dm b/code/modules/halo/vehicles/types/scorpion.dm
@@ -10,6 +10,7 @@
 	bound_height = 64
 	bound_width = 64
 	pixel_x = -16
+	pixel_y = 10
 	comp_prof = /datum/component_profile/scorpion
 
 	ammo_containers = newlist(/obj/item/ammo_magazine/scorp_coax,/obj/item/ammo_magazine/scorp_shell)

diff --git a/code/modules/halo/vehicles/types/warthog.dm b/code/modules/halo/vehicles/types/warthog.dm
@@ -9,6 +9,7 @@
 
 	bound_height = 64
 	bound_width = 64
+	pixel_y = 6
 
 	comp_prof = /datum/component_profile/warthog
 

diff --git a/code/modules/halo/vehicles/vehiclebase.dm b/code/modules/halo/vehicles/vehiclebase.dm
@@ -321,13 +321,12 @@
 /obj/vehicles/proc/inactive_pilot_effects() //Overriden on a vehicle-by-vehicle basis.
 
 /obj/vehicles/Process()
-	if(world.time % 3)
-		comp_prof.give_gunner_weapons(src)
-		update_object_sprites()
-		if(active)
-			var/list/drivers = get_occupants_in_position("driver")
-			if(!drivers.len || isnull(drivers) || movement_destroyed)
-				inactive_pilot_effects()
+	comp_prof.give_gunner_weapons(src)
+	update_object_sprites()
+	if(active)
+		var/list/drivers = get_occupants_in_position("driver")
+		if(!drivers.len || isnull(drivers) || movement_destroyed)
+			inactive_pilot_effects()
 	if(!isnull(spawn_datum) && !ispath(spawn_datum))
 		spawn_datum.process_resource_regen()
 

diff --git a/code/modules/halo/vehicles/vehiclebase_weaponry.dm b/code/modules/halo/vehicles/vehiclebase_weaponry.dm
@@ -21,6 +21,10 @@
 	reconsider_magazine()
 	. = ..()
 
+/obj/item/weapon/gun/vehicle_turret/Destroy()
+	. = ..()
+	linked_vehicle = null
+
 /obj/item/weapon/gun/vehicle_turret/dropped(var/mob/user)
 	. = ..()
 	loc = null