From f1825c1ca128a1e22d6609ef977f8a90428355ed Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 17 Oct 2011 15:05:57 +0000
Subject: [PATCH] Weed nodes now light up when planted, so the weeds can grow
 around them. You can't place more than one egg in a tile anymore.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2382 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/alien/defines.dm            |   4 ++--
 code/game/objects/alien/weeds.dm              |  11 ++++++++---
 .../carbon/alien/humanoid/alien_powers.dm     |   2 +-
 .../mob/living/carbon/alien/humanoid/queen.dm |   4 ++++
 icons/mob/alien.dmi                           | Bin 33327 -> 33327 bytes
 5 files changed, 15 insertions(+), 6 deletions(-)

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 <B>[src] has planted some alien weeds!</B>"), 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 c0f29ef21c04819077688a422467780bee159e9c..5c1361f6fac7dd1dddc4d1f2e2b2c844e1982b18 100644
GIT binary patch
delta 269
zcmV+o0rLK@gaWUG0+2d?!EVAZ42I9mQ&@1HR>n1#sc7l}UICfLB$m=ti$nYR91vnc
zu=p71(`Wz6?=^hye)<D+``*lyg{K4-wjZCSS=f~T7QQy73B*2>+d~Q#0t+jQOz9{q
z(>Tro7Ph82XB<huLi^0c2iLylrsx(TCsj~K-F2<bSI065CmpqaV65lOB%DSXPZ<-b
z<7{+s>ev|v3K#DwSAQ^Kp0P@i_tl}~{V`w}0=X(1G0&*z%_E2c#)0dTF)}5mt+vyQ
zjZ8_jM$sCB))*AV-wUbk`Nk<XoJ#mxuzxC>CinIV*04Kt(CvG31?)Lk+RHt}dH?_*
T07*naRCt{1y?L0kI05&7@nwM9

delta 269
zcmV+o0rLK@gaWUG0+2d?L2AP=5JlJ4DTZWU>LgojibL=sxk8v&6OBNYsYbT1-$e*1
zrLATuc)YKVzP9jjJoOjo&b?VEOPCT^IJ~`^W(}?|SlI7O!xTK1$3Y4f0t*|Afznkr
zrg0$)SU8yGo^d1r3++!XzPR>xZi;Rta#96#)Kk~$e0407gruW?R*dz&nIxo<##_cj
z>N-1JojP{Mfq3?wa`gox<^`)1d0!1B@2`wyU~*M9VqQ?On^zG9j6<j=V+@p>cG^x8
z8v`ZL8bxblt&tVR&zV&J`N1h~I2Haruzx0dn}z=Zw{X04(4Bkp1?|*W=B7v6<^TX7
T07*naRCt{1y?L0kI05&7%G7*V