cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8325 from GinjaNinja32/vines

Browse Source 
Properly fixes vines pulling through windoors
This commit is contained in:
Chinsky
2015-03-01 22:29:21 +03:00
parent 413b085994 34e30fd76a
commit a783e7fd52
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/hydroponics/spreading/spreading_growth.dm
View File

@@ -20,7 +20,7 @@
if(!isnull(seed.chems["pacid"])) if(!isnull(seed.chems["pacid"]))
spawn(rand(5,25)) floor.ex_act(3) spawn(rand(5,25)) floor.ex_act(3)
continue continue
else if(!floor.Enter(src)) if(!Adjacent(floor))
continue continue
neighbors |= floor neighbors |= floor
// Update all of our friends. // Update all of our friends.

6
code/modules/hydroponics/spreading/spreading_response.dm
View File

@@ -60,11 +60,13 @@
if(buckled_mob) if(buckled_mob)
return return
if(!Adjacent(victim))
return
victim.buckled = src victim.buckled = src
victim.update_canmove() victim.update_canmove()
buckled_mob = victim buckled_mob = victim
var/turf/T = get_turf(src) if(victim.loc != get_turf(src))
if(victim.loc != T && T.Enter(victim, get_turf(victim)))
src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>") src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
victim.loc = src.loc victim.loc = src.loc
victim << "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>" victim << "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>"