shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update PDA_types.dm

Browse Source
This commit is contained in:
deathride58
2017-12-05 17:43:52 -05:00
committed by GitHub
parent cf23ed4e14
commit 3bff5f4cd6
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA_types.dm
+1 -13
View File
@@ -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++