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.
cmss13-devs · Oct 26, 2023 · f0bace3 · f0bace3
1 parent 29031f9
commit f0bace3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,6 +19,8 @@
 
 	origins = list(0, -2)
 
+	allowed_seat = VEHICLE_DRIVER
+
 	ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher
 	max_clips = 3