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

fixes some things :hjonk:

Browse Source
This commit is contained in:
Seris02
2019-11-30 10:23:22 +08:00
parent a4fb86df48
commit 9788586bb2
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+7 -10
View File
@@ -1301,23 +1301,20 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/datum/hallucination/sleeping_carp/New(mob/living/carbon/C, forced = TRUE)
set waitfor = FALSE
..()
var/list/mobsyup = list()
for (var/mob/living/carbon/A in orange(C,2))
if (get_dist(C,A) < 2 && C != A)
mobsyup += list(A)
if (mobsyup.len == 0)
var/list/mobsyup
for (var/mob/living/carbon/A in orange(C,1))
if (get_dist(C,A) < 2)
LAZYADD(mobsyup,A)
if (!LAZYLEN(mobsyup))
qdel(src)
return
var/mob/living/carbon/G = pick(mobsyup)
if (rand(0,1))
C.visible_message("<span class='warning'>[C] falls to the ground screaming and clutching [G.p_their()] wrist!</span>", \
C.visible_message("<span class='warning'>[C] falls to the ground screaming and clutching [C.p_their()] wrist!</span>", \
"<span class='userdanger'>[G] grabs your wrist and violently wrenches it to the side!</span>")
C.emote("scream")
C.dropItemToGround(C.get_active_held_item())
C.Knockdown(60)
qdel(src)
return
else
to_chat(C,"<span class='userdanger'>[G] violently grabs you!</span>")
qdel(src)
return
qdel(src)