From ea221e42d971378297d8a7a318d1fae0a62a3a91 Mon Sep 17 00:00:00 2001 From: Rex9001 <120136161+Rex9001@users.noreply.github.com> Date: Sun, 28 Apr 2024 00:34:28 +0200 Subject: [PATCH] Elance lives! --- monkestation/code/datums/components/crafting.dm | 14 ++++++++++++++ .../code/game/objects/items/granters/elance.dm | 14 ++++++++++++++ .../modules/antagonists/brother/gear/recipes.dm | 5 +++++ tgstation.dme | 2 ++ 4 files changed, 35 insertions(+) create mode 100644 monkestation/code/datums/components/crafting.dm create mode 100644 monkestation/code/game/objects/items/granters/elance.dm diff --git a/monkestation/code/datums/components/crafting.dm b/monkestation/code/datums/components/crafting.dm new file mode 100644 index 000000000000..643255a9a3b0 --- /dev/null +++ b/monkestation/code/datums/components/crafting.dm @@ -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 diff --git a/monkestation/code/game/objects/items/granters/elance.dm b/monkestation/code/game/objects/items/granters/elance.dm new file mode 100644 index 000000000000..fbfc7c1c224a --- /dev/null +++ b/monkestation/code/game/objects/items/granters/elance.dm @@ -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.", + ) diff --git a/monkestation/code/modules/antagonists/brother/gear/recipes.dm b/monkestation/code/modules/antagonists/brother/gear/recipes.dm index 1065bad09c57..052cd8a7b99f 100644 --- a/monkestation/code/modules/antagonists/brother/gear/recipes.dm +++ b/monkestation/code/modules/antagonists/brother/gear/recipes.dm @@ -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 diff --git a/tgstation.dme b/tgstation.dme index 623c7472f5e5..c1100cac9740 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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" @@ -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"