From d1fc12e1c70b3cd7cfddc31d324a18d75e06cf4b Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 13 Aug 2014 20:58:49 +0100 Subject: [PATCH 1/2] More proximity fixes --- code/WorkInProgress/Wrongnumber/weldbackpack.dm | 8 +++++--- code/game/objects/items/weapons/implants/implanter.dm | 4 +++- code/game/objects/items/weapons/weaponry.dm | 4 +++- code/modules/mob/living/silicon/robot/robot_items.dm | 4 +++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/code/WorkInProgress/Wrongnumber/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm index b0a9f87b23..cb60ddc23f 100644 --- a/code/WorkInProgress/Wrongnumber/weldbackpack.dm +++ b/code/WorkInProgress/Wrongnumber/weldbackpack.dm @@ -34,13 +34,15 @@ user << "\blue The tank scoffs at your insolence. It only provides services to welders." return -/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob) - if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume < max_fuel) +/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) + if(!proximity) // this replaces and improves the get_dist checks commented out below + return + if (istype(O, /obj/structure/reagent_dispensers/fueltank) /*&& get_dist(src,O) <= 1*/ && src.reagents.total_volume < max_fuel) O.reagents.trans_to(src, max_fuel) user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank." playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return - else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume == max_fuel) + else if (istype(O, /obj/structure/reagent_dispensers/fueltank) /*&& get_dist(src,O) <= 1*/ && src.reagents.total_volume == max_fuel) user << "\blue The pack is already full!" return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index f1f5d8521e..b5c07a8f65 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -114,7 +114,9 @@ return ..() -/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob) +/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity) + if(!proximity) + return if(istype(A,/obj/item) && imp) var/obj/item/weapon/implant/compressed/c = imp if (c.scanned) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6fa6277758..782a5a1745 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -65,7 +65,9 @@ O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1) return -/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob) +/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity) + if(!proximity) + return if (istype(A, /turf/simulated/floor)) user << "\blue You hit the floor with the [src]." call(/obj/effect/rune/proc/revealrunes)(src) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 931cb0556b..33748f056e 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -6,7 +6,9 @@ name = "RoboTray" desc = "An autoloading tray specialized for carrying refreshments." -/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob) +/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob, proximity) + if(!proximity) + return if ( !target ) return // pick up items, mostly copied from base tray pickup proc From 95528fb448c854147ffdbb27710dcd08c56304bd Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 14 Aug 2014 11:17:33 +0100 Subject: [PATCH 2/2] Remove inline comments --- code/WorkInProgress/Wrongnumber/weldbackpack.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/Wrongnumber/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm index cb60ddc23f..18899745c9 100644 --- a/code/WorkInProgress/Wrongnumber/weldbackpack.dm +++ b/code/WorkInProgress/Wrongnumber/weldbackpack.dm @@ -35,14 +35,14 @@ return /obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) - if(!proximity) // this replaces and improves the get_dist checks commented out below + if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously return - if (istype(O, /obj/structure/reagent_dispensers/fueltank) /*&& get_dist(src,O) <= 1*/ && src.reagents.total_volume < max_fuel) + if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) O.reagents.trans_to(src, max_fuel) user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank." playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return - else if (istype(O, /obj/structure/reagent_dispensers/fueltank) /*&& get_dist(src,O) <= 1*/ && src.reagents.total_volume == max_fuel) + else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) user << "\blue The pack is already full!" return