cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Moves tool use back higher in the chain, but makes it so tool acts are only called on non-combat-mode (#28457)

Browse Source 
Moves tool use back higher in the chain, but makes it so tool acts are only called on non-combat-mode

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-02 15:31:16 +05:30
committed by GitHub
co-authored by MrMelbert SpaceLoveSs13
parent 4e13b09bac
commit 53d3099582
27 changed files with 294 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/laserpointer.dm
+3 -3
View File
@@ -80,11 +80,11 @@
diode = null
return TRUE
/obj/item/laser_pointer/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
/obj/item/laser_pointer/tool_act(mob/living/user, obj/item/tool, list/modifiers)
if(isnull(crystal_lens))
return NONE
return ..()
if(tool_behaviour != TOOL_WIRECUTTER && tool_behaviour != TOOL_HEMOSTAT)
return NONE
return ..()
tool.play_tool_sound(src)
balloon_alert(user, "removed crystal lens")
crystal_lens.forceMove(drop_location())