From 41f02fa24db0e6486d68e1881549f2ef49d6400a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:26:58 -0700 Subject: [PATCH 1/5] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 3562350473..4c03950b5e 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -466,7 +466,7 @@ // MELEE GANG /obj/item/claymore/ctf - slot_flags = SLOT_BACK + slot_flags = ITEM_SLOT_BACK /obj/item/claymore/ctf/pre_attack(atom/target, mob/user, params) if(!is_ctf_target(target)) From 938091ff675ce464229a3e1647db8fb031943f08 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:31:20 -0700 Subject: [PATCH 2/5] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 4c03950b5e..9e5645027c 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -467,6 +467,8 @@ // MELEE GANG /obj/item/claymore/ctf slot_flags = ITEM_SLOT_BACK + armor_penetration = 100 + total_mass = 2 /obj/item/claymore/ctf/pre_attack(atom/target, mob/user, params) if(!is_ctf_target(target)) From 66a01c1fe9e12379fe96c3d2a8e9d9520495a699 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:32:40 -0700 Subject: [PATCH 3/5] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 9e5645027c..e72f04ed7f 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -467,8 +467,8 @@ // MELEE GANG /obj/item/claymore/ctf slot_flags = ITEM_SLOT_BACK - armor_penetration = 100 - total_mass = 2 + armour_penetration = 100 + total_mass = 1 /obj/item/claymore/ctf/pre_attack(atom/target, mob/user, params) if(!is_ctf_target(target)) From 46d2dc24e94b41af6f43a68eead63ea64fc529c2 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:43:04 -0700 Subject: [PATCH 4/5] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index e72f04ed7f..9c2c0fd15d 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -502,6 +502,8 @@ no_drops += W W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) + + ADD_TRAIT(H, TRAIT_FREESPRINT, "CTF") // The shielded hardsuit is already TRAIT_NODROP no_drops += H.get_item_by_slot(SLOT_GLOVES) From 77163c7909baac05734f98c46ef3c0bb9bcfd0e5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 12 Feb 2020 00:44:52 -0700 Subject: [PATCH 5/5] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 9c2c0fd15d..e72f04ed7f 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -502,8 +502,6 @@ no_drops += W W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) - - ADD_TRAIT(H, TRAIT_FREESPRINT, "CTF") // The shielded hardsuit is already TRAIT_NODROP no_drops += H.get_item_by_slot(SLOT_GLOVES)