diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm index 322d29b7afe..246bd4e66b6 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -49630,15 +49630,6 @@ /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"otY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt{ - color = "000000" - }, -/turf/open/floor/f13{ - icon_state = "reddirtyfull" - }, -/area/f13/brotherhood) "oue" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -61994,6 +61985,15 @@ dir = 1 }, /area/f13/wasteland) +"tFw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt{ + color = "000000" + }, +/turf/open/floor/f13{ + icon_state = "reddirtyfull" + }, +/area/f13/brotherhood) "tFG" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -104161,7 +104161,7 @@ pxe oHF tHV abg -otY +tFw wka jcI hRy diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 7951b190e02..eaf5722a5eb 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -80,6 +80,7 @@ #define CAT_CRAFTING "Crafting" //#define CAT_ROBOT "Electronics & Robots" #define CAT_FORGING "Forging & Smithing" +#define CAT_CONVERT "Armor Conversion" #define CAT_MISC "Misc" #define CAT_SCAVENGING "Scavenging & Tinkering" #define CAT_MISCELLANEOUS "Miscellaneous" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index c7e101580b4..3ce7e60fbc1 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -112,14 +112,15 @@ #define F13SENIORPALADIN (1<<2) #define F13PALADIN (1<<3) #define F13KNIGHTCAPTAIN (1<<4) -#define F13SENIORKNIGHT (1<<5) -#define F13KNIGHT (1<<6) -#define F13HEADSCRIBE (1<<7) -#define F13SENIORSCRIBE (1<<8) -#define F13SCRIBE (1<<9) -#define F13INITIATE (1<<10) -#define F13OFFDUTYBOS (1<<11) -#define F13ENVOY (1<<12) +#define F13KNIGHTSARGE (1<<5) +#define F13SENIORKNIGHT (1<<6) +#define F13KNIGHT (1<<7) +#define F13HEADSCRIBE (1<<8) +#define F13SENIORSCRIBE (1<<9) +#define F13SCRIBE (1<<10) +#define F13INITIATE (1<<11) +#define F13OFFDUTYBOS (1<<12) +#define F13ENVOY (1<<13) #define DEP_EASTWOOD (1<<6) @@ -328,6 +329,7 @@ #define JOB_DISPLAY_ORDER_SENIORPALADIN 69 #define JOB_DISPLAY_ORDER_PALADIN 70 #define JOB_DISPLAY_ORDER_KNIGHTCAPTAIN 71 +#define JOB_DISPLAY_ORDER_KNIGHTSARGE 72.9//lmao if it works don't brick it, time to copy you #define JOB_DISPLAY_ORDER_SENIORKNIGHT 72 #define JOB_DISPLAY_ORDER_KNIGHT 73 #define JOB_DISPLAY_ORDER_HEADSCRIBE 74 @@ -347,7 +349,7 @@ #define JOB_DISPLAY_ORDER_SHOPKEEPER 87 #define JOB_DISPLAY_ORDER_FAITHFUL 88// WHAT IS BITFLAG. WHAT DOES IT DO. WHERE IS THIS INFO USED. #define JOB_DISPLAY_ORDER_BANKER 89// IDK MAN BUT IT SEEMS IMPORTANT -#define JOB_DISPLAY_ORDER_BARKEEP 90 +#define JOB_DISPLAY_ORDER_BARKEEP 90//you should fuck with it to see how bad it gets #define JOB_DISPLAY_ORDER_PILOT 91 #define JOB_DISPLAY_ORDER_RADIOHOST 91.9 @@ -376,7 +378,7 @@ #define JOB_DISPLAY_ORDER_F13USSCI 109 #define JOB_DISPLAY_ORDER_F13USSGT 110 #define JOB_DISPLAY_ORDER_F13USCPL 110.9 //Pain n suffering, but this does work without 10 more hours of changing numbers -#define JOB_DISPLAY_ORDER_F13USSPC 111 +#define JOB_DISPLAY_ORDER_F13USSPC 111 //dont worry, I did the same thing for BoS sarge #define JOB_DISPLAY_ORDER_F13USPVT 112 #define JOB_DISPLAY_ORDER_CHIEF 113 diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index e82567c9813..b1f2fa8dd77 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -22,6 +22,7 @@ ), CAT_CRAFTING = list( CAT_SCAVENGING, + CAT_CONVERT, CAT_FORGING, CAT_TOOL, //CAT_ROBOT, diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index 4e92f6a8abf..e0b0220d33f 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -648,3 +648,348 @@ category = CAT_CRAFTING subcategory = CAT_SCAVENGING always_available = FALSE +//////////////////////////////////// +///////Faction Crafting///////////// +//////////////////////////////////// + +//////////////////////////////////// +//////////////BOS/////////////////// +//////////////////////////////////// + +/datum/crafting_recipe/bos_t45helm_convert + name = "Converted T-45b Power Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos + reqs = list(/obj/item/clothing/head/helmet/f13/power_armor/t45d = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/crafting/goodparts = 15, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_t45_convert + name = "Converted T-45b Power Armor" + result = /obj/item/clothing/suit/armor/power_armor/t45d/bos + reqs = list(/obj/item/clothing/suit/armor/power_armor/t45d = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/crafting/goodparts = 15, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_st45helm_convert + name = "Converted Salvaged T-45b Power Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos + reqs = list(/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b = 1, + /obj/item/stack/cable_coil = 15, + /obj/item/stack/crafting/electronicparts = 30, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/sheet/mineral/titanium = 15, + /obj/item/stack/crafting/goodparts = 5, + /obj/item/stack/crafting/metalparts = 20) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_st45_convert + name = "Converted Salvaged T-45b Power Armor" + result = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/bos + reqs = list(/obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/bos = 1, + /obj/item/stack/cable_coil = 15, + /obj/item/stack/crafting/electronicparts = 30, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/sheet/mineral/titanium = 15, + /obj/item/stack/crafting/goodparts = 5, + /obj/item/stack/crafting/metalparts = 20) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_t51_convert + name = "Converted T-51b Power Armor" + result = /obj/item/clothing/suit/armor/power_armor/t51b/bos + reqs = list(/obj/item/clothing/suit/armor/power_armor/t51b = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/sheet/mineral/titanium = 20, + /obj/item/stack/crafting/goodparts = 10, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_t51helm_convert + name = "Converted T-51b Power Armor" + result = /obj/item/clothing/head/helmet/f13/power_armor/t51b/bos + reqs = list(/obj/item/clothing/head/helmet/f13/power_armor/t51b = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/sheet/mineral/titanium = 20, + /obj/item/stack/crafting/goodparts = 10, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_ca_convert + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_ca_helm_convert + 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) + 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) + 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 + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_riot_convert + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/bos_riot_helm_convert + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +//////////////////////////////////// +//////////////Enclave/////////////// +//////////////////////////////////// + +/datum/crafting_recipe/enclave_t45helm_convert + name = "Converted T-45b Power Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/power_armor/t45d/enclave + reqs = list(/obj/item/clothing/head/helmet/f13/power_armor/t45d = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/crafting/goodparts = 15, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_t45_convert + name = "Converted T-45b Power Armor" + result = /obj/item/clothing/suit/armor/power_armor/t45d/enclave + reqs = list(/obj/item/clothing/suit/armor/power_armor/t45d = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/crafting/goodparts = 15, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_st45helm_convert + name = "Converted Salvaged T-45b Power Armor Helmet" + result = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/enclave + reqs = list(/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b = 1, + /obj/item/stack/cable_coil = 15, + /obj/item/stack/crafting/electronicparts = 30, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/sheet/mineral/titanium = 15, + /obj/item/stack/crafting/goodparts = 5, + /obj/item/stack/crafting/metalparts = 20) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_st45_convert + name = "Converted Salvaged T-45b Power Armor" + result = /obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/enclave + reqs = list(/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b = 1, + /obj/item/stack/cable_coil = 15, + /obj/item/stack/crafting/electronicparts = 30, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/sheet/mineral/titanium = 15, + /obj/item/stack/crafting/goodparts = 5, + /obj/item/stack/crafting/metalparts = 20) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_t51_convert + name = "Converted T-51b Power Armor" + result = /obj/item/clothing/suit/armor/power_armor/t51b/enclave + reqs = list(/obj/item/clothing/suit/armor/power_armor/t51b = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/sheet/mineral/titanium = 20, + /obj/item/stack/crafting/goodparts = 10, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_t51helm_convert + name = "Converted T-51b Power Armor" + result = /obj/item/clothing/head/helmet/f13/power_armor/t51b/enclave + reqs = list(/obj/item/clothing/head/helmet/f13/power_armor/t51b = 1, + /obj/item/stack/cable_coil = 30, + /obj/item/stack/crafting/electronicparts = 35, + /obj/item/stack/sheet/metal = 40, + /obj/item/stack/sheet/mineral/titanium = 20, + /obj/item/stack/crafting/goodparts = 10, + /obj/item/stack/crafting/metalparts = 30) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_ca_convert + name = "Converted Combat Armor" + result = /obj/item/clothing/suit/armor/medium/vest/enclave + reqs = list(/obj/item/clothing/suit/armor/medium/combat = 1, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/crafting/metalparts = 10) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_ca_helm_convert + name = "Converted Combat Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/combat/swat + reqs = list(/obj/item/clothing/head/helmet/f13/combat = 1, + /obj/item/stack/sheet/metal = 20, + /obj/item/stack/crafting/metalparts = 10) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/* +/datum/crafting_recipe/enclave_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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_rca_helm_convert + name = "Converted Combat Armor Helmet" + result = /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate/mk2 + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE +*/ + +/datum/crafting_recipe/enclave_riot_convert + name = "Converted Broken Riot Armor" + result = /obj/item/clothing/suit/armor/heavy/riot/enclave + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +/datum/crafting_recipe/enclave_riot_helm_convert + name = "Converted Broken Riot Helmet" + result = /obj/item/clothing/head/helmet/f13/combat/rangerbroken/enclave + 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) + time = 30 + category = CAT_CRAFTING + subcategory = CAT_CONVERT + always_available = FALSE + +//////////////////////////////////// +///////////Minutemen//////////////// +//////////////////////////////////// + +//////////////////////////////////// +/////////////Raider///////////////// +//////////////////////////////////// + +//////////////////////////////////// +/////////////Tribal///////////////// +//////////////////////////////////// + +//////////////////////////////////// +//////////Super Mutant////////////// +//////////////////////////////////// diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 5e66f8e6057..dfa50c4effd 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) var/mob/living/carbon/human/H = quirk_holder var/obj/item/heirloom_type if(quirk_holder.mind.assigned_role) - if(quirk_holder.mind.assigned_role in list("Head Paladin", "Paladin", "Head Knight", "Senior Knight", "Knight", "Senior Scribe", "Scribe", "Initiate")) + if(quirk_holder.mind.assigned_role in list("Paladin Commander", "Paladin", "Head Knight", "Senior Knight", "Knight Sergeant", "Knight", "Senior Scribe", "Scribe", "Initiate")) heirloom_type = pick(/obj/item/card/id/rusted/brokenholodog, /obj/item/trash/f13/electronic/toaster) if(quirk_holder.mind.assigned_role in list("NCR Captain", "NCR Lieutenant", "NCR Veteran Ranger", "NCR Brahmin Baron", "NCR Ranger", "NCR Heavy Trooper", "NCR Sergeant", "NCR Corporal", "NCR Conscript ", "NCR Trooper", "NCR Military Police", "NCR Rear Echelon")) heirloom_type = pick(/obj/item/melee/onehanded/knife/bayonet, /obj/item/lighter, /obj/item/toy/cards/deck, /obj/item/card/id/rusted) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 85477352a31..51d7c818763 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -544,7 +544,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) ) job_req = list( "Elder", - "Head Paladin", + "Paladin Commander", "Head Scribe", "Head Knight", ) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 89102edebdc..69fa6824da4 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -676,13 +676,17 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer icon_state = "Scribe" /obj/effect/landmark/start/f13/paladincommander - name = "Head Paladin" + name = "Paladin Commander" icon_state = "Paladin" /obj/effect/landmark/start/f13/knightcap name = "Knight-Captain" icon_state = "Knight" +/obj/effect/landmark/start/f13/knightsarge + name = "Knight Sergeant" + icon_state = "Knight" + /obj/effect/landmark/start/f13/seniorknight name = "Senior Knight" icon_state = "Knight" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 9e06e764063..f37b08daf39 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1493,10 +1493,9 @@ list(/obj/item/stack/sheet/metal = 20, var/randomgun = pick( /obj/item/book/granter/crafting_recipe/blueprint/trailcarbine, /obj/item/book/granter/crafting_recipe/blueprint/smg10mm, - /obj/item/book/granter/crafting_recipe/blueprint/scoutcarbine, /obj/item/book/granter/crafting_recipe/blueprint/deagle, - /obj/item/book/granter/crafting_recipe/blueprint/marksman, /obj/item/book/granter/crafting_recipe/blueprint/pps, + /obj/item/book/granter/crafting_recipe/blueprint/greasegun, ) new randomgun(src) @@ -1509,10 +1508,11 @@ list(/obj/item/stack/sheet/metal = 20, var/randomgun = pick( /obj/item/book/granter/crafting_recipe/blueprint/magnum_revolver, /obj/item/book/granter/crafting_recipe/blueprint/r82, - /obj/item/book/granter/crafting_recipe/blueprint/r84, - /obj/item/book/granter/crafting_recipe/blueprint/armalite, /obj/item/book/granter/crafting_recipe/blueprint/leveraction, + /obj/item/book/granter/crafting_recipe/blueprint/scoutcarbine, /obj/item/book/granter/crafting_recipe/blueprint/sniper, + /obj/item/book/granter/crafting_recipe/blueprint/deagle, + /obj/item/book/granter/crafting_recipe/blueprint/trapper, ) new randomgun(src) @@ -1526,6 +1526,7 @@ list(/obj/item/stack/sheet/metal = 20, /obj/item/book/granter/crafting_recipe/blueprint/plasmapistol, /obj/item/book/granter/crafting_recipe/blueprint/lightplasmapistol, /obj/item/book/granter/crafting_recipe/blueprint/aer9/focused, + /obj/item/book/granter/crafting_recipe/blueprint/trapper, ) new randomgun(src) @@ -1537,6 +1538,6 @@ list(/obj/item/stack/sheet/metal = 20, var/randomgun = pick( /obj/item/book/granter/crafting_recipe/blueprint/tribeam, /obj/item/book/granter/crafting_recipe/blueprint/rcw, - /obj/item/book/granter/crafting_recipe/blueprint/plasmarifle, + /obj/item/book/granter/crafting_recipe/blueprint/trapper, ) new randomgun(src) diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm index 98691d1f0e8..947beb319ba 100644 --- a/code/modules/clothing/head/f13factionhead.dm +++ b/code/modules/clothing/head/f13factionhead.dm @@ -792,6 +792,12 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot icon_state = "brotherhood_helmet_senior" item_state = "brotherhood_helmet_senior" +/obj/item/clothing/head/helmet/f13/combat/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" + /obj/item/clothing/head/helmet/f13/combat/brotherhood/captain name = "brotherhood head knight helmet" desc = "An improved combat helmet, bearing the symbol of the Head Knight." diff --git a/code/modules/clothing/head/f13head.dm b/code/modules/clothing/head/f13head.dm index 91f1b9eddf2..ee14b1a5587 100644 --- a/code/modules/clothing/head/f13head.dm +++ b/code/modules/clothing/head/f13head.dm @@ -106,6 +106,40 @@ dynamic_fhair_suffix = "" flash_protect = 1 +/obj/item/clothing/head/helmet/f13/combat/rangerbroken/enclave + name = "Enclave Riot Armor" + icon_state = "enclave_broken_riot" + desc = "An old riot police helmet, out of use around the time of the war. This one has been modified to show the enclave insignia as well as a new coat of pain." + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + resistance_flags = LAVA_PROOF | FIRE_PROOF + dynamic_hair_suffix = "" + dynamic_fhair_suffix = "" + flash_protect = 1 + +/obj/item/clothing/head/helmet/f13/combat/rangerbroken/tribal + name = "Tribal riot helmet" + icon_state = "broken_riot_tribal" + desc = "An old riot police helmet, out of use around the time of the war. This one has been stripped and modified heavily to fit bones and dirt all over it." + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + resistance_flags = LAVA_PROOF | FIRE_PROOF + dynamic_hair_suffix = "" + dynamic_fhair_suffix = "" + flash_protect = 1 + +/obj/item/clothing/head/helmet/f13/combat/rangerbroken/bos + name = "Brotherhood riot helmet" + icon_state = "broken_riot_bos" + desc = "An old riot police helmet, out of use around the time of the war. This one has been adjusted to have some adjusted armor platings and a brotherhood symbol upon it." + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + resistance_flags = LAVA_PROOF | FIRE_PROOF + dynamic_hair_suffix = "" + dynamic_fhair_suffix = "" + flash_protect = 1 + + /obj/item/clothing/head/helmet/f13/combat/swat name = "SWAT combat helmet" desc = "A prewar combat helmet issued to S.W.A.T. personnel." @@ -392,11 +426,22 @@ /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos name = "Brotherhood T-45d power helmet" desc = "It's an old pre-War power armor helmet. It's pretty hot inside of it." + salvaged_type = /obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/bos /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos/update_icon_state() icon_state = "t45dhelmet[light_on]" item_state = "t45dhelmet[light_on]" +/obj/item/clothing/head/helmet/f13/power_armor/t45d/enclave + name = "Enclave T-45d power helmet" + desc = "It's an old pre-War power armor helmet. It's pretty hot inside of it." + salvaged_type = /obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/enclave + +/obj/item/clothing/head/helmet/f13/power_armor/t45d/enclave/update_icon_state() + icon_state = "t45dhelmet[light_on]" + item_state = "t45dhelmet[light_on]" + + /obj/item/clothing/head/helmet/f13/power_armor/t51b name = "T-51b power helmet" desc = "It's a T-51b power helmet, typically used by the Brotherhood. It looks somewhat charming." @@ -414,10 +459,25 @@ name = "T-51b power helmet" desc = "It's a T-51b power helmet, typically used by the Brotherhood. It looks somewhat charming." +/obj/item/clothing/head/helmet/f13/power_armor/t51b/enclave + name = "T-51b power helmet" + desc = "It's a T-51b power helmet, typically used by the Brotherhood. It looks somewhat charming." + +/obj/item/clothing/head/helmet/f13/power_armor/t51b/palcomm + name = "T-51b Paladin Commander Helmet" + desc = "It's a T-51b power helmet, modified uniquely for the Paladin Commander" + icon_state = "palcommhelm" + item_state = "palcommhelm" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_DT_T3) + /obj/item/clothing/head/helmet/f13/power_armor/t51b/bos/update_icon_state() icon_state = "t51bhelmet[light_on]" item_state = "t51bhelmet[light_on]" +/obj/item/clothing/head/helmet/f13/power_armor/t51b/palcomm/update_icon_state() + icon_state = "palcommhelm" + item_state = "palcommhelm" + /obj/item/clothing/head/helmet/f13/power_armor/t60 name = "T-60a power helmet" desc = "The T-60 powered helmet, equipped with targetting software suite, Friend-or-Foe identifiers, dynamic HuD, and an internal music player." diff --git a/code/modules/clothing/head/f13heavy_helmets.dm b/code/modules/clothing/head/f13heavy_helmets.dm index d9ee1fd1e1c..99f80ba694f 100644 --- a/code/modules/clothing/head/f13heavy_helmets.dm +++ b/code/modules/clothing/head/f13heavy_helmets.dm @@ -43,6 +43,34 @@ slowdown = 0 resistance_flags = LAVA_PROOF | FIRE_PROOF +/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/bos + name = "tribal t-45b headdress" + desc = "A salvaged T-45b powered armor, with the servos removed and additional paint applied to show that it belongs to the brotherhood of steel" + icon_state = "t45bhelmet_bos" + item_state = "t45bhelmet_bos" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2) + slowdown = 0 + resistance_flags = LAVA_PROOF | FIRE_PROOF + +/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/enclave + name = "tribal t-45b headdress" + desc = "A salvaged T-45b powered armor, with the servos removed and additional paint applied to show that it belongs to the enclave." + icon_state = "t45bhelmet_enclave" + item_state = "t45bhelmet_enclave" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2) + slowdown = 0 + resistance_flags = LAVA_PROOF | FIRE_PROOF + +/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/sm + name = "tribal t-45b headdress" + desc = "A salvaged T-45b powered armor, with the servos removed and additional paint applied to show that it belongs to the super mutants. That as well as the additional armor allowing it to fit upon their heads." + icon_state = "t45bhelmet_sm" + item_state = "t45bhelmet_sm" + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2) + slowdown = 0 + resistance_flags = LAVA_PROOF | FIRE_PROOF + + // T-45D /obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45d name = "salvaged T-45d helmet" diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index 7b7bba6ad33..aa1e23e0da8 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -2431,6 +2431,13 @@ icon_state = "brotherhood_armor_senior" item_state = "brotherhood_armor_senior" +/obj/item/clothing/suit/armor/medium/combat/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_UP_LASER_T2, ARMOR_MODIFIER_DOWN_ENV_T2, ARMOR_MODIFIER_UP_DT_T1, ARMOR_MODIFIER_UP_MELEE_T1) + /obj/item/clothing/suit/armor/medium/combat/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." @@ -2861,6 +2868,24 @@ item_state = "combat_coat" desc = "A heavy armor with ballistic inserts, sewn into a padded riot police coat." +/obj/item/clothing/suit/armor/heavy/riot/bos + name = "combat riot armor" + icon_state = "broken_riot_bos" + item_state = "broken_riot_bos" + desc = "A heavy armor with ballistic inserts, sewn into a padded riot police coat." + +/obj/item/clothing/suit/armor/heavy/riot/tribal + name = "combat riot armor" + icon_state = "broken_riot_tribal" + item_state = "broken_riot_tribal" + desc = "A heavy armor with ballistic inserts, sewn into a padded riot police coat." + +/obj/item/clothing/suit/armor/heavy/riot/enclave + name = "combat riot armor" + icon_state = "enclave_broken_riot" + item_state = "enclave_broken_riot" + desc = "A heavy armor with ballistic inserts, sewn into a padded riot police coat." + /obj/item/clothing/suit/armor/heavy/riot/police name = "riot police armor" icon_state = "bulletproof_heavy" @@ -2953,6 +2978,34 @@ slowdown = ARMOR_SLOWDOWN_SALVAGE * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT // zooom armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2) +/obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/bos + name = "salvaged Brotherhood T45-b power armor" + desc = "A set of salvaged power armor, with certain bits of plating stripped out to retain more freedom of movement. It holds some paint upon it showing it belonging to the brotherhood." + icon_state = "t45b_salvaged_bos" + item_state = "t45b_salvaged_bos" + // body_parts_covered = CHEST|GROIN|ARMS|LEGS + slowdown = ARMOR_SLOWDOWN_SALVAGE * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT // zooom + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2) + +/obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/enclave + name = "salvaged Enclave T45-b power armor" + desc = "A set of salvaged power armor, with certain bits of plating stripped out to retain more freedom of movement. It holds some paint upon it showing it belonging to the enclave." + icon_state = "t45b_salvaged_enclave" + item_state = "t45b_salvaged_enclave" + // body_parts_covered = CHEST|GROIN|ARMS|LEGS + slowdown = ARMOR_SLOWDOWN_SALVAGE * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT // zooom + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2) + +/obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/mutant + name = "salvaged Mutant T45-b power armor" + desc = "A set of salvaged power armor, with certain bits of plating stripped out to retain more freedom of movement. It's been heavily stripped apart, additional metal has been added so a super-mutant can fit within it." + icon_state = "t45b_salvaged_sm" + item_state = "t45b_salvaged_sm" + // body_parts_covered = CHEST|GROIN|ARMS|LEGS + slowdown = ARMOR_SLOWDOWN_SALVAGE * ARMOR_SLOWDOWN_LESS_T3 * ARMOR_SLOWDOWN_GLOBAL_MULT // zooom + armor_tokens = list(ARMOR_MODIFIER_DOWN_MELEE_T1, ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_DOWN_LASER_T2) + + /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/tribal/junk name = "salvaged weathered tribal T45-b power armor" desc = "A set of salvaged tribal power armor, one that's seen better days. Proof that power armor doesn't age like wine, especially dragged through the swamp as much as this one has. All that weathered off armor plating's sure made it light, though!" @@ -3347,6 +3400,22 @@ desc = "A suit of T-45d Power Armour adorned with the markings of the Brotherhood of Steel. Commonly used by the Paladins of the Brotherhood." icon_state = "t45dpowerarmor_bos" item_state = "t45dpowerarmor_bos" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + +/obj/item/clothing/suit/armor/power_armor/t45d/minutemen + name = "minutemen T-45d Power Armour" + desc = "A suit of T-45d Power Armour adorned with the markings of the Minutemen. Though rare to see, sometimes it can be seen in the minutemen." + icon_state = "t45dpowerarmor_minutemen" + item_state = "t45dpowerarmor_minutemen" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + +/obj/item/clothing/suit/armor/power_armor/t45d/enclave + name = "Brotherhood T-45d Power Armour" + desc = "A suit of T-45d Power Armour adorned with the markings of the Enclave. Not very commonly used by low ranking Enclave Soldiers." + icon_state = "t45dpowerarmor_enclave" + item_state = "t45dpowerarmor_enclave" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + /obj/item/clothing/suit/armor/power_armor/t51b name = "T-51b power armor" @@ -3365,12 +3434,33 @@ item_state = "t51green" armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T2) +/obj/item/clothing/suit/armor/power_armor/t51b/palcomm + name = "T-51b Paladin Commander Armor" + desc = "The pinnacle of pre-war technology. This suit of power armor is customised heavily to fit the Paladin Commander." + icon_state = "palcomm" + item_state = "palcomm" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_DT_T2) /obj/item/clothing/suit/armor/power_armor/t51b/bos name = "Brotherhood T-51b Power Armour" desc = "The pinnacle of pre-war technology, appropriated by the Brotherhood of Steel. Commonly worn by Head Paladins." icon_state = "t51bpowerarmor_bos" item_state = "t51bpowerarmor_bos" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + +/obj/item/clothing/suit/armor/power_armor/t51b/minutemen + name = "Brotherhood T-51b Power Armour" + desc = "The pinnacle of pre-war technology, appropriated by the Brotherhood of Steel. Commonly worn by Head Paladins." + icon_state = "t51bpowerarmor_minutemen" + item_state = "t51bpowerarmor_minutemen" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) + +/obj/item/clothing/suit/armor/power_armor/t51b/enclave + name = "Enclave T-51b Power Armour" + desc = "The pinnacle of pre-war technology, appropriated by the Enclave. Commonly worn by the Enclave Armored Corp." + icon_state = "t51bpowerarmor_enclave" + item_state = "t51bpowerarmor_enclave" + armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T1) /obj/item/clothing/suit/armor/power_armor/excavator name = "excavator power armor" diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index e538b92fd57..2e5652ea40c 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -461,6 +461,13 @@ item_color = "seniorknight" minimize_when_attached = TRUE +/obj/item/clothing/accessory/bos/knightsarge + name = "Knight Sargeant pins" + desc = "A silver pin with one device gilded in gold, little notches at the top end, and a golden sword in the center of purple cloth; worn by the high-ranking Knight Sargeant." + icon_state = "seniorknight" + item_color = "seniorknight" + minimize_when_attached = TRUE + /obj/item/clothing/accessory/bos/juniorknight name = "Junior Knight pins" desc = "A silver pin with one device, and blue coloring. Worn by the Knight-in-Training of the Brotherhood." diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 6c1047f5057..e8dd8c0b47b 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -453,7 +453,7 @@ /proc/get_all_jobs() return list("Centurion", "NCR Captain", "Overseer", "Sheriff", - "Sentinel", "Senior Paladin", "Paladin", "Knight-Captain", "Senior Knight", "Knight", "Head Scribe", "Senior Scribe", "Scribe", "Initiate", + "Sentinel", "Senior Paladin", "Paladin", "Knight-Captain", "Senior Knight", "Knight", "Head Scribe", "Senior Scribe", "Scribe", "Initiate", "Knight Sergeant", "Veteran Decanus", "Vexillarius", "Decanus", "Veteran Legionnaire", "Prime Legionnaire", "NCR Lieutenant", "NCR Medical Officer", "NCR Sergeant First Class", "NCR Sergeant", ,"NCR Corporal", "NCR Combat Medic", "NCR Combat Engineer", "NCR Trooper", "NCR Veteran Ranger", "NCR Patrol Ranger", "NCR Recon Ranger", diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index 9511347b1b8..1a84578a666 100644 --- a/code/modules/jobs/job_types/bos.dm +++ b/code/modules/jobs/job_types/bos.dm @@ -47,10 +47,17 @@ Main doors: ACCESS_BOS 120 return H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombatarmor) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombathelmet) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombatarmormk2) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombathelmetmk2) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/bos) H.mind.teach_crafting_recipe(/datum/crafting_recipe/gate_bos) H.mind.teach_crafting_recipe(/datum/crafting_recipe/bosoutcastlight) @@ -70,6 +77,7 @@ Elder Envoy spawn_positions = 0 selection_color = "#7f8c8d" outfit = /datum/outfit/job/bos/f13envoy + req_admin_notify = 1 access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_MINERAL_STOREROOM, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_CHANGE_IDS) minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_MINERAL_STOREROOM, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_CHANGE_IDS) @@ -134,6 +142,18 @@ Sentinel H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx/chemistry) H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout) H.mind.teach_crafting_recipe(/datum/crafting_recipe/steady) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_CHEMWHIZ, src) /datum/outfit/job/bos/f13sentinel @@ -146,7 +166,7 @@ Sentinel neck = /obj/item/clothing/neck/mantle/bos/right ears = /obj/item/radio/headset/headset_bos/command backpack_contents = list( - //obj/item/melee/powerfist/f13 = 1, + /obj/item/melee/powerfist/f13 = 1, /obj/item/melee/onehanded/knife/hunting = 1 ) @@ -156,22 +176,22 @@ Paladin Commander */ /datum/job/bos/f13paladincommander - title = "Head Paladin" + title = "Paladin Commander" flag = F13PALADINCOMMANDER head_announce = list("Security") - total_positions = 0 - spawn_positions = 0 - description = "You are the acting field commander until the Brotherhood regains its strength enough to place an Elder for the bunker. You are a veteran of many battles and sorties in pursuit of Brotherhood goals; your only weakness may just be your hubris. Your main goals are defense of the Chapter and surveillance of the surrounding region for technology." - supervisors = "the Elders" + total_positions = 1 + spawn_positions = 1 + description = "You are the Paladin Commander, leader of the expedition. Work with your small expeditionary force to secure the land and remove the enemy. You are in charge of the expedition and as such you are in-charge of the faction. You should not attempt to fight everyone you see but rather use your rank and skill to secure the land and remove your enemy. " + supervisors = "the Elders or their Envoys" selection_color = "#7f8c8d" display_order = JOB_DISPLAY_ORDER_COMMANDER outfit = /datum/outfit/job/bos/f13commander - exp_requirements = 2400 + exp_requirements = 2280 - loadout_options = list( + /*loadout_options = list( /datum/outfit/loadout/sentheavy, //Gauss + Glock /datum/outfit/loadout/sentmini //Minigun - ) + )*/ min_required_special = list( "special_c" = 4, @@ -197,7 +217,18 @@ Paladin Commander H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx) H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx/chemistry) H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/steady) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_CHEMWHIZ, src) ADD_TRAIT(H, TRAIT_LIFEGIVER, src) ADD_TRAIT(H, TRAIT_IRONFIST, src) @@ -206,7 +237,7 @@ Paladin Commander H.mind.AddSpell(S) /datum/outfit/job/bos/f13commander - name = "Head Paladin" + name = "Paladin Commander" jobtype = /datum/job/bos/f13paladincommander uniform = /obj/item/clothing/under/f13/recon belt = /obj/item/storage/belt/army/assault @@ -214,32 +245,38 @@ Paladin Commander glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer ears = /obj/item/radio/headset/headset_bos/command - suit = /obj/item/clothing/suit/armor/power_armor/t51b - head = /obj/item/clothing/head/helmet/f13/power_armor/t51b - neck = /obj/item/clothing/neck/mantle/bos/paladin + suit = /obj/item/clothing/suit/armor/power_armor/t51b/palcomm + suit_store = /obj/item/gun/ballistic/automatic/lewis + head = /obj/item/clothing/head/helmet/f13/power_armor/t51b/palcomm + neck = /obj/item/storage/belt/shoulderholster backpack_contents = list( /obj/item/melee/onehanded/knife/hunting = 1, - /obj/item/melee/powerfist/f13 = 1, - /obj/item/gun/ballistic/automatic/pistol/n99/crusader = 1, - /obj/item/ammo_box/magazine/m10mm/adv/simple = 2, - /obj/item/reagent_containers/hypospray/medipen/stimpak = 6, + /obj/item/reagent_containers/hypospray/medipen/stimpak = 3, + /obj/item/ammo_box/magazine/lewis/l47 = 3 ) - -/datum/outfit/loadout/sentheavy +/* +/datum/outfit/loadout/palcomheavy name = "Heavy Paladin Commander" backpack_contents = list( - /obj/item/gun/ballistic/automatic/m72 = 1, - /obj/item/ammo_box/magazine/m2mm = 3 + /obj/item/gun/ballistic/automatic/lewis = 1, + /obj/item/ammo_box/magazine/lewis/l47 = 3 ) -/datum/outfit/loadout/sentmini - name = "Minigun Paladin Commander" +/datum/outfit/loadout/palcomlaser + name = "Energy Paladin Commander" backpack_contents = list( - /obj/item/minigunpackbal5mm = 1, + /obj/item/gun/energy/laser/aer12 = 1, + /obj/item/stock_parts/cell/ammo/mfc = 3 ) - +/datum/outfit/loadout/palcomhitter + name = "Heavy Force Paladin Commander" + backpack_contents = list( + /obj/item/twohanded/sledgehammer/supersledge = 1, + /obj/item/reagent_containers/hypospray/medipen/stimpak/super = 3, + ) +*/ /* Proctor */ @@ -276,6 +313,18 @@ Proctor H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx/chemistry) H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout) H.mind.teach_crafting_recipe(/datum/crafting_recipe/steady) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src) ADD_TRAIT(H, TRAIT_CYBERNETICIST_EXPERT, src) ADD_TRAIT(H, TRAIT_CYBERNETICIST, src) @@ -317,17 +366,17 @@ Knight-Captain */ /datum/job/bos/f13knightcap - title = "Knight-Captai" + title = "Knight-Captain" flag = F13KNIGHTCAPTAIN head_announce = list("Security") - total_positions = 0 - spawn_positions = 0 + total_positions = 1 + spawn_positions = 1 description = "You are the Knight-Captain, one of the leaders of your group of outcasts. After the attempted coup by the late Paladin Commander Wossner, you have been wandering the wastes, looking for a new home, and have now found a barely-acceptable place to construct your new chapters' bunker. Your knowledge of pre-war materials and engineering is almost unparalleled, and you have basic combat training and experience. You are in charge of establishing a working foothold, and your Knights and initiates. Delegate to them as necessary. As Chief Armorer, you are also in charge of the armory." - supervisors = "the Sentinel" + supervisors = "The Paladin Commander" selection_color = "#7f8c8d" display_order = JOB_DISPLAY_ORDER_KNIGHTCAPTAIN outfit = /datum/outfit/job/bos/f13knightcap - exp_requirements = 60 + exp_requirements = 1920 access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_ARMORY, ACCESS_BRIG, ACCESS_CHANGE_IDS) minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_ARMORY, ACCESS_BRIG, ACCESS_CHANGE_IDS) @@ -340,6 +389,14 @@ Knight-Captain ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) @@ -354,14 +411,15 @@ Knight-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/shoulderholster + 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 backpack_contents = list( /obj/item/melee/onehanded/knife/hunting = 1, - /obj/item/reagent_containers/hypospray/medipen/stimpak = 5, + /obj/item/reagent_containers/hypospray/medipen/stimpak = 3, /obj/item/storage/belt/army/security/full = 1, - /obj/item/stock_parts/cell/ammo/mfc = 5 + /obj/item/stock_parts/cell/ammo/mfc = 3, + /obj/item/melee/powered/ripper/prewar = 1, ) /* /datum/outfit/loadout/capalt @@ -400,6 +458,12 @@ Star Paladin ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) /datum/outfit/job/bos/f13seniorpaladin @@ -442,11 +506,11 @@ Paladin flag = F13PALADIN total_positions = 1 spawn_positions = 1 - description = "You are this Chapter's main line of defense and offense, and the leader of this expedition; highly trained in combat and weaponry though with little practical field experience, you are eager to prove your worth to the Brotherhood. Your primary duties are defense and surface operations. You may also be assigned a trainee Initiate." - supervisors = "the Elders" + description = "You are a paladin. Assigned to the expeditionary force through sheer luck or skill. You're one of two power-armor wearers within the force and as such you're to treat it with care. Your posting as a paladin allows you rank over the senior knights and senior scribes. But the Head-Knight, as assigned Second In Command, is above you in rank." + supervisors = "the Elders or the Paladin Commander if he is present" display_order = JOB_DISPLAY_ORDER_PALADIN outfit = /datum/outfit/job/bos/f13paladin - exp_requirements = 1200 + exp_requirements = 1680 /* loadout_options = list( /datum/outfit/loadout/paladina, //Minigun @@ -478,14 +542,20 @@ Paladin ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) /datum/outfit/job/bos/f13paladin name = "Paladin" jobtype = /datum/job/bos/f13paladin - suit = /obj/item/clothing/suit/armor/power_armor/t45d + suit = /obj/item/clothing/suit/armor/power_armor/t45d/bos suit_store = /obj/item/gun/energy/laser/aer12 - head = /obj/item/clothing/head/helmet/f13/power_armor/t45d + head = /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos uniform = /obj/item/clothing/under/f13/recon belt = /obj/item/storage/belt/army/assault mask = /obj/item/clothing/mask/gas/sechailer @@ -525,7 +595,7 @@ Senior Scribe supervisors = "the Proctor" display_order = JOB_DISPLAY_ORDER_SENIORSCRIBE outfit = /datum/outfit/job/bos/f13seniorscribe - exp_requirements = 900 + exp_requirements = 1200 access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS) minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS) @@ -545,6 +615,12 @@ Senior Scribe ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) H.mind.teach_crafting_recipe(GLOB.chemwhiz_recipes) ADD_TRAIT(H, TRAIT_CHEMWHIZ, src) ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src) @@ -639,11 +715,92 @@ Scribe ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) H.mind.teach_crafting_recipe(GLOB.chemwhiz_recipes) ADD_TRAIT(H, TRAIT_CHEMWHIZ, src) ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src) ADD_TRAIT(H, TRAIT_CYBERNETICIST, src) +/* +Knight Sarge +*/ + +/datum/job/bos/f13knightsarge + title = "Knight Sergeant" + flag = F13KNIGHTSARGE + total_positions = 2 + spawn_positions = 2 + 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 + outfit = /datum/outfit/job/bos/f13knightsarge + exp_requirements = 1440 +/* + loadout_options = list( + /datum/outfit/loadout/sknightb, //Police Shotgun + /datum/outfit/loadout/sknightc, //R93 + /datum/outfit/loadout/sknightd, //Pre-war Ripper + ) +*/ + access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS) + minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS) + matchmaking_allowed = list( + /datum/matchmaking_pref/friend = list( + /datum/job/bos, + ), + /datum/matchmaking_pref/rival = list( + /datum/job/bos, + ), + /datum/matchmaking_pref/mentor = list( + /datum/job/bos/f13knight, + ), + ) + +/datum/outfit/job/bos/f13knightsarge/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/AER9) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/AEP7) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/R93) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) + +/datum/outfit/job/bos/f13knightsarge + name = "Senior Knight" + jobtype = /datum/job/bos/f13knightsarge + suit = /obj/item/clothing/suit/armor/medium/combat/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 + gunsmith_one = TRUE + gunsmith_two = TRUE + gunsmith_three = TRUE + gunsmith_four = TRUE + backpack_contents = list( + /obj/item/melee/onehanded/knife/hunting = 1, + /obj/item/reagent_containers/hypospray/medipen/stimpak = 2, + /obj/item/storage/box/bos/senior = 1, + /obj/item/book/granter/crafting_recipe/gunsmith_one = 1, + /obj/item/book/granter/crafting_recipe/gunsmith_two = 1, + /obj/item/book/granter/crafting_recipe/gunsmith_three = 1, + /obj/item/book/granter/crafting_recipe/gunsmith_four = 1, + /obj/item/gun/ballistic/automatic/pistol/mk23 = 1, + /obj/item/ammo_box/magazine/m45/socom = 3, + ) /* Senior Knight */ @@ -651,8 +808,8 @@ Senior Knight /datum/job/bos/f13seniorknight title = "Senior Knight" flag = F13SENIORKNIGHT - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 description = "You report directly to the Knight-Captain. You are the Brotherhood Knight-Sergeant. Having served the Knight Caste for some time now, you are versatile and experienced in both basic combat and repairs, and also a primary maintainer of the Bunker's facilities. As your seniormost Knight, you may be assigned initiates or Junior Knights to mentor." supervisors = "the Knight-Captain" display_order = JOB_DISPLAY_ORDER_SENIORKNIGHT @@ -683,6 +840,12 @@ Senior Knight ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) H.mind.teach_crafting_recipe(/datum/crafting_recipe/AER9) H.mind.teach_crafting_recipe(/datum/crafting_recipe/AEP7) H.mind.teach_crafting_recipe(/datum/crafting_recipe/R93) @@ -771,15 +934,20 @@ Knight ), ) -/* + /datum/outfit/job/bos/f13knight/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() if(visualsOnly) return H.mind.teach_crafting_recipe(/datum/crafting_recipe/AER9) H.mind.teach_crafting_recipe(/datum/crafting_recipe/AEP7) - H.mind.teach_crafting_recipe(/datum/crafting_recipe/dks) -*/ + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_rca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/bos_riot_helm_convert) + /datum/outfit/job/bos/f13knight name = "Knight" diff --git a/code/modules/jobs/job_types/enclave.dm b/code/modules/jobs/job_types/enclave.dm index 832204724bf..294173399eb 100644 --- a/code/modules/jobs/job_types/enclave.dm +++ b/code/modules/jobs/job_types/enclave.dm @@ -49,6 +49,16 @@ ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio) H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest) H.mind.teach_crafting_recipe(/datum/crafting_recipe/bloodleaf) @@ -94,6 +104,16 @@ ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) ADD_TRAIT(H, TRAIT_LIFEGIVER, src) if(H.mind) @@ -140,6 +160,16 @@ ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) ADD_TRAIT(H, TRAIT_LIFEGIVER, src) @@ -178,6 +208,16 @@ ..() if(visualsOnly) return + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) ADD_TRAIT(H, TRAIT_PA_WEAR, src) ADD_TRAIT(H, TRAIT_HARD_YARDS, src) @@ -216,6 +256,11 @@ ..() if(visualsOnly) return + + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) ADD_TRAIT(H, TRAIT_HARD_YARDS, src) @@ -353,6 +398,16 @@ H.mind.teach_crafting_recipe(/datum/crafting_recipe/stimpak5/chemistry) H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout) H.mind.teach_crafting_recipe(/datum/crafting_recipe/steady) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_st45_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_t51helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_ca_helm_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_convert) + H.mind.teach_crafting_recipe(/datum/crafting_recipe/enclave_riot_helm_convert) ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src) ADD_TRAIT(H, TRAIT_CYBERNETICIST_EXPERT, src) ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index b1392e0d5f3..374ec2e4d59 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -93,12 +93,13 @@ GLOBAL_LIST_INIT(faction_whitelist_positions, list( //Brotherhood GLOBAL_LIST_INIT(brotherhood_positions, list( "Sentinel", - "Head Paladin", + "Paladin Commander", "Knight-Captain", "Proctor", "Star Paladin", "Paladin", "Senior Knight", + "Knight Sergeant", "Knight", "Senior Scribe", "Scribe", diff --git a/fallout/code/modules/client/loadout/head.dm b/fallout/code/modules/client/loadout/head.dm index 62a092fd0b5..abab771c50a 100644 --- a/fallout/code/modules/client/loadout/head.dm +++ b/fallout/code/modules/client/loadout/head.dm @@ -454,11 +454,12 @@ path = /obj/item/clothing/head/f13/boscap/beret restricted_desc = "BoS" restricted_roles = list( - "Head Paladin", + "Paladin Commander", "Head Captain", "Head Scribe", "Senior Paladin", "Senior Knight", + "Knight Sergeant", "Senior Scribe", "Paladin", "Knight", diff --git a/icons/fallout/clothing/armored_heavy.dmi b/icons/fallout/clothing/armored_heavy.dmi index 9940b8d92b7..a4d015b21e4 100644 Binary files a/icons/fallout/clothing/armored_heavy.dmi and b/icons/fallout/clothing/armored_heavy.dmi differ diff --git a/icons/fallout/onmob/clothes/armor_heavy.dmi b/icons/fallout/onmob/clothes/armor_heavy.dmi index 8f8da8997ea..06f95e89f87 100644 Binary files a/icons/fallout/onmob/clothes/armor_heavy.dmi and b/icons/fallout/onmob/clothes/armor_heavy.dmi differ diff --git a/icons/fallout/onmob/clothes/armor_power.dmi b/icons/fallout/onmob/clothes/armor_power.dmi index f2eaa874424..4147c15645b 100644 Binary files a/icons/fallout/onmob/clothes/armor_power.dmi and b/icons/fallout/onmob/clothes/armor_power.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 86ae35ca015..0785b8ab2e3 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 21cd1b4fa4c..e06dfa65096 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 4e218132da7..f58b48114d5 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b6eae7678aa..82f88833369 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e90f7aad883..bb8ba7c9fee 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ