cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-28 19:41:16 -04:00
parent 8ed384b38c
commit d3837b76e8
5 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
-7
View File
@@ -62,16 +62,9 @@
icon_state = "stickyweb2"
return ..()
<<<<<<< HEAD
/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
return 1
=======
/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
return TRUE
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
else if(istype(mover, /mob/living))
if(prob(50))
to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))