From 482063faeb999af9e2af7574b050f548e186688d Mon Sep 17 00:00:00 2001 From: diegoflores31 Date: Mon, 6 May 2024 10:08:03 -0500 Subject: [PATCH 1/3] ARC --- code/modules/vehicles/arc/arc.dm | 3 ++- code/modules/vehicles/interior/interactable/seats.dm | 5 ++++- code/modules/vehicles/interior/interior_landmarks.dm | 2 ++ code/modules/vehicles/multitile/multitile.dm | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/vehicles/arc/arc.dm b/code/modules/vehicles/arc/arc.dm index feee097c3638..e560fbca0391 100644 --- a/code/modules/vehicles/arc/arc.dm +++ b/code/modules/vehicles/arc/arc.dm @@ -17,7 +17,7 @@ interior_map = /datum/map_template/interior/arc - passengers_slots = 3 + passengers_slots = 4 xenos_slots = 5 entrances = list( @@ -28,6 +28,7 @@ entrance_speed = 0.5 SECONDS required_skill = SKILL_VEHICLE_LARGE + driving_access = ACCESS_MARINE_COMMAND movement_sound = 'sound/vehicles/tank_driving.ogg' diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm index 8abbf9f1190d..9622f05ffbee 100644 --- a/code/modules/vehicles/interior/interactable/seats.dm +++ b/code/modules/vehicles/interior/interactable/seats.dm @@ -18,6 +18,7 @@ // Which vehicle skill level required to use this var/required_skill = SKILL_VEHICLE_SMALL + req_access = list() /obj/structure/bed/chair/comfy/vehicle/ex_act() return @@ -79,7 +80,9 @@ if(target == user) to_chat(user, SPAN_WARNING("You have no idea how to drive this thing!")) return FALSE - + if(!allowed(target)) + to_chat(user, SPAN_WARNING("The driving console blinks as it refuses your ID, Access Denied")) + return FALSE if(vehicle) vehicle.vehicle_faction = target.faction diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm index fa1eee8651ac..cef06d653c41 100644 --- a/code/modules/vehicles/interior/interior_landmarks.dm +++ b/code/modules/vehicles/interior/interior_landmarks.dm @@ -71,6 +71,7 @@ S.layer = layer S.vehicle = I.exterior S.required_skill = S.vehicle.required_skill + S.req_access += S.vehicle.driving_access S.setDir(dir) S.alpha = alpha S.update_icon() @@ -116,6 +117,7 @@ S.icon_state = icon_state S.vehicle = I.exterior S.required_skill = S.vehicle.required_skill + S.req_access += S.vehicle.driving_access S.setDir(dir) S.update_icon() S.alpha = alpha diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 18dade67b834..938bbd7b8226 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -65,7 +65,7 @@ // The amount of skill required to drive the vehicle var/required_skill = SKILL_VEHICLE_SMALL - + var/driving_access = null req_access = list() //List of accesses you need to enter req_one_access = list() //List of accesses you need one of to enter From 2cea33fab1ede0c1a68a8be65f040c404a50a468 Mon Sep 17 00:00:00 2001 From: diegoflores31 Date: Mon, 6 May 2024 10:19:06 -0500 Subject: [PATCH 2/3] a --- code/datums/supply_packs/vehicle_equipment.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/datums/supply_packs/vehicle_equipment.dm b/code/datums/supply_packs/vehicle_equipment.dm index df106761d467..069a3476afa3 100644 --- a/code/datums/supply_packs/vehicle_equipment.dm +++ b/code/datums/supply_packs/vehicle_equipment.dm @@ -7,3 +7,13 @@ containertype = /obj/structure/closet/crate/weapon containername = "RE700 Rotary Cannon crate" group = "Vehicle Equipment" + +/datum/supply_packs/driving_manual + name = "Standard Issue Driving Manual (x1)" + contains = list( + /obj/item/pamphlet/skill/vc, + ) + cost = 50 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Driving Manual crate" + group = "Vehicle Equipment" From 5d109edf8138a2bd0d96f9b73461dc57c716ff69 Mon Sep 17 00:00:00 2001 From: diegoflores31 Date: Mon, 6 May 2024 11:21:05 -0500 Subject: [PATCH 3/3] fix --- code/modules/vehicles/interior/interactable/seats.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm index 9622f05ffbee..f7360597b9e4 100644 --- a/code/modules/vehicles/interior/interactable/seats.dm +++ b/code/modules/vehicles/interior/interactable/seats.dm @@ -18,7 +18,6 @@ // Which vehicle skill level required to use this var/required_skill = SKILL_VEHICLE_SMALL - req_access = list() /obj/structure/bed/chair/comfy/vehicle/ex_act() return @@ -80,8 +79,8 @@ if(target == user) to_chat(user, SPAN_WARNING("You have no idea how to drive this thing!")) return FALSE - if(!allowed(target)) - to_chat(user, SPAN_WARNING("The driving console blinks as it refuses your ID, Access Denied")) + if(!allowed(target) && !isxeno(target)) // xenos cant hold IDs DUH + to_chat(user, SPAN_WARNING("The driving console blinks as it refuses your ID")) return FALSE if(vehicle) vehicle.vehicle_faction = target.faction