From 045742602dbe44591f5c752e0c6fa6917128bd93 Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:20:14 -0800 Subject: [PATCH 1/6] Update bigiron_suits.dm --- code/modules/clothing/suits/bigiron_suits.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/suits/bigiron_suits.dm b/code/modules/clothing/suits/bigiron_suits.dm index 86ee9300f6..e9eafdd50e 100644 --- a/code/modules/clothing/suits/bigiron_suits.dm +++ b/code/modules/clothing/suits/bigiron_suits.dm @@ -2419,28 +2419,24 @@ desc = "A combat armor set made by the Brotherhood of Steel, standard issue for all Knights. It bears a red stripe." icon_state = "brotherhood_armor_knight" item_state = "brotherhood_armor_knight" - slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_GLOBAL_MULT - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T1) -/obj/item/clothing/suit/armor/medium/combat/brotherhood/senior +/obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/senior name = "brotherhood senior knight armor" desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Senior Knights. It bears a silver stripe." icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" -/obj/item/clothing/suit/armor/medium/combat/brotherhood/sarge +/obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/sarge name = "brotherhood Knight Sarge Armor" desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Knight Sarge. It bears a silver stripe." icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_UP_DT_T1) -/obj/item/clothing/suit/armor/medium/combat/brotherhood/captain +/obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/captain name = "brotherhood head knight armor" desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Head Knights. It bears golden embroidery." icon_state = "brotherhood_armor_captain" item_state = "brotherhood_armor_captain" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate name = "initiate armor" @@ -2448,13 +2444,13 @@ icon_state = "brotherhood_armor" item_state = "brotherhood_armor" armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T2) + slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT -/obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate/mk2 +/obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood name = "reinforced knight armor" desc = "A reinforced set of bracers, greaves, and torso plating of prewar design This one is kitted with additional plates and, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_armor_mk2" item_state = "brotherhood_armor_mk2" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/medium/combat/brotherhood/outcast name = "brotherhood armor" //unused? From 9eb5c10b96e6d8fdbb57ddb46d2b568210977ad0 Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:26:15 -0800 Subject: [PATCH 2/6] Update f13factionhead.dm --- code/modules/clothing/head/f13factionhead.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm index fc5fdd8ff4..f72946c15f 100644 --- a/code/modules/clothing/head/f13factionhead.dm +++ b/code/modules/clothing/head/f13factionhead.dm @@ -805,40 +805,37 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot desc = "An improved combat helmet, bearing the symbol of the Knights." icon_state = "brotherhood_helmet_knight" item_state = "brotherhood_helmet_knight" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1) -/obj/item/clothing/head/helmet/f13/combat/brotherhood/senior +/obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood/senior name = "brotherhood senior knight helmet" desc = "An improved combat helmet, bearing the symbol of a Senior Knight." icon_state = "brotherhood_helmet_senior" item_state = "brotherhood_helmet_senior" -/obj/item/clothing/head/helmet/f13/combat/brotherhood/sarge +/obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood/sarge name = "brotherhood Knight Sargeant helmet" desc = "An improved combat helmet, bearing the symbol of a Sargeant." icon_state = "brotherhood_helmet_senior" item_state = "brotherhood_helmet_senior" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) -/obj/item/clothing/head/helmet/f13/combat/brotherhood/captain +/obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood/captain name = "brotherhood head knight helmet" desc = "An improved combat helmet, bearing the symbol of the Head Knight." icon_state = "brotherhood_helmet_captain" item_state = "brotherhood_helmet_captain" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2) /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate name = "initiate helmet" desc = "An old degraded pre-war combat helmet, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_helmet" item_state = "brotherhood_helmet" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) -/obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate/mk2 +/obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood name = "reinforced knight helmet" desc = "An advanced pre-war titanium plated, ceramic coated, kevlar, padded helmet designed to withstand extreme punishment of all forms, repainted to the colour scheme of the Brotherhood of Steel." icon_state = "brotherhood_helmet" item_state = "brotherhood_helmet" - armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T3, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/head/helmet/f13/combat/brotherhood/outcast name = "brotherhood helmet" From a67c0460fd4910e053c2879407197530b8bb2528 Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:28:34 -0800 Subject: [PATCH 3/6] Update recipes_misc.dm --- .../datums/components/crafting/recipes/recipes_misc.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index bfcbc68f18..59854b7105 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -767,9 +767,9 @@ always_available = FALSE /datum/crafting_recipe/bos_rca_convert - name = "Converted Combat Armor" - result = /obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate/mk2 - reqs = list(/obj/item/clothing/suit/armor/medium/combat = 1, + name = "Converted Reinforced Combat Armor" + result = /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood + reqs = list(/obj/item/clothing/suit/armor/medium/combat/mk2 = 1, /obj/item/stack/sheet/metal = 20, /obj/item/stack/crafting/goodparts = 5, /obj/item/stack/crafting/metalparts = 10) @@ -779,8 +779,8 @@ always_available = FALSE /datum/crafting_recipe/bos_rca_helm_convert - name = "Converted Combat Armor Helmet" - result = /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate/mk2 + name = "Converted Reinforced Combat Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood reqs = list(/obj/item/clothing/suit/armor/medium/combat/mk2 = 1, /obj/item/stack/sheet/metal = 30, /obj/item/stack/crafting/goodparts = 5, From 342b257ebb42e3e0973552a580680e5fc994c3b8 Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:32:06 -0800 Subject: [PATCH 4/6] Update bos.dm --- code/modules/jobs/job_types/bos.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index 4ea7d5b816..06289cb8a6 100644 --- a/code/modules/jobs/job_types/bos.dm +++ b/code/modules/jobs/job_types/bos.dm @@ -407,13 +407,13 @@ Knight-Captain gunsmith_two = TRUE gunsmith_three = TRUE gunsmith_four = TRUE - suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood/captain + suit = /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/captain suit_store = /obj/item/gun/energy/laser/aer12 glasses = /obj/item/clothing/glasses/night accessory = /obj/item/clothing/accessory/bos/knightcaptain l_pocket = /obj/item/storage/belt/sabre/heavy mask = /obj/item/clothing/mask/gas/sechailer - head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/captain + head = /obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood/captain backpack_contents = list( /obj/item/melee/onehanded/knife/hunting = 1, /obj/item/reagent_containers/hypospray/medipen/stimpak = 3, @@ -733,8 +733,8 @@ Knight Sarge /datum/job/bos/f13knightsarge title = "Knight Sergeant" flag = F13KNIGHTSARGE - total_positions = 2 - spawn_positions = 2 + total_positions = 1 + spawn_positions = 1 description = " You are the Knight Sergeant of the Brotherhood Of Steel Expeditionary force, your goal is to maintain order within the ranks, above the scribes and knights you are below the paladin. Your duty is to maintain order within the knights, infantry work and primary grunt work as well as train the lower ranking knights and aspirants." supervisors = "the Knight-Captain and Paladin Commander" display_order = JOB_DISPLAY_ORDER_KNIGHTSARGE @@ -778,14 +778,14 @@ Knight Sarge /datum/outfit/job/bos/f13knightsarge name = "Senior Knight" jobtype = /datum/job/bos/f13knightsarge - suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood/sarge + suit = /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/sarge suit_store = /obj/item/gun/energy/laser/aer9 accessory = /obj/item/clothing/accessory/bos/knightsarge glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer belt = /obj/item/storage/belt/army/assault l_pocket = /obj/item/storage/belt/shoulderholster - head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/senior + head = /obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood/sarge gunsmith_one = TRUE gunsmith_two = TRUE gunsmith_three = TRUE @@ -909,8 +909,8 @@ Knight /datum/job/bos/f13knight title = "Knight" flag = F13KNIGHT - total_positions = 5 - spawn_positions = 5 + total_positions = 2 + spawn_positions = 2 description = "You are the Brotherhood Knight, the veritable lifeblood of your organization. You are a versatile and adaptably trained person: from your primary duties of weapon & armor repair to basic combat, survival and stealth skills, the only thing you lack is proper experience. You are also in charge of Initiates." supervisors = "the Head and Knight-Sergeant" display_order = JOB_DISPLAY_ORDER_KNIGHT @@ -1042,7 +1042,7 @@ Initiate /datum/outfit/loadout/initiatek name = "Knight-Aspirant" belt = /obj/item/storage/belt/utility - suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood + suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood/initiate head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate backpack_contents = list( /obj/item/gun/energy/laser/aer9 = 1, From 17a72116edb7998803549f96095a4cf6a14c49fc Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:53:33 -0800 Subject: [PATCH 5/6] Update bigiron_suits.dm --- code/modules/clothing/suits/bigiron_suits.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/bigiron_suits.dm b/code/modules/clothing/suits/bigiron_suits.dm index e9eafdd50e..13e104f891 100644 --- a/code/modules/clothing/suits/bigiron_suits.dm +++ b/code/modules/clothing/suits/bigiron_suits.dm @@ -2422,19 +2422,19 @@ /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/senior name = "brotherhood senior knight armor" - desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Senior Knights. It bears a silver stripe." + desc = "A reinforced combat armor set made by the Brotherhood of Steel, standard issue for all Senior Knights. It bears a silver stripe." icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/sarge name = "brotherhood Knight Sarge Armor" - desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Knight Sarge. It bears a silver stripe." + desc = "A reinforced combat armor set made by the Brotherhood of Steel, standard issue for all Knight Sarge. It bears a silver stripe." icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood/captain name = "brotherhood head knight armor" - desc = "A renforced combat armor set made by the Brotherhood of Steel, standard issue for all Head Knights. It bears golden embroidery." + desc = "A reinforced combat armor set made by the Brotherhood of Steel, standard issue for all Head Knights. It bears golden embroidery." icon_state = "brotherhood_armor_captain" item_state = "brotherhood_armor_captain" From f5e6d2af6d446134b28f61330842bcc5017cae5d Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Fri, 16 Jan 2026 23:57:32 -0800 Subject: [PATCH 6/6] Update recipes_misc.dm --- .../crafting/recipes/recipes_misc.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index 59854b7105..09f5b57365 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -748,8 +748,8 @@ name = "Converted Combat Armor" result = /obj/item/clothing/suit/armor/medium/combat/brotherhood reqs = list(/obj/item/clothing/suit/armor/medium/combat = 1, - /obj/item/stack/sheet/metal = 20, - /obj/item/stack/crafting/metalparts = 10) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT @@ -759,8 +759,8 @@ name = "Converted Combat Armor Helmet" result = /obj/item/clothing/head/helmet/f13/combat/brotherhood reqs = list(/obj/item/clothing/head/helmet/f13/combat = 1, - /obj/item/stack/sheet/metal = 20, - /obj/item/stack/crafting/metalparts = 10) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT @@ -770,9 +770,9 @@ name = "Converted Reinforced Combat Armor" result = /obj/item/clothing/suit/armor/medium/combat/mk2/brotherhood reqs = list(/obj/item/clothing/suit/armor/medium/combat/mk2 = 1, - /obj/item/stack/sheet/metal = 20, - /obj/item/stack/crafting/goodparts = 5, - /obj/item/stack/crafting/metalparts = 10) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/goodparts = 1, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT @@ -782,9 +782,9 @@ name = "Converted Reinforced Combat Armor Helmet" result = /obj/item/clothing/head/helmet/f13/combat/mk2/brotherhood reqs = list(/obj/item/clothing/suit/armor/medium/combat/mk2 = 1, - /obj/item/stack/sheet/metal = 30, - /obj/item/stack/crafting/goodparts = 5, - /obj/item/stack/crafting/metalparts = 10) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/goodparts = 1, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT @@ -794,9 +794,9 @@ name = "Converted Broken Riot Armor" result = /obj/item/clothing/suit/armor/heavy/riot/bos reqs = list(/obj/item/clothing/suit/armor/heavy/riot/combat = 1, - /obj/item/stack/sheet/metal = 40, - /obj/item/stack/crafting/goodparts = 10, - /obj/item/stack/crafting/metalparts = 20) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/goodparts = 1, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT @@ -806,9 +806,9 @@ name = "Converted Broken Riot Helmet" result = /obj/item/clothing/head/helmet/f13/combat/rangerbroken/bos reqs = list(/obj/item/clothing/head/helmet/f13/combat/rangerbroken = 1, - /obj/item/stack/sheet/metal = 40, - /obj/item/stack/crafting/goodparts = 10, - /obj/item/stack/crafting/metalparts = 20) + /obj/item/stack/sheet/metal = 5, + /obj/item/stack/crafting/goodparts = 1, + /obj/item/stack/crafting/metalparts = 1) time = 30 category = CAT_CRAFTING subcategory = CAT_CONVERT