Skip to content
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.

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

Re-adds the Elance as a blood brother crafting choice! #1767

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions monkestation/code/datums/components/crafting.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/datum/crafting_recipe/lance
name = "Explosive Lance (Grenade)"
result = /obj/item/spear/explosive
reqs = list(
/obj/item/spear = 1,
/obj/item/grenade = 1
)
blacklist = list(/obj/item/spear/bonespear, /obj/item/spear/bamboospear)
parts = list(
/obj/item/spear = 1,
/obj/item/grenade = 1
)
time = 1.5 SECONDS
category = CAT_WEAPON_MELEE
14 changes: 14 additions & 0 deletions monkestation/code/game/objects/items/granters/elance.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/obj/item/book/granter/crafting_recipe/maint_gun/explosive_lance
name = "tome of a knight"
desc = "A burnt and damaged tome? Where did this come from?"
crafting_recipe_types = list(
/datum/crafting_recipe/lance
)
remarks = list(
"Seems they found a way to strap a bomb to a spear.",
"This doesnt seem very safe.",
"How do I survive a point blank impact from this?",
"Whats a bomb suit and why would I need one?",
"Just tie a bomb to a spear?",
"I just realised why this book is charred.",
)
5 changes: 5 additions & 0 deletions monkestation/code/modules/antagonists/brother/gear/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@
spawn_path = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime
preview_path = /obj/item/gun/energy/disabler/smoothbore/prime

/datum/bb_gear/granter/elance
name = "Recipe: Explosive Lance (Grenade)"
desc = "Contains a recipe book, allowing you to learn the knowledge to build an explosive lance (grenade)."
spawn_path = /obj/item/spear/explosive
preview_path = /obj/item/book/granter/crafting_recipe/maint_gun/explosive_lance
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5694,6 +5694,7 @@
#include "monkestation\code\datums\brain_damage\magic.dm"
#include "monkestation\code\datums\brain_damage\phobia.dm"
#include "monkestation\code\datums\components\carbon_sprint.dm"
#include "monkestation\code\datums\components\crafting.dm"
#include "monkestation\code\datums\components\irradiated.dm"
#include "monkestation\code\datums\components\multi_hit.dm"
#include "monkestation\code\datums\components\throw_bounce.dm"
Expand Down Expand Up @@ -5767,6 +5768,7 @@
#include "monkestation\code\game\objects\items\food\corndog.dm"
#include "monkestation\code\game\objects\items\food\misc.dm"
#include "monkestation\code\game\objects\items\food\spaghetti.dm"
#include "monkestation\code\game\objects\items\granters\elance.dm"
#include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm"
#include "monkestation\code\game\objects\items\guns\crank_guns.dm"
#include "monkestation\code\game\objects\items\guns\shotguns.dm"
Expand Down
Loading