From 97b52ed3d71a49325144327b32656be1bc2efef3 Mon Sep 17 00:00:00 2001 From: blah Date: Sun, 22 Apr 2018 14:02:27 +0100 Subject: [PATCH 1/2] Fixes a power creep that occurred with two objects that weren't realised by the project lead/owner and needs reverting. --- code/game/objects/items/inducer.dm | 9 ++------- code/modules/integrated_electronics/subtypes/power.dm | 2 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index e27c6166fe0..d974b20cdfd 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -102,12 +102,11 @@ else recharging = TRUE var/obj/item/stock_parts/cell/C = A.get_cell() - var/obj/item/gun/energy/E var/obj/O var/coefficient = 1 if(istype(A, /obj/item/gun/energy)) - coefficient = 0.075 // 14 loops to recharge an egun from 0-1000 - E = A + to_chat(user,"Error unable to interface with device" + return FALSE if(istype(A, /obj)) O = A if(C) @@ -118,8 +117,6 @@ return TRUE user.visible_message("[user] starts recharging [A] with [src].","You start recharging [A] with [src].") while(C.charge < C.maxcharge) - if(E) - E.semicd = TRUE // Prevents someone from firing continuously while recharging the gun. if(do_after(user, 10, target = user) && cell.charge) done_any = TRUE induce(C, coefficient) @@ -128,8 +125,6 @@ O.update_icon() else break - if(E) - E.reset_semicd() //We're done charging, so we'll let someone fire it now. if(done_any) // Only show a message if we succeeded at least once user.visible_message("[user] recharged [A]!","You recharged [A]!") recharging = FALSE diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index 7db6ecfcc8d..c78fef2ef81 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -40,6 +40,8 @@ var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) if(!AM) return FALSE + if(istype(AM, /obj/item/gun/energy) + return FALSE if(!assembly) return FALSE // Pointless to do everything else if there's no battery to draw from. var/obj/item/stock_parts/cell/cell = AM.get_cell() From 0042b1237988d7f051af052582b70c68b6ed20d3 Mon Sep 17 00:00:00 2001 From: blah Date: Sun, 22 Apr 2018 14:09:09 +0100 Subject: [PATCH 2/2] What I get for commiting without doing a build check first --- code/game/objects/items/inducer.dm | 2 +- code/modules/integrated_electronics/subtypes/power.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index d974b20cdfd..aa8df115b5a 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -105,7 +105,7 @@ var/obj/O var/coefficient = 1 if(istype(A, /obj/item/gun/energy)) - to_chat(user,"Error unable to interface with device" + to_chat(user,"Error unable to interface with device") return FALSE if(istype(A, /obj)) O = A diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index c78fef2ef81..eaebd43ffbc 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -40,7 +40,7 @@ var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) if(!AM) return FALSE - if(istype(AM, /obj/item/gun/energy) + if(istype(AM, /obj/item/gun/energy)) return FALSE if(!assembly) return FALSE // Pointless to do everything else if there's no battery to draw from.