From 6288dc77f2199128a921662771223f1d4f217890 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 3 Oct 2011 16:19:17 +0000
Subject: [PATCH] Alien weeds now don't spread FUCKING EVERYWHERE, instead
 being limited to 3 tiles within the nearest weed node (which are now planted
 for 50 plasma instead of weeds for 100 plasma). Weed nodes spread weeds.

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

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 <B>[src] has planted some alien weeds!</B>"), 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 b299f6c9118e1614b8b1c9dd4b5bc1be1019c59a..c0f29ef21c04819077688a422467780bee159e9c 100644
GIT binary patch
delta 279
zcmV+y0qFj=gaWUG0+1tr0R4JYSad{Xb7OL8aCB*JZU6vyoQ;z~YQr!PMc39ThGbvr
zBwKBYL+~QGLYP<+jX;*EMz*itMF=USt!62ByswYGw(xO0^%v;Qy;&$rm=ahxyuF)d
z4X!X)*zZik6g-#5K?)WE3mc4q(p5I5aUly>IGE<1aU=l??N2U$zPR>xZi;Rta#96#
z)Kk~$e0407gruWZjP<^mB&3nXTgF7{Iy+sRI(El_c=n!h^#vp51*;T!UkxSiuZ(42
za#c2BUQn@{R}lq_L#QWX43wO9+D;Q210~TKMQdcOkrl?znN<Jz!6|Pz75+Z3e<pjI
dh5rJ#aJ+QToqO{M1?|*W=B7v6=Cd&Y1%Xi;f0zIO

delta 286
zcmV+(0pb3ygaWpN0+1tr0R(zfSad{Xb7OL8aCB*JZU6vyoQ>1LYQr!L2H<o26r#P4
zrRz19(Nc0~U!iERYKu7zlbq!BcPOJ{tXRjumtX#|yoLAUslUMC+`ENDdCJhi{^iv*
zEBg|mgSVY)B5{c2{-Fg6K?fU5O!=xC*LW6%4)(6O367-DLHpN#rH5<(cT@5!k=H7;
zsh_ykmRDy&%Gst?O!dA(%6X*mLok!M&dye+&TcqRoI@a~-e5vmu&OA8>QD;d8nFzK
zeAOnD1r2-iC}O}kaD6f+rtGb&?JZ*yQ&wxDS`(u+F&YxTW-`6!yEC3}D)IM%J)yI(
k7FZ|wgoxsw|FMM-<K+N{bML+ZNB3MmFaRF2vnl}vf&LMX761SM