diff --git a/code/game/objects/alien/defines.dm b/code/game/objects/alien/defines.dm index 39a03445d8a..ae9bc734368 100644 --- a/code/game/objects/alien/defines.dm +++ b/code/game/objects/alien/defines.dm @@ -54,6 +54,13 @@ density = 0 var/health = 50 + bush + icon_state = "weedbush" + name = "purple sac" + desc = "Weird purple octopus-like thing." + + density = 1 + /obj/effect/alien/acid name = "acid" desc = "Burbling corrossive stuff. I wouldn't want to touch it." diff --git a/code/game/objects/alien/weeds.dm b/code/game/objects/alien/weeds.dm index 9d4fa1fcaba..66e228b57d6 100644 --- a/code/game/objects/alien/weeds.dm +++ b/code/game/objects/alien/weeds.dm @@ -1,9 +1,11 @@ +#define BUSHRANGE 3 + /obj/effect/alien/weeds/New() ..() if(istype(loc, /turf/space)) del(src) return - icon_state = pick("weeds", "weeds1", "weeds2") + if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2") spawn(rand(150,300)) if(src) Life() @@ -36,6 +38,9 @@ Alien plants should do something if theres a lot of poison if (!istype(T) || T.density || locate(/obj/effect/alien/weeds) in T || istype(T.loc, /area/arrival) || istype(T, /turf/space)) continue + if(!(locate(/obj/effect/alien/weeds/bush) in view(BUSHRANGE,T))) + continue + // if (locate(/obj/movable, T)) // don't propogate into movables // continue @@ -90,4 +95,6 @@ Alien plants should do something if theres a lot of poison return return 0 return 1 -*/ \ No newline at end of file +*/ + +#undef BUSHRANGE \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 10c16a3dfc5..17da915db64 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -19,16 +19,15 @@ Doesn't work on other aliens/AI.*/ else return 1 /mob/living/carbon/alien/humanoid/verb/plant() - set name = "Plant Weeds (100)" + set name = "Plant Weeds (50)" set desc = "Plants some alien weeds" set category = "Alien" - if(powerc(100,1)) - toxloss -= 100 + if(powerc(50,1)) + toxloss -= 50 for(var/mob/O in viewers(src, null)) O.show_message(text("\green [src] has planted some alien weeds!"), 1) - var/obj/effect/alien/weeds/W = new (loc) - W.Life() + new /obj/effect/alien/weeds/bush(loc) return /mob/living/carbon/alien/humanoid/verb/call_to() diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index b299f6c9118..c0f29ef21c0 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ