cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 01:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows kinetic crusher to pick up trophies without being wielded (#93272)

Browse Source
This commit is contained in:
SmArtKar
2025-10-09 08:04:38 +02:00
committed by GitHub
parent cd99a81aac
commit 846e2f5c74
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm
+8
View File
@@ -208,6 +208,14 @@
SEND_SIGNAL(user, COMSIG_LIVING_CRUSHER_DETONATE, target, src, backstabbed)
target.apply_damage(combined_damage, BRUTE, blocked = def_check)
/obj/item/kinetic_crusher/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!istype(interacting_with, /obj/item/crusher_trophy))
return NONE
var/obj/item/crusher_trophy/new_trophy = interacting_with
if(new_trophy.add_to(src, user))
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_BLOCKING
/obj/item/kinetic_crusher/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!HAS_TRAIT(src, TRAIT_WIELDED))
balloon_alert(user, "wield it first!")
code/modules/mining/equipment/kinetic_crusher/kinetic_crusher_trophies.dm
-5
View File
@@ -25,11 +25,6 @@
SHOULD_CALL_PARENT(FALSE)
return "errors"
/obj/item/crusher_trophy/attackby(obj/item/attacking_item, mob/living/user)
if(!istype(attacking_item, /obj/item/kinetic_crusher))
return ..()
add_to(attacking_item, user)
/// Tries to add the trophy to our crusher
/obj/item/crusher_trophy/proc/add_to(obj/item/kinetic_crusher/crusher, mob/living/user)
for(var/obj/item/crusher_trophy/trophy as anything in crusher.trophies)