From 64f5b883af91768c1c1fff82456e5c962410eeae Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Sun, 22 Oct 2023 22:59:14 -0400 Subject: [PATCH 1/3] APC single crew Switch APC weapons control from gunner to driver. --- code/modules/vehicles/apc/apc.dm | 6 ++++++ code/modules/vehicles/hardpoints/hardpoint.dm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index d71db37074..f37c925574 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -108,6 +108,9 @@ GLOBAL_LIST_EMPTY(command_apc_list) add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, /obj/vehicle/multitile/proc/name_vehicle )) else if(seat == VEHICLE_GUNNER) @@ -135,6 +138,9 @@ GLOBAL_LIST_EMPTY(command_apc_list) remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, /obj/vehicle/multitile/proc/name_vehicle, )) else if(seat == VEHICLE_GUNNER) diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm index ee49ebc0ab..5ee38069c4 100644 --- a/code/modules/vehicles/hardpoints/hardpoint.dm +++ b/code/modules/vehicles/hardpoints/hardpoint.dm @@ -62,7 +62,7 @@ //------INTERACTION VARS---------- //which seat can use this module - var/allowed_seat = VEHICLE_GUNNER + var/allowed_seat = VEHICLE_DRIVER //Cooldown on use of the hardpoint var/cooldown = 100 From 498798cf8f31ec36a0936dc8cf10b09d341b0ada Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Sun, 22 Oct 2023 23:00:26 -0400 Subject: [PATCH 2/3] APC variants single crew Forgot to change the verbs for the medical and command variants. --- code/modules/vehicles/apc/apc_command.dm | 6 ++++++ code/modules/vehicles/apc/apc_medical.dm | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index c5bd559283..eb74f78c73 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -98,6 +98,9 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -119,6 +122,9 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index f8809bedaa..dd24c6fa8f 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -54,6 +54,9 @@ add_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -75,6 +78,9 @@ remove_verb(M.client, list( /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, + /obj/vehicle/multitile/proc/switch_hardpoint, + /obj/vehicle/multitile/proc/cycle_hardpoint, + /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( From f0bace36fc64eea5277fde9fce4e5b49ca310462 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Thu, 26 Oct 2023 01:00:22 -0400 Subject: [PATCH 3/3] now only effects APC Now only APC hardpoints are controlled by driver, tank is untouched and still functional. No longer grant `Toggle Shift Click` to drivers as that verb is hard-coded for gunners and changing that is out of scope. --- code/modules/vehicles/apc/apc.dm | 2 -- code/modules/vehicles/apc/apc_command.dm | 2 -- code/modules/vehicles/apc/apc_medical.dm | 2 -- code/modules/vehicles/hardpoints/hardpoint.dm | 2 +- code/modules/vehicles/hardpoints/primary/dual_cannon.dm | 2 ++ code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm | 2 ++ code/modules/vehicles/hardpoints/support/flare.dm | 2 ++ 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index f37c925574..60d21f7090 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -110,7 +110,6 @@ GLOBAL_LIST_EMPTY(command_apc_list) /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, /obj/vehicle/multitile/proc/name_vehicle )) else if(seat == VEHICLE_GUNNER) @@ -140,7 +139,6 @@ GLOBAL_LIST_EMPTY(command_apc_list) /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, /obj/vehicle/multitile/proc/name_vehicle, )) else if(seat == VEHICLE_GUNNER) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index 1fdfb938d1..1e9fba7371 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -100,7 +100,6 @@ /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -124,7 +123,6 @@ /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index a1390753fc..c3b3a16bd8 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -56,7 +56,6 @@ /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) add_verb(M.client, list( @@ -80,7 +79,6 @@ /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click, )) else if(seat == VEHICLE_GUNNER) remove_verb(M.client, list( diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm index 5ee38069c4..ee49ebc0ab 100644 --- a/code/modules/vehicles/hardpoints/hardpoint.dm +++ b/code/modules/vehicles/hardpoints/hardpoint.dm @@ -62,7 +62,7 @@ //------INTERACTION VARS---------- //which seat can use this module - var/allowed_seat = VEHICLE_DRIVER + var/allowed_seat = VEHICLE_GUNNER //Cooldown on use of the hardpoint var/cooldown = 100 diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index 763bfb6984..d33fc1d628 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -19,6 +19,8 @@ origins = list(0, -2) + allowed_seat = VEHICLE_DRIVER + ammo = new /obj/item/ammo_magazine/hardpoint/boyars_dualcannon max_clips = 2 diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 4d454bed12..c7600059d9 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -18,6 +18,8 @@ origins = list(0, -2) + allowed_seat = VEHICLE_DRIVER + ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola/frontal_cannon max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm index 00dcd3ac18..2cee40064f 100644 --- a/code/modules/vehicles/hardpoints/support/flare.dm +++ b/code/modules/vehicles/hardpoints/support/flare.dm @@ -19,6 +19,8 @@ origins = list(0, -2) + allowed_seat = VEHICLE_DRIVER + ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher max_clips = 3