From 73b4e8f5a65d6943995fca48d149337fbb7bdde2 Mon Sep 17 00:00:00 2001 From: c0 Date: Sun, 9 Aug 2015 15:22:25 +0300 Subject: [PATCH] Fixes #11110 --- .../items/weapons/implants/implant_explosive.dm | 12 ++++++------ .../objects/items/weapons/implants/implantuplink.dm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 719666b47b2..2b35e79369c 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -3,9 +3,9 @@ desc = "And boom goes the weasel." icon_state = "explosive" origin_tech = "materials=2;combat=3;biotech=4;syndicate=4" - var/weak = 1.6 - var/medium = 0.8 - var/heavy = 0.4 + var/weak = 2 + var/medium = 1 + var/heavy = 0.5 var/delay = 7 /obj/item/weapon/implant/explosive/get_data() @@ -42,7 +42,7 @@ /obj/item/weapon/implant/explosive/implant(mob/source) var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source - if(imp_e) + if(imp_e && imp_e != src) imp_e.heavy += heavy imp_e.medium += medium imp_e.weak += weak @@ -89,10 +89,10 @@ /obj/item/weapon/implant/explosive/macro/implant(mob/source) var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source - if(imp_e) + if(imp_e && imp_e != src) return 0 imp_e = locate(/obj/item/weapon/implant/explosive) in source - if(imp_e) + if(imp_e && imp_e != src) heavy += imp_e.heavy medium += imp_e.medium weak += imp_e.weak diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index b19bb66d995..3ccea8aee20 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -12,7 +12,7 @@ /obj/item/weapon/implant/uplink/implant(mob/source) var/obj/item/weapon/implant/imp_e = locate(src.type) in source - if(imp_e) + if(imp_e && imp_e != src) imp_e.hidden_uplink.uses += hidden_uplink.uses qdel(src) return 1