Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vehicle weapons fix #3562

Merged
merged 4 commits into from
Jun 9, 2024
Merged

Vehicle weapons fix #3562

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b8ee35
vehicle processing tweaks
X0-11 Jun 8, 2024
851e160
dissembler processing
X0-11 Jun 8, 2024
89552a2
turret tweaks
X0-11 Jun 8, 2024
3162493
payload canpass override
X0-11 Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/halo/research/machines/dissembler.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/halo/vehicles/types/bull.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

bound_height = 64
bound_width = 96
pixel_y = 10

comp_prof = /datum/component_profile/bull

Expand Down
1 change: 1 addition & 0 deletions code/modules/halo/vehicles/types/cobra.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

bound_height = 64
bound_width = 96
pixel_y = 10

comp_prof = /datum/component_profile/cobra

Expand Down
1 change: 1 addition & 0 deletions code/modules/halo/vehicles/types/scorpion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/halo/vehicles/types/warthog.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

bound_height = 64
bound_width = 64
pixel_y = 6

comp_prof = /datum/component_profile/warthog

Expand Down
13 changes: 6 additions & 7 deletions code/modules/halo/vehicles/vehiclebase.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
4 changes: 4 additions & 0 deletions code/modules/halo/vehicles/vehiclebase_weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading