From 7b8ee352f48dcda423d88873a4b44ac079f76901 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 22:37:59 +0100 Subject: [PATCH 1/4] vehicle processing tweaks --- code/modules/halo/vehicles/types/bull.dm | 1 + code/modules/halo/vehicles/types/cobra.dm | 1 + code/modules/halo/vehicles/types/scorpion.dm | 1 + code/modules/halo/vehicles/types/warthog.dm | 1 + code/modules/halo/vehicles/vehiclebase.dm | 13 ++++++------- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/halo/vehicles/types/bull.dm b/code/modules/halo/vehicles/types/bull.dm index 09cb7d0734fc4..7e58b11c799c8 100644 --- 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 index 77e22031c3729..1f8a4a1ce7156 100644 --- 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 index e2b7ae5b162f9..c74c726188e88 100644 --- 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 index dba93456bc917..5f63b38d52bfa 100644 --- 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 index 4a6f45c12362c..63ad976177fed 100644 --- 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() From 851e160c1b6b181e743d6824664fff74eccbfb84 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 22:38:49 +0100 Subject: [PATCH 2/4] dissembler processing --- code/modules/halo/research/machines/dissembler.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/halo/research/machines/dissembler.dm b/code/modules/halo/research/machines/dissembler.dm index 59c4c99381b3a..c54fff67d3b78 100644 --- 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 From 89552a222398bd79c77ae589534c5f6938a95cdd Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 22:42:17 +0100 Subject: [PATCH 3/4] turret tweaks --- code/modules/halo/vehicles/vehiclebase_weaponry.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/halo/vehicles/vehiclebase_weaponry.dm b/code/modules/halo/vehicles/vehiclebase_weaponry.dm index 6708278465088..1e0afe95cd91b 100644 --- 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 From 3162493e4dc65593865276a07b32b0fe3b831207 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 8 Jun 2024 23:04:09 +0100 Subject: [PATCH 4/4] payload canpass override --- code/modules/halo/misc/payload.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/halo/misc/payload.dm b/code/modules/halo/misc/payload.dm index b41996f946607..de572d95c9087 100644 --- 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