From 878e15c44eee159a0c3365521832a95fe4c6f13f Mon Sep 17 00:00:00 2001 From: UserU <37943518+User-U-U@users.noreply.github.com> Date: Fri, 21 Oct 2022 00:44:11 -0700 Subject: [PATCH 1/5] Revert --- .../modules/overmap/ships/computers/computer_shims.dm | 11 ----------- code/modules/overmap/ships/computers/helm.dm | 1 - code/modules/shuttles/shuttle_console.dm | 6 ------ code/modules/shuttles/shuttles_vr.dm | 1 - 4 files changed, 19 deletions(-) diff --git a/code/modules/overmap/ships/computers/computer_shims.dm b/code/modules/overmap/ships/computers/computer_shims.dm index 72fdbe4fb7..16d9285c39 100644 --- a/code/modules/overmap/ships/computers/computer_shims.dm +++ b/code/modules/overmap/ships/computers/computer_shims.dm @@ -50,7 +50,6 @@ // /obj/machinery/computer/ship var/core_skill = /datum/skill/devices //The skill used for skill checks for this machine (mostly so subtypes can use different skills). - var/ai_control = TRUE //VOREStation Edit // // Topic @@ -71,11 +70,6 @@ return TRUE /obj/machinery/computer/ship/attack_ai(mob/user) - //VOREStation Addition Start - if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") - return - //VOREStation Addition End if(tgui_status(user, tgui_state()) > STATUS_CLOSE) return interface_interact(user) @@ -88,11 +82,6 @@ /obj/machinery/computer/ship/attack_hand(mob/user) if((. = ..())) return - //VOREStation Addition Start - if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") - return TRUE - //VOREStation Addition End if(!allowed(user)) to_chat(user, "Access Denied.") return TRUE diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 37c625dc89..b7ac91b162 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -29,7 +29,6 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit - ai_control = FALSE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help // fancy sprite /obj/machinery/computer/ship/helm/adv diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 562de3be08..d5b9ed31a9 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -10,16 +10,10 @@ var/skip_act = FALSE var/tgui_subtemplate = "ShuttleControlConsoleDefault" - var/ai_control = FALSE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help /obj/machinery/computer/shuttle_control/attack_hand(user as mob) if(..(user)) return - //VOREStation Addition Start - if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") - return TRUE - //VOREStation Addition End //src.add_fingerprint(user) //shouldn't need fingerprints just for looking at it. if(!allowed(user)) diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm index 58143b9950..7582e37ae7 100644 --- a/code/modules/shuttles/shuttles_vr.dm +++ b/code/modules/shuttles/shuttles_vr.dm @@ -34,7 +34,6 @@ name = "belter control console" req_one_access = list(access_mining, access_medical_equip) //Allows xenoarch, miners AND doctors to use it. shuttle_tag = "Belter" //The scanning console needs to enable/disable this at will. - ai_control = TRUE /obj/machinery/computer/shuttle_control/mining name = "mining elevator control console" From a5a30aadbac94b01fecd4c275e1478ffb61e6687 Mon Sep 17 00:00:00 2001 From: UserU <37943518+User-U-U@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:54:17 -0700 Subject: [PATCH 2/5] fix --- .../modules/overmap/ships/computers/computer_shims.dm | 11 +++++++++++ code/modules/overmap/ships/computers/helm.dm | 1 + code/modules/shuttles/shuttle_console.dm | 6 ++++++ code/modules/shuttles/shuttles_vr.dm | 1 + 4 files changed, 19 insertions(+) diff --git a/code/modules/overmap/ships/computers/computer_shims.dm b/code/modules/overmap/ships/computers/computer_shims.dm index 16d9285c39..72fdbe4fb7 100644 --- a/code/modules/overmap/ships/computers/computer_shims.dm +++ b/code/modules/overmap/ships/computers/computer_shims.dm @@ -50,6 +50,7 @@ // /obj/machinery/computer/ship var/core_skill = /datum/skill/devices //The skill used for skill checks for this machine (mostly so subtypes can use different skills). + var/ai_control = TRUE //VOREStation Edit // // Topic @@ -70,6 +71,11 @@ return TRUE /obj/machinery/computer/ship/attack_ai(mob/user) + //VOREStation Addition Start + if(!ai_control && issilicon(user)) + to_chat(user, "Access Denied.") + return + //VOREStation Addition End if(tgui_status(user, tgui_state()) > STATUS_CLOSE) return interface_interact(user) @@ -82,6 +88,11 @@ /obj/machinery/computer/ship/attack_hand(mob/user) if((. = ..())) return + //VOREStation Addition Start + if(!ai_control && issilicon(user)) + to_chat(user, "Access Denied.") + return TRUE + //VOREStation Addition End if(!allowed(user)) to_chat(user, "Access Denied.") return TRUE diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index b7ac91b162..56000342b7 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -29,6 +29,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit + ai_control = true //ChompStation Edit - Not an issue here // fancy sprite /obj/machinery/computer/ship/helm/adv diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index d5b9ed31a9..7ab961e824 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -10,10 +10,16 @@ var/skip_act = FALSE var/tgui_subtemplate = "ShuttleControlConsoleDefault" + var/ai_control = TRUE //ChompStation Edit - Unnecessary nuisance that causes issues. /obj/machinery/computer/shuttle_control/attack_hand(user as mob) if(..(user)) return + //VOREStation Addition Start + if(!ai_control && issilicon(user)) + to_chat(user, "Access Denied.") + return TRUE + //VOREStation Addition End //src.add_fingerprint(user) //shouldn't need fingerprints just for looking at it. if(!allowed(user)) diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm index 7582e37ae7..58143b9950 100644 --- a/code/modules/shuttles/shuttles_vr.dm +++ b/code/modules/shuttles/shuttles_vr.dm @@ -34,6 +34,7 @@ name = "belter control console" req_one_access = list(access_mining, access_medical_equip) //Allows xenoarch, miners AND doctors to use it. shuttle_tag = "Belter" //The scanning console needs to enable/disable this at will. + ai_control = TRUE /obj/machinery/computer/shuttle_control/mining name = "mining elevator control console" From d73eb1caec41b77761eb7ed21e969f3082085944 Mon Sep 17 00:00:00 2001 From: UserU <37943518+User-U-U@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:55:11 -0700 Subject: [PATCH 3/5] oops --- code/modules/overmap/ships/computers/helm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 56000342b7..68e36b93de 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit - ai_control = true //ChompStation Edit - Not an issue here + ai_control = TRUE //ChompStation Edit - Not an issue here // fancy sprite /obj/machinery/computer/ship/helm/adv From 7587cd51010a8fc4142df27ba7d5af33874acf1b Mon Sep 17 00:00:00 2001 From: UserU <37943518+User-U-U@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:30:32 -0700 Subject: [PATCH 4/5] comments --- code/modules/overmap/ships/computers/helm.dm | 2 +- code/modules/shuttles/shuttle_console.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 68e36b93de..beed8e4067 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit - ai_control = TRUE //ChompStation Edit - Not an issue here + ai_control = TRUE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help // Chompstation Edit - Not an issue on this server, use of shuttles is extremely rare also. // fancy sprite /obj/machinery/computer/ship/helm/adv diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 7ab961e824..28251d54d4 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -10,7 +10,7 @@ var/skip_act = FALSE var/tgui_subtemplate = "ShuttleControlConsoleDefault" - var/ai_control = TRUE //ChompStation Edit - Unnecessary nuisance that causes issues. + var/ai_control = TRUE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help //ChompStation Edit: Flying is better prevented by restricting the helm console if wanted. This is only an unnecessary nuisance that also breaks various other uses for the shuttle console. /obj/machinery/computer/shuttle_control/attack_hand(user as mob) if(..(user)) From 0040080fb0b683e281eb1298ae434c12b6058c13 Mon Sep 17 00:00:00 2001 From: UserU <37943518+User-U-U@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:05:47 -0700 Subject: [PATCH 5/5] Update helm.dm --- code/modules/overmap/ships/computers/helm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index beed8e4067..f8687c8c23 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit - ai_control = TRUE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help // Chompstation Edit - Not an issue on this server, use of shuttles is extremely rare also. + ai_control = TRUE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help // Chompstation Edit - Not an issue on this server, use of shuttles is extremely rare also . // fancy sprite /obj/machinery/computer/ship/helm/adv