Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
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
19 changes: 18 additions & 1 deletion code/modules/mining/equipment/kinetic_crusher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
var/target_health = L.health
for(var/t in trophies)
var/obj/item/crusher_trophy/T = t
T.on_mark_detonation(target, user)
T.on_mark_detonation(target, user, src) //we pass in the kinetic crusher so that on_mark_detonation can use the properties of the crusher to reapply marks: see malformed_bone
if(!QDELETED(L))
if(!QDELETED(C))
C.total_damage += target_health - L.health //we did some damage, but let's not assume how much we did
Expand Down Expand Up @@ -412,3 +412,20 @@

/obj/effect/temp_visual/hierophant/wall/crusher
duration = 75

//Legion (Megafauna)
/obj/item/crusher_trophy/malformed_bone
name = "malformed bone"
desc = "A piece of bone caught in the act of division. Suitable as a trophy for a kinetic crusher."
icon_state = "malf_bone"
denied_type = /obj/item/crusher_trophy/malformed_bone
bonus_value = 40

/obj/item/crusher_trophy/malformed_bone/effect_desc()
return "mark detonation to have a <b>[bonus_value]</b>% chance to trigger a second detonation"

/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user, obj/item/twohanded/required/kinetic_crusher/hammer_synced)
if(hammer_synced)
for(var/mob/living/L in oview(2,user))//fuck you and everything around you with a mark
if(prob(bonus_value) && !L.has_status_effect(STATUS_EFFECT_CRUSHERMARK))
L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK,hammer_synced)
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ Difficulty: Medium
loot = list(/obj/item/staff/storm,
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker,
/obj/item/keycard/necropolis)
crusher_loot = list(/obj/item/crusher_trophy/malformed_bone,/obj/item/staff/storm,
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker,
/obj/item/keycard/necropolis) //the way it is now you can get this if you just whip out the crusher towards the end but nobody's gonna do that probably
elimination = FALSE
else if(prob(10))
loot = list(/obj/structure/closet/crate/necropolis/tendril)
Expand Down
Binary file modified icons/obj/lavaland/artefacts.dmi
Binary file not shown.