diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm index 4e82c03d3736..d46c7bd589cb 100644 --- a/code/modules/mining/equipment/lazarus_injector.dm +++ b/code/modules/mining/equipment/lazarus_injector.dm @@ -25,6 +25,9 @@ ///So you can't revive boss monsters or robots with it var/revive_type = SENTIENCE_ORGANIC + ///make it so taming is optional // DARKPACK EDIT ADD START - MEDICAL + var/should_tame = TRUE // DARKPACK EDIT ADD END - MEDICAL + /obj/item/lazarus_injector/interact_with_atom(atom/target, mob/living/user, list/modifiers) if(!loaded) return NONE @@ -40,8 +43,10 @@ if(target_animal.stat != DEAD) balloon_alert(user, "it's not dead!") return ITEM_INTERACT_BLOCKING - - target_animal.lazarus_revive(user, malfunctioning) + if(should_tame) // DARKPACK EDIT ADD START - MEDICAL + target_animal.lazarus_revive(user, malfunctioning) + else + target_animal.revive(HEAL_ALL) // DARKPACK EDIT ADD END - MEDICAL expend(target_animal, user) return ITEM_INTERACT_SUCCESS diff --git a/modular_darkpack/modules/medical/code/vet_lazarus_injector.dm b/modular_darkpack/modules/medical/code/vet_lazarus_injector.dm new file mode 100644 index 000000000000..f79dbf6cf747 --- /dev/null +++ b/modular_darkpack/modules/medical/code/vet_lazarus_injector.dm @@ -0,0 +1,14 @@ +/** + * Players can revive simplemobs with this. + * In-game item that can be used to revive a simplemob once. Does not make mobs friendly. + */ +/obj/item/lazarus_injector/lazadon + name = "lazadon injector" + desc = "An injector with a cocktail chemicals, able to bring pets back from the brink." + icon = 'modular_darkpack/modules/medical/icons/lazadon_injector.dmi' + lefthand_file = 'modular_darkpack/modules/medical/icons/lazadon_lefthand.dmi' + righthand_file = 'modular_darkpack/modules/medical/icons/lazadon_righthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/medical/icons/lazadon_onfloor.dmi') + + brand = "magadon" + should_tame = FALSE diff --git a/modular_darkpack/modules/medical/icons/lazadon_injector.dmi b/modular_darkpack/modules/medical/icons/lazadon_injector.dmi new file mode 100644 index 000000000000..37b30ceae347 Binary files /dev/null and b/modular_darkpack/modules/medical/icons/lazadon_injector.dmi differ diff --git a/modular_darkpack/modules/medical/icons/lazadon_lefthand.dmi b/modular_darkpack/modules/medical/icons/lazadon_lefthand.dmi new file mode 100644 index 000000000000..b6e9111ba4ac Binary files /dev/null and b/modular_darkpack/modules/medical/icons/lazadon_lefthand.dmi differ diff --git a/modular_darkpack/modules/medical/icons/lazadon_onfloor.dmi b/modular_darkpack/modules/medical/icons/lazadon_onfloor.dmi new file mode 100644 index 000000000000..de50b37c23cd Binary files /dev/null and b/modular_darkpack/modules/medical/icons/lazadon_onfloor.dmi differ diff --git a/modular_darkpack/modules/medical/icons/lazadon_righthand.dmi b/modular_darkpack/modules/medical/icons/lazadon_righthand.dmi new file mode 100644 index 000000000000..c03d1ced17f2 Binary files /dev/null and b/modular_darkpack/modules/medical/icons/lazadon_righthand.dmi differ diff --git a/tgstation.dme b/tgstation.dme index b5efb0fa633b..803d6d1f1026 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7715,6 +7715,7 @@ #include "modular_darkpack\modules\masquerade\code\subsystem\masquerade.dm" #include "modular_darkpack\modules\matrix\code\job.dm" #include "modular_darkpack\modules\matrix\code\matrix.dm" +#include "modular_darkpack\modules\medical\code\vet_lazarus_injector.dm" #include "modular_darkpack\modules\mentor\code\_globalvars.dm" #include "modular_darkpack\modules\mentor\code\client_procs.dm" #include "modular_darkpack\modules\mentor\code\dementor.dm"