From aec5fbf64013280f24c4dbf3420b3d6a036fb628 Mon Sep 17 00:00:00 2001 From: Miauw Date: Thu, 27 Feb 2014 18:50:53 +0100 Subject: [PATCH] Fixed up singulo buff even more --- code/modules/power/singularity/singularity.dm | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index c9aba2a149d..c7a1c6cd77b 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -221,18 +221,24 @@ var/global/list/uneatable = list( if(is_type_in_list(X, uneatable)) continue if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))|| (src.current_size >= 9)) step_towards(X,src) + else if(istype(X,/mob/living/carbon/human)) var/mob/living/carbon/human/H = X - var/list/handlist = list(H.get_active_hand(), H.get_inactive_hand()) - for(var/obj/item/hand in handlist) - H.unEquip(hand) - step_towards(hand, src, 1) - H.apply_effect(12, IRRADIATE) + if(istype(H.shoes,/obj/item/clothing/shoes/magboots)) var/obj/item/clothing/shoes/magboots/M = H.shoes - if(M.magpulse) - continue - step_towards(H,src) + if(!M.magpulse) + step_towards(H,src) + else + step_towards(H,src) + + if(current_size >= 5) + var/list/handlist = list(H.l_hand, H.r_hand) + for(var/obj/item/hand in handlist) + if(prob(current_size * 10) && H.unEquip(hand)) + step_towards(hand, src) + + H.apply_effect(current_size * 3, IRRADIATE) // Turf and movable atoms else if(dist <= consume_range && (isturf(X) || istype(X, /atom/movable))) consume(X)