cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 02:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2607 from adrix89/Fix_1653

Browse Source 
Fix 1653
This commit is contained in:
Razharas
2014-02-04 17:40:30 -08:00
parent 11d8a9e2f3 ba1c517ad1
commit 061b6aab4a
3 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effects/spiders.dm
View File

@@ -93,7 +93,7 @@
desc = "It never stays still for long." desc = "It never stays still for long."
icon_state = "spiderling" icon_state = "spiderling"
anchored = 0 anchored = 0
layer = 2.7 layer = 2.75
health = 3 health = 3
var/amount_grown = 0 var/amount_grown = 0
var/grow_as = null var/grow_as = null

2
code/game/objects/structures/grille.dm
View File

@@ -89,7 +89,7 @@
if(istype(mover) && mover.checkpass(PASSGRILLE)) if(istype(mover) && mover.checkpass(PASSGRILLE))
return 1 return 1
else else
if(istype(mover, /obj/item/projectile)) if(istype(mover, /obj/item/projectile) && density)
return prob(30) return prob(30)
else else
return !density return !density

2
code/modules/projectiles/projectile.dm
View File

@@ -146,7 +146,7 @@
return return
step_towards(src, current) step_towards(src, current)
sleep(1) sleep(1)
if(!bumped && !isturf(original)) if(!bumped && (original.layer>=2.75 || ismob(original)))
if(loc == get_turf(original)) if(loc == get_turf(original))
if(!(original in permutated)) if(!(original in permutated))
Bump(original) Bump(original)