From 8e0ae20c4d8ad107c3c6aecc7ec1610c58eb993e Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Tue, 10 May 2022 17:37:15 -0400 Subject: [PATCH 1/5] makes blood brothers a bit less shit --- code/modules/antagonists/brother/brother.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 337983202427..91bb6278c100 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -23,9 +23,19 @@ owner.special_role = special_role if(owner.current) give_pinpointer() + equip_brother() finalize_brother() return ..() +/datum/antagonist/brother/proc/equip_brother() + var/list/crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/knifeboxing, /datum/crafting_recipe/flamethrower, /datum/crafting_recipe/pipebomb, /datum/crafting_recipe/makeshiftpistol, /datum/crafting_recipe/makeshiftmagazine, /datum/crafting_recipe/makeshiftsuppressor, /datum/crafting_recipe/makeshiftcrowbar, /datum/crafting_recipe/makeshiftwrench, /datum/crafting_recipe/makeshiftwirecutters, /datum/crafting_recipe/makeshiftweldingtool, /datum/crafting_recipe/makeshiftmultitool, /datum/crafting_recipe/makeshiftscrewdriver, /datum/crafting_recipe/makeshiftknife, /datum/crafting_recipe/makeshiftpickaxe, /datum/crafting_recipe/makeshiftradio) + + for(var/crafting_recipe_type in crafting_recipe_types) + var/datum/crafting_recipe/R = crafting_recipe_type + owner.teach_crafting_recipe(crafting_recipe_type) + to_chat(user,span_notice("You learned how to make [initial(R.name)].")) + span_userdanger("You know how to craft makeshift weapons due to your training.") + /datum/antagonist/brother/on_removal() SSticker.mode.brothers -= owner if(owner.current) From 88fcd3c0c71113ace4732f83c6b5502821cc333a Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Tue, 10 May 2022 17:53:52 -0400 Subject: [PATCH 2/5] oopsie --- code/modules/antagonists/brother/brother.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 91bb6278c100..313f767f0dd3 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -33,8 +33,7 @@ for(var/crafting_recipe_type in crafting_recipe_types) var/datum/crafting_recipe/R = crafting_recipe_type owner.teach_crafting_recipe(crafting_recipe_type) - to_chat(user,span_notice("You learned how to make [initial(R.name)].")) - span_userdanger("You know how to craft makeshift weapons due to your training.") + to_chat(owner,span_notice("You learned how to make [initial(R.name)].")) /datum/antagonist/brother/on_removal() SSticker.mode.brothers -= owner From 60f167ee79dd05e95e2dd4d157f5e84f09bf3dcd Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun, 22 May 2022 15:42:43 -0400 Subject: [PATCH 3/5] improve??? --- code/modules/antagonists/brother/brother.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 313f767f0dd3..9a092cdb2eb1 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -28,12 +28,10 @@ return ..() /datum/antagonist/brother/proc/equip_brother() - var/list/crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/knifeboxing, /datum/crafting_recipe/flamethrower, /datum/crafting_recipe/pipebomb, /datum/crafting_recipe/makeshiftpistol, /datum/crafting_recipe/makeshiftmagazine, /datum/crafting_recipe/makeshiftsuppressor, /datum/crafting_recipe/makeshiftcrowbar, /datum/crafting_recipe/makeshiftwrench, /datum/crafting_recipe/makeshiftwirecutters, /datum/crafting_recipe/makeshiftweldingtool, /datum/crafting_recipe/makeshiftmultitool, /datum/crafting_recipe/makeshiftscrewdriver, /datum/crafting_recipe/makeshiftknife, /datum/crafting_recipe/makeshiftpickaxe, /datum/crafting_recipe/makeshiftradio) - - for(var/crafting_recipe_type in crafting_recipe_types) - var/datum/crafting_recipe/R = crafting_recipe_type - owner.teach_crafting_recipe(crafting_recipe_type) - to_chat(owner,span_notice("You learned how to make [initial(R.name)].")) + /datum/antagonist/brother/proc/equip_brother() + var/obj/item/book/granter/crafting_recipe/weapons/W = new + W.on_reading_finished(owner.current) + qdel(W) /datum/antagonist/brother/on_removal() SSticker.mode.brothers -= owner From ce3f341712f3886df6f6ccf09d4ce0837b37adb6 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun, 22 May 2022 15:51:24 -0400 Subject: [PATCH 4/5] what --- code/modules/antagonists/brother/brother.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 9a092cdb2eb1..b44c46aa5024 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -28,7 +28,6 @@ return ..() /datum/antagonist/brother/proc/equip_brother() - /datum/antagonist/brother/proc/equip_brother() var/obj/item/book/granter/crafting_recipe/weapons/W = new W.on_reading_finished(owner.current) qdel(W) From 6e78d1382d4f526f47bd6ef531ae221021f9cfa9 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun, 22 May 2022 15:52:39 -0400 Subject: [PATCH 5/5] huh?? --- code/modules/antagonists/brother/brother.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index b44c46aa5024..a38e5013813e 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -28,8 +28,8 @@ return ..() /datum/antagonist/brother/proc/equip_brother() - var/obj/item/book/granter/crafting_recipe/weapons/W = new - W.on_reading_finished(owner.current) + var/obj/item/book/granter/crafting_recipe/weapons/W = new + W.on_reading_finished(owner.current) qdel(W) /datum/antagonist/brother/on_removal()