From 2707d314fa36a1dafadfd075b4210c0f9ad73ff5 Mon Sep 17 00:00:00 2001 From: Ryll-Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Thu, 23 Jul 2020 18:46:32 -0400 Subject: [PATCH 1/2] make it a bit easier --- code/datums/components/gunpoint.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index e454b0921c3..77c1490f710 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -36,8 +36,8 @@ shooter.apply_status_effect(STATUS_EFFECT_HOLDUP) target.apply_status_effect(STATUS_EFFECT_HELDUP) - if(target.job == "Captain" && target.stat == CONSCIOUS && is_nuclear_operative(shooter)) - if(istype(weapon, /obj/item/gun/ballistic/rocketlauncher) && weapon.chambered) + if(istype(weapon, /obj/item/gun/ballistic/rocketlauncher) && weapon.chambered) + if(target.stat == CONSCIOUS && is_nuclear_operative(shooter) && (locate(/obj/item/disk/nuclear) in target.get_contents()) && shooter.client) shooter.client.give_award(/datum/award/achievement/misc/rocket_holdup, shooter) target.do_alert_animation(target) From 939556e31ef5e13f0829587766f8c402ee2ff8fb Mon Sep 17 00:00:00 2001 From: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Thu, 23 Jul 2020 20:10:26 -0400 Subject: [PATCH 2/2] non nukie target --- code/datums/components/gunpoint.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 77c1490f710..d8f1932bcd5 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -37,7 +37,7 @@ target.apply_status_effect(STATUS_EFFECT_HELDUP) if(istype(weapon, /obj/item/gun/ballistic/rocketlauncher) && weapon.chambered) - if(target.stat == CONSCIOUS && is_nuclear_operative(shooter) && (locate(/obj/item/disk/nuclear) in target.get_contents()) && shooter.client) + if(target.stat == CONSCIOUS && is_nuclear_operative(shooter) && !is_nuclear_operative(target) && (locate(/obj/item/disk/nuclear) in target.get_contents()) && shooter.client) shooter.client.give_award(/datum/award/achievement/misc/rocket_holdup, shooter) target.do_alert_animation(target)