Skip to content

Commit

Permalink
Merge pull request #5474 from Colfer1/master
Browse files Browse the repository at this point in the history
Adds Necronomicon
  • Loading branch information
Tk420634 authored Oct 14, 2024
2 parents 15bf962 + 096a1e2 commit 2a62ad4
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("metal barricade", /obj/structure/deployable_barricade/metal, 2, 1, time = 1 SECONDS), \
new/datum/stack_recipe("iron ingot", /obj/item/ingot/iron, 6, time = 100), \
new/datum/stack_recipe("anomalous artifact exclusion cube", /obj/item/storage/box/artifactcontainer/metal, 1, time = 10),
new/datum/stack_recipe("primative chemical isolator", /obj/item/reagent_containers/glass/primitive_chem_isolator, 6, time = 20),\
/*new/datum/stack_recipe("metal parts", /obj/item/stack/crafting/metalparts, 5), \ very easy to find already*/
new/datum/stack_recipe("length of chain", /obj/item/blacksmith/chain, 1, time = 50), \
new/datum/stack_recipe("metal tin", /obj/item/storage/wallet/stash, 5), \
Expand Down Expand Up @@ -842,7 +843,6 @@ GLOBAL_LIST_INIT(bone_recipes, list(
new/datum/stack_recipe_list("medicine", list( \
new /datum/stack_recipe("bone pestle", /obj/item/pestle, 1, time = 20),\
new /datum/stack_recipe("bone mortar", /obj/item/reagent_containers/glass/mortar, 3, time = 20),\
new /datum/stack_recipe("bone chemical isolator", /obj/item/reagent_containers/glass/primitive_chem_isolator, 3, time = 20),\
)), \
null, \
))
Expand Down
40 changes: 40 additions & 0 deletions code/modules/mining/equipment/lazarus_injector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@

#define GHOSTLY_BLUE "#69afff"
#define DEMON_RED "#ff6969"
#define STUPID_YELLOW "#feffb4"

/obj/item/holoparasite_injector
name = "BioSynth Reanimator Injector" // RIP, single most generic name to beat out "Etherleech".
Expand Down Expand Up @@ -154,3 +155,42 @@
else
to_chat(user, span_info("This monster is an exceptionally powerful soul and resists the nanomachines!"))
return

/obj/item/holotribal_injector
name = "Idiots Guide To Unsevering"
desc = "A tome detailing in simplistic terms how to unbind the soul from a corpse with helpful pictures."
icon = 'modular_roguetown/items/books.dmi'
icon_state = "book8_open"
item_state = "firstaid_ointment"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
throwforce = 0
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
throw_range = 5
var/revive_type = SENTIENCE_ORGANIC // So you can't revive boss monsters with it.

/obj/item/holotribal_injector/afterattack(atom/target, mob/user, proximity_flag)
. = ..()
if(isliving(target) && proximity_flag)
if(isanimal(target))
var/mob/living/simple_animal/M = target
if(M.sentience_type != revive_type)
to_chat(user, span_info("[src] is too strong to reanimate with such a simple book."))
return
if(M.stat == DEAD)
M.faction = list("neutral")
M.maxHealth = 45
M.revive(full_heal = 1, admin_revive = 1)
M.loot = list()
M.alpha = 255
M.color = STUPID_YELLOW
user.visible_message(span_notice("[M] suddenly rises from the ground to fight again!"))
playsound(src,'modular_coyote/sound/items/holopara2.ogg',50,1)
return
else
to_chat(user, span_info("The [src] doesnt tell you how to revive the intelligent."))
return
else
to_chat(user, span_info("This monster is too strong to reanimate with such a simple book!"))
return
2 changes: 2 additions & 0 deletions code/modules/reagents/reagent_containers/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,9 @@
/obj/item/reagent_containers/glass/woodmug
name = "wooden mug"
desc = "A curved piece of wood with a hollow dug out of it. For those who prefer slightly more civilized means of alcoholism, but can't afford a glass."
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/wood = 500)

icon = 'icons/obj/drinks.dmi'
icon_state = "wooden_mug"

Expand Down
6 changes: 6 additions & 0 deletions code/modules/supplykit/supplykit_items/supplykit_animals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@
item = /obj/item/holoparasite_injector
cost = 20

/datum/supplykit_item/animals/tribalres
name = "Necronomicon"
desc = "A reusable book Lazarus used to revive and tame most creatures, necromancer delight!"
item = /obj/item/holotribal_injector
cost = 20

/datum/supplykit_item/animals/pet
name = "Animal Beacon"
desc = "A beacon that summons your harmless pet or livestock from the safety of home."
Expand Down

0 comments on commit 2a62ad4

Please sign in to comment.