cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes spiders eating the crew alive (#14436)

Browse Source 
* Fixes spiders eating the crew alive

* more fixes

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
This commit is contained in:
Kyep
2020-09-25 22:39:08 +00:00
committed by GitHub
parent dfb27be808
commit 0a046cb8fd
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+17 -3
View File
@@ -164,15 +164,27 @@
if(!cocoon_target)
var/list/choices = list()
for(var/mob/living/L in view(1,src))
for(var/mob/living/L in view(1, src))
if(L == src)
continue
if(L.stat != DEAD)
continue
if(istype(L, /mob/living/simple_animal/hostile/poison/giant_spider))
continue
if(Adjacent(L))
choices += L
for(var/obj/O in src.loc)
for(var/obj/O in get_turf(src))
if(O.anchored)
continue
if(!(isitem(O) || isstructure(O) || ismachinery(O)))
continue
if(Adjacent(O))
choices += O
cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
if(length(choices))
cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
else
to_chat(src, "<span class='warning'>No suitable dead prey or wrappable objects found nearby.")
return
if(cocoon_target && busy != SPINNING_COCOON)
busy = SPINNING_COCOON
@@ -199,6 +211,8 @@
for(var/mob/living/L in C.loc)
if(istype(L, /mob/living/simple_animal/hostile/poison/giant_spider))
continue
if(L.stat != DEAD)
continue
large_cocoon = 1
L.loc = C
C.pixel_x = L.pixel_x