diff --git a/code/game/objects/alien/defines.dm b/code/game/objects/alien/defines.dm index ae9bc734368..722b10d0c1e 100644 --- a/code/game/objects/alien/defines.dm +++ b/code/game/objects/alien/defines.dm @@ -54,8 +54,8 @@ density = 0 var/health = 50 - bush - icon_state = "weedbush" + node + icon_state = "weednode" name = "purple sac" desc = "Weird purple octopus-like thing." diff --git a/code/game/objects/alien/weeds.dm b/code/game/objects/alien/weeds.dm index 66e228b57d6..b65d00044b3 100644 --- a/code/game/objects/alien/weeds.dm +++ b/code/game/objects/alien/weeds.dm @@ -1,4 +1,4 @@ -#define BUSHRANGE 3 +#define NODERANGE 3 /obj/effect/alien/weeds/New() ..() @@ -11,6 +11,11 @@ Life() return +/obj/effect/alien/weeds/node/New() + ..() + sd_SetLuminosity(NODERANGE) + return + /obj/effect/alien/weeds/proc/Life() set background = 1 var/turf/U = get_turf(src) @@ -38,7 +43,7 @@ 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))) + if(!(locate(/obj/effect/alien/weeds/node) in view(NODERANGE,T))) continue // if (locate(/obj/movable, T)) // don't propogate into movables @@ -97,4 +102,4 @@ Alien plants should do something if theres a lot of poison return 1 */ -#undef BUSHRANGE \ No newline at end of file +#undef NODRANGE \ 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 17da915db64..3c589d32d9c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -27,7 +27,7 @@ Doesn't work on other aliens/AI.*/ toxloss -= 50 for(var/mob/O in viewers(src, null)) O.show_message(text("\green [src] has planted some alien weeds!"), 1) - new /obj/effect/alien/weeds/bush(loc) + new /obj/effect/alien/weeds/node(loc) return /mob/living/carbon/alien/humanoid/verb/call_to() diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index cb06de3116a..1aeb1dc271f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -167,6 +167,10 @@ set desc = "Plants an egg" set category = "Alien" + if(locate(/obj/effect/alien/egg) in get_turf(src)) + src << "There's already an egg here." + return + if(powerc(50,1))//Can't plant eggs on spess tiles. That's silly. toxloss -= 200 for(var/mob/O in viewers(src, null)) diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index c0f29ef21c0..5c1361f6fac 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ