Upstream fixes

This commit is contained in:
Waterpig
2024-06-28 10:02:14 +02:00
parent e96f29d4a5
commit 55550cb524
151 changed files with 15244 additions and 10839 deletions
@@ -69,8 +69,6 @@
COOLDOWN_START(src, grab_cooldown, use_cooldown)
return
/obj/item/physic_manipulation_tool/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
/obj/item/physic_manipulation_tool/dropped(mob/user, silent)
. = ..()
@@ -66,7 +66,7 @@
do_work_effect(target, user)
playsound(user, 'modular_zubbers/sound/phystools/toolgun_shot1.ogg', 100, TRUE)
/obj/item/phystool/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
/obj/item/phystool/ranged_interact_with_atom_secondary(atom/target, mob/user, proximity_flag, list/modifiers)
. = ..()
if(!selected_mode)
return