From b92ca2ba0ecfe941e8b72a6f3ca1ad16a7f2a349 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Wed, 25 Sep 2019 11:12:03 -0500 Subject: [PATCH 1/6] borgs with GPS's have their coordinates displayed in the status window --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 900705733ba..e8f5ce21445 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -572,6 +572,10 @@ var/list/robot_verbs_default = list( statpanel("Status") if(client.statpanel == "Status") show_cell_power() + var/total_user_contents = GetAllContents() + if(locate(/obj/item/gps/cyborg) in total_user_contents) + var/turf/T = get_turf(src) + stat(null, "GPS: [COORD(T)]") /mob/living/silicon/robot/restrained() return 0 From c91707b9e50e36f02fcb1abbd6f698067aa9a1ba Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Wed, 25 Sep 2019 18:58:28 -0500 Subject: [PATCH 2/6] no more borg KA spam logic fix logic fix logic fix --- code/modules/projectiles/guns/energy.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 3fbfcdaa934..5e2f1c6a8a6 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -198,7 +198,8 @@ if(R && R.cell) var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot if(R.cell.use(shot.e_cost)) //Take power from the borg... - power_supply.give(shot.e_cost) //... to recharge the shot + if(!istype(src, /obj/item/gun/energy/kinetic_accelerator/cyborg)) // Mining borg KA's can be spammed with no cooldown without this check + power_supply.give(shot.e_cost) //... to recharge the shot /obj/item/gun/energy/proc/get_external_power_supply() if(istype(loc, /obj/item/rig_module)) From 719aa65fa6672ad3c32420007e14a1dcaf59c1c0 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Fri, 27 Sep 2019 22:49:58 -0500 Subject: [PATCH 3/6] less hacky code update --- code/modules/projectiles/guns/energy.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5e2f1c6a8a6..a3132f55550 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -111,6 +111,13 @@ chambered = null //either way, released the prepared shot newshot() +/obj/item/gun/energy/kinetic_accelerator/process_chamber() + if(chambered && !chambered.BB) + var/obj/item/ammo_casing/energy/shot = chambered + power_supply.use(shot.e_cost) + chambered = null + newshot() + /obj/item/gun/energy/proc/select_fire(mob/living/user) select++ if(select > ammo_type.len) @@ -198,8 +205,7 @@ if(R && R.cell) var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot if(R.cell.use(shot.e_cost)) //Take power from the borg... - if(!istype(src, /obj/item/gun/energy/kinetic_accelerator/cyborg)) // Mining borg KA's can be spammed with no cooldown without this check - power_supply.give(shot.e_cost) //... to recharge the shot + power_supply.give(shot.e_cost) //... to recharge the shot /obj/item/gun/energy/proc/get_external_power_supply() if(istype(loc, /obj/item/rig_module)) From b895864a1a2164d8605e85a4e21c298fe71126a2 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Wed, 2 Oct 2019 02:00:50 -0500 Subject: [PATCH 4/6] robocharge overload --- code/modules/projectiles/guns/energy.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index a3132f55550..4c03ca27766 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -111,13 +111,6 @@ chambered = null //either way, released the prepared shot newshot() -/obj/item/gun/energy/kinetic_accelerator/process_chamber() - if(chambered && !chambered.BB) - var/obj/item/ammo_casing/energy/shot = chambered - power_supply.use(shot.e_cost) - chambered = null - newshot() - /obj/item/gun/energy/proc/select_fire(mob/living/user) select++ if(select > ammo_type.len) @@ -199,6 +192,9 @@ STOP_PROCESSING(SSobj, src) . = ..() +/obj/item/gun/energy/kinetic_accelerator/proc/robocharge() + return + /obj/item/gun/energy/proc/robocharge() if(isrobot(loc)) var/mob/living/silicon/robot/R = loc From a5e1b75aee81edcdd26b3e8673bc86751859f333 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Wed, 2 Oct 2019 02:03:26 -0500 Subject: [PATCH 5/6] oop, want this in the KA file not energy --- code/modules/projectiles/guns/energy.dm | 3 --- code/modules/projectiles/guns/energy/kinetic_accelerator.dm | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 4c03ca27766..3fbfcdaa934 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -192,9 +192,6 @@ STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/gun/energy/kinetic_accelerator/proc/robocharge() - return - /obj/item/gun/energy/proc/robocharge() if(isrobot(loc)) var/mob/living/silicon/robot/R = loc diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 9c1ea1a7a9f..728175f94f6 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -131,6 +131,9 @@ /obj/item/gun/energy/kinetic_accelerator/emp_act(severity) return +/obj/item/gun/energy/kinetic_accelerator/proc/robocharge() + return + /obj/item/gun/energy/kinetic_accelerator/proc/reload() power_supply.give(500) on_recharge() From c4933d76d5a8043199ab40aa894649e69c7d9c04 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Wed, 2 Oct 2019 02:10:46 -0500 Subject: [PATCH 6/6] what I get for trying to code at 2 am --- code/modules/projectiles/guns/energy/kinetic_accelerator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 728175f94f6..4a8ac99a2ef 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -131,7 +131,7 @@ /obj/item/gun/energy/kinetic_accelerator/emp_act(severity) return -/obj/item/gun/energy/kinetic_accelerator/proc/robocharge() +/obj/item/gun/energy/kinetic_accelerator/robocharge() return /obj/item/gun/energy/kinetic_accelerator/proc/reload()