From 3bff5f4cd680c00d4f8f8949b12b9b9df17ab703 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Dec 2017 17:43:52 -0500 Subject: [PATCH] Update PDA_types.dm --- code/game/objects/items/devices/PDA/PDA_types.dm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 90eff4b735..b1a4a9f6f8 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -10,23 +10,11 @@ /obj/item/device/pda/clown/Initialize() . = ..() -<<<<<<< HEAD - AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING) - -/obj/item/device/pda/clown/ComponentActivated(datum/component/C) - ..() - var/datum/component/slippery/S = C - if(!istype(S)) - return - var/mob/living/carbon/human/M = S.slip_victim - if (istype(M) && (M.real_name != src.owner)) - slipvictims |= M -======= AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip)) /obj/item/device/pda/clown/proc/AfterSlip(mob/living/carbon/human/M) if (istype(M) && (M.real_name != owner)) ->>>>>>> 3aba012... Removes ComponentActivated in favor of callbacks (#33274) + slipvictims |=M var/obj/item/cartridge/virus/clown/cart = cartridge if(istype(cart) && cart.charges < 5) cart.charges++