Skip to content

Unfucks bos armor + recipe RCA fix #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Osmos123 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Unfucks bos armor + recipe RCA fix #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0457426
Update bigiron_suits.dm
Osmos123 Jan 17, 2026
9eb5c10
Update f13factionhead.dm
Osmos123 Jan 17, 2026
a67c046
Update recipes_misc.dm
Osmos123 Jan 17, 2026
342b257
Update bos.dm
Osmos123 Jan 17, 2026
17a7211
Update bigiron_suits.dm
Osmos123 Jan 17, 2026
f5e6d2a
Update recipes_misc.dm
Osmos123 Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions code/datums/components/crafting/recipes/recipes_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -759,32 +759,32 @@
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
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,
/obj/item/stack/sheet/metal = 20,
/obj/item/stack/crafting/goodparts = 5,
/obj/item/stack/crafting/metalparts = 10)
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 = 5,
/obj/item/stack/crafting/goodparts = 1,
/obj/item/stack/crafting/metalparts = 1)
time = 30
category = CAT_CRAFTING
subcategory = CAT_CONVERT
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,
/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
Expand All @@ -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
Expand All @@ -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
Expand Down
13 changes: 5 additions & 8 deletions code/modules/clothing/head/f13factionhead.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 8 additions & 12 deletions code/modules/clothing/suits/bigiron_suits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2419,42 +2419,38 @@
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."
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/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."
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"
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."
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"
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"
desc = "An old degraded pre war combat armor, repainted to the colour scheme of the Brotherhood of Steel."
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

Check failure on line 2447 in code/modules/clothing/suits/bigiron_suits.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown variable: ARMOR_SLOWDOWN_LESS_T2

/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?
Expand Down
18 changes: 9 additions & 9 deletions code/modules/jobs/job_types/bos.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading