From cb355bd50fccad16ca9c5f1c220df1d67eee7d5c Mon Sep 17 00:00:00 2001 From: Comicao1 <33708588+Comicao1@users.noreply.github.com> Date: Wed, 8 Feb 2023 18:18:09 -0300 Subject: [PATCH] A few requested things --- modular_splurt/code/game/objects/items/toys.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modular_splurt/code/game/objects/items/toys.dm b/modular_splurt/code/game/objects/items/toys.dm index 333c129030..526e505d6f 100644 --- a/modular_splurt/code/game/objects/items/toys.dm +++ b/modular_splurt/code/game/objects/items/toys.dm @@ -49,8 +49,6 @@ icon = 'modular_splurt/icons/misc/beach.dmi' desc = "Hmm. This ball is a bit heavier and tougher than the others." -/obj/item/electropack/vibrator/var/hidden - /obj/item/toy/beach_ball/attackby(obj/item/I, mob/living/user) if(istype(I, /obj/item/electropack/vibrator)) if(vibrator) @@ -95,7 +93,7 @@ // playsound(src.loc, 'modular_splurt/sound/effects/beachball_whine.ogg', 50, 1) /obj/item/toy/beach_ball/syndicate/process() - ..() + . = ..() if(vibrator && enabled) throwforce = 60 @@ -113,8 +111,6 @@ else ..() -/obj/item/toy/beach_ball/syndicate - /obj/item/toy/beach_ball/syndicate/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) if(ishuman(thrower)) throwforce = 0