diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm index 7eaa16b1bce..7cab4c286ce 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm @@ -34,7 +34,7 @@ pull_force = MOVE_FORCE_VERY_STRONG del_on_death = TRUE loot = list() - crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing + crusher_loot = list(/obj/item/crusher_trophy/demon_core = 1) /// SKYRAT EDIT CHANGE - ORIGINAL : crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing deathmessage = "fades as the energies that tied it to this world dissipate." deathsound = 'sound/magic/demon_dies.ogg' stat_attack = HARD_CRIT diff --git a/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm b/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm new file mode 100644 index 00000000000..24a2ef577cc --- /dev/null +++ b/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm @@ -0,0 +1,22 @@ +//////////////////////////Demonic Watcher - Start////////////////////////// +/obj/item/crusher_trophy/demon_core + name = "demonic core" + desc = "The chipped core of a demonic watcher, it gently hums with weak bluespace energy." + icon = 'modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi' + icon_state = "demon_core" + denied_type = /obj/item/crusher_trophy/demon_core + +/obj/item/crusher_trophy/demon_core/effect_desc() + return "mark detonation to normalise your body and core temperature" + +/obj/item/crusher_trophy/demon_core/on_mark_detonation(mob/living/target, mob/living/user) + user.bodytemperature = user.get_body_temp_normal() + if(ishuman(user)) + var/mob/living/carbon/human/humi = user + humi.coretemperature = humi.get_body_temp_normal() + ..() + +/mob/living/simple_animal/hostile/asteroid/ice_demon/spawn_crusher_loot() + for(var/item_path in crusher_loot) + new item_path(loc) +//////////////////////////Demonic Watcher - End////////////////////////// diff --git a/modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi b/modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi new file mode 100644 index 00000000000..338168f0092 Binary files /dev/null and b/modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 1d6d6eadffc..632af6e52d1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4317,6 +4317,7 @@ #include "modular_skyrat\modules\modular_items\code\game\modular_clothing.dm" #include "modular_skyrat\modules\modular_items\code\game\objects\items\cross.dm" #include "modular_skyrat\modules\modular_items\code\game\objects\items\miscellaneous.dm" +#include "modular_skyrat\modules\modular_items\code\game\objects\items\mining\equipment\kinetic_crusher.dm" #include "modular_skyrat\modules\modular_items\code\game\objects\items\storage\bags.dm" #include "modular_skyrat\modules\modular_items\code\game\objects\items\tools\makeshift.dm" #include "modular_skyrat\modules\modular_weapons\code\datums\components\crafting\recipes.dm"