From eb6fc63a7b343d1a7da7480c53000ad12935a136 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 30 Dec 2014 16:11:25 +1030 Subject: [PATCH] Fixes #7564 and buffs the dead man's switch explosion radius (#7567). --- code/modules/clothing/spacesuits/rig/modules/combat.dm | 3 ++- code/modules/clothing/spacesuits/rig/modules/ninja.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index c45fdd7fd3..f8457375cc 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -142,6 +142,7 @@ toggleable = 1 use_power_cost = 50 active_power_cost = 5 + passive_power_cost = 0 gun_type = /obj/item/weapon/gun/energy/crossbow/ninja @@ -152,7 +153,7 @@ deactivate() return 0 - ..() + return ..() /obj/item/rig_module/mounted/energy_blade/activate() diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 63231dcd95..12ea8e7fb2 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -172,14 +172,14 @@ engage() /obj/item/rig_module/self_destruct/engage() - explosion(get_turf(src), 0, 0, 3, 4) + explosion(get_turf(src), 1, 2, 4, 5) if(holder && holder.wearer) holder.wearer.drop_from_inventory(src) del(holder) del(src) /obj/item/rig_module/self_destruct/small/engage() - explosion(get_turf(src), 0, 0, 1, 2) + explosion(get_turf(src), 0, 0, 3, 4) if(holder && holder.wearer) holder.wearer.drop_from_inventory(src) del(holder)