Seeds and nutrients can now be pocketed.

Plant-b-gone a bit more effective (range increased to 3)
Added some more nutrients into the vending machine, for now.
Added new announcer sounds for remaining command reports/alerts and adjusted existing ones.
You can now sometimes hear ghosts groan at you.
Removed some goon authentication stuff from the game launch phase.
Made harvested nettle icons a bit smaller so you can see other stuff as well.
Removed unused files, merged some defines, moved files to places they belong.
Updated changelog.html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@98 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/plants/plant.dm

@@ -1,18 +0,0 @@
-/*
-/obj/plant
-	name = "plant"
-	icon = 'plants.dmi'
-	flags = FPRINT | TABLEPASS
-	var/health = 100
-	var/bruteloss = 0
-	var/toxloss = 0
-	var/generation = 1
-	var/life_stage = 0
-	var/datum/disease/virus = null
-
-/obj/item/seedpacket
-	name = "seed packet"
-	icon = 'plants.dmi'
-	icon_state = "packet"
-	flags = FPRINT | TABLEPASS
-*/

code/defines/obj/hydro.dm

@@ -18,6 +18,7 @@
 	icon = 'hydroponics.dmi'
 	icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
 	flags = FPRINT | TABLEPASS
+	w_class = 1.0 // Makes them pocketable
 	var/mypath = "/obj/item/seeds"
 	var/plantname = ""
 	var/productname = ""
@@ -637,4 +638,49 @@ obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	icon_state = "bottle15"
 	flags = FPRINT |  TABLEPASS
 	toxicity = 8
-	WeedKillStr = 7
+	WeedKillStr = 7
+
+
+
+
+
+
+
+// *************************************
+// Nutrient defines for hydroponics
+// *************************************
+
+
+
+/obj/item/nutrient
+	name = ""
+	icon = 'chemical.dmi'
+	icon_state = "bottle16"
+	flags = FPRINT |  TABLEPASS
+	w_class = 1.0
+	var/mutmod = 0
+	var/yieldmod = 0
+
+/obj/item/nutrient/ez
+	name = "E-Z-Nutrient"
+	icon = 'chemical.dmi'
+	icon_state = "bottle16"
+	flags = FPRINT |  TABLEPASS
+	mutmod = 1
+	yieldmod = 1
+
+/obj/item/nutrient/l4z
+	name = "Left 4 Zed"
+	icon = 'chemical.dmi'
+	icon_state = "bottle18"
+	flags = FPRINT |  TABLEPASS
+	mutmod = 2
+	yieldmod = 0
+
+/obj/item/nutrient/rh
+	name = "Robust Harvest"
+	icon = 'chemical.dmi'
+	icon_state = "bottle15"
+	flags = FPRINT |  TABLEPASS
+	mutmod = 0
+	yieldmod = 2

code/defines/obj/machinery.dm

@@ -617,18 +617,18 @@
 	icon_state = "nutri"
 	icon_deny = "nutri-deny"
 	product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh"
-	product_amounts = "25;15;15"
+	product_amounts = "35;25;15"
 	product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
 
 /obj/machinery/vending/hydroseeds
 	name = "MegaSeed Servitor"
 	desc = "When you need seeds fast!"
 	icon_state = "seeds"
-	product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/nettleseed"
-	product_amounts = "2;2;2;2;2;2;2;2;1"
+	product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium"
+	product_amounts = "2;2;2;2;2;2;2;2"
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
-	product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/towermycelium"
-	product_hideamt = "1;2;2;2;2"
+	product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
+	product_hideamt = "1;2;2;2"
 
 /obj/machinery/microwave
 	name = "Microwave"

code/game/gamemodes/gameticker.dm

@@ -91,7 +91,7 @@ var/global/datum/controller/gameticker/ticker
 
 		//Start master_controller.process()
 		world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
-		spawn(50)
+		spawn(-1)
 			world << sound('welcome.ogg') // Skie
 
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -216,6 +216,7 @@
 			comm.messagetext.Add(intercepttext)
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
+	world << sound('intercept.ogg')
 
 /datum/game_mode/nuclear/proc/random_radio_frequency()
 	var/f = 0

code/game/gamemodes/revolution/revolution.dm

@@ -153,6 +153,7 @@
 			comm.messagetext.Add(intercepttext)
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
+	world << sound('intercept.ogg')
 
 
 /datum/game_mode/revolution/check_win()

code/game/gamemodes/traitor/traitor.dm

@@ -172,6 +172,7 @@
 			comm.messagetext.Add(intercepttext)
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
+	world << sound('intercept.ogg')
 
 
 /datum/game_mode/traitor/declare_completion()

code/game/gamemodes/wizard/wizard.dm

@@ -255,6 +255,7 @@
 			comm.messagetext.Add(intercepttext)
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
+	world << sound('intercept.ogg')
 
 /datum/game_mode/wizard/declare_completion()
 	if(finished)

code/game/objects/items/weapons/hydroponics.dm

@@ -50,7 +50,7 @@ Deathnettle
 			playsound(src.loc, 'spray3.ogg', 50, 1, -6)
 
 			spawn(0)
-				for(var/i=0, i<2, i++) // Max range = 2 tiles
+				for(var/i=0, i<3, i++) // Max range = 3 tiles
 					step_towards(D,A) // Moves towards target as normally (not thru walls)
 					D.reagents.reaction(get_turf(D))
 					for(var/atom/T in get_turf(D))

code/game/sound.dm

@@ -53,7 +53,7 @@ client/verb/Toggle_Soundscape()
 	if(usr:client:no_ambi)
 		usr << sound('shipambience.ogg', repeat = 0, wait = 0, volume = 0, channel = 2)
 	else
-		usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 50, channel = 2)
+		usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 	usr << "Toggled ambience sound."
 	return
 
@@ -70,14 +70,14 @@ client/verb/Toggle_Soundscape()
 
 		if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Constant background noises
 			A:client:ambience_playing = 1
-			A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 50, channel = 2)
+			A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 
 		switch(src.name)
 			if ("Chapel") sound = pick('ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg')
 			if ("Morgue") sound = pick('ambimo1.ogg','ambimo2.ogg')
 			if ("Engine Control") sound = pick('ambieng1.ogg')
 			if ("Atmospherics") sound = pick('ambiatm1.ogg')
-			else sound = pick('ambigen1.ogg','ambigen2.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen13.ogg','ambigen14.ogg')
+			else sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
 
 		if (prob(35))
 			if(A && A:client && !A:client:played)

code/game/verbs/authorize.dm

@@ -101,7 +101,7 @@
 
 		if (!success)
 			src.verbs += /client/proc/goonauth
-			src << "Failed"
+			//src << "Failed"
 			src << "\blue[no_auth_motd]"
 
 		src.authenticating = 0

code/modules/admin/verbs/randomverbs.dm

@@ -220,6 +220,8 @@
 					M.add_supplied_law(10,"[area] [area2] [amount] of [who]")
 
 	command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+	world << sound('ionstorm.ogg')
+
 
 /client/proc/cmd_admin_add_freeform_ai_law()
 	set category = "Debug"
@@ -305,6 +307,7 @@
 
 	command_alert(input);
 
+	world << sound('commandreport.ogg')
 	log_admin("[key_name(src)] has created a command report: [input]")
 	message_admins("[key_name_admin(src)] has created a command report", 1)
 

code/modules/mob/dead/observer/say.dm

@@ -19,12 +19,19 @@
 			if(M.job == "Chaplain")
 				if (prob (49))
 					M.show_message("<span class='game'><i>You hear muffled speech... but nothing is there...</i></span>", 2)
+					if(prob(20))
+						playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1)
 				else
 					M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
+					if(prob(30))
+						playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1)
 			else
 				if (prob(50))
 					return
 				else if (prob (95))
 					M.show_message("<span class='game'><i>You hear muffled speech... but nothing is there...</i></span>", 2)
+					if(prob(20))
+						playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1)
 				else
-					M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
+					M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
+					playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1)

code/modules/mob/mob.dm

@@ -1746,8 +1746,8 @@
 		src << "<div class=\"motd\">[join_motd]</div>"
 
 	src.authorize()
-	src.goonauth()
-	src.beta_tester_auth()
+	//src.goonauth() -- Skie, commented out because not goons anymore.
+	///src.beta_tester_auth()
 
 	src.update_world()
 

code/modules/mob/transform_procs.dm

@@ -136,7 +136,10 @@
 			O.name = newname
 
 		world << text("<b>[O.real_name] is the AI!</b>")
-		world << sound('newAI.ogg')
+
+		spawn(50)
+			world << sound('newAI.ogg')
+
 		if (ticker.mode.name == "AI malfunction")
 			for (var/obj/landmark/start/A in world)
 				if (A.name == "AI")

goonstation.dme

@@ -209,7 +209,6 @@
 #include "code\defines\obj\hydro.dm"
 #include "code\defines\obj\injector.dm"
 #include "code\defines\obj\machinery.dm"
-#include "code\defines\obj\nutrient.dm"
 #include "code\defines\obj\radio.dm"
 #include "code\defines\obj\spawner.dm"
 #include "code\defines\obj\storage.dm"