Changes by me:

Added two new hats to the station. A Security Coft Hat and a Green Bandana.

Security Coft Hat can be found in security lockers. Sugar packs can be found in kitchen locker.

Map updated with Green Bandanas in Hydro and one Sec Coft Hat on the security table.

Hydro has two new plants, the Athelas Morgan's Tears(which has some healing properties) and the White Beet.

White beet and Morgan's Tears can be used on a grinder or blender and made into Sugur and into Crushed Athelas Morgan's Tears respectively.

Credits for sprites goes to Farart.

--------------------------------------------

Changes by Petethegoat

CODING CHANGES:
Level 3 biosuit closets no longer have a jumpsuit and shoes in them.

MAPPING CHANGES:
Virology now has a disposal. It goes straight to space like the ones in xenobio and the incinerator room.
Virology now has an air alarm.
The monkeys in Virology now have different names than the ones in Genetics.

Xenobiology containment rooms have been slightly reduced in size.

The boxing ring in the fitness room has thinner glass walls.

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

code/defines/obj.dm

@@ -1311,7 +1311,7 @@
 
 /obj/item/stack/tile/grass
 	name = "Grass tile"
-	singular_name = "S	teel floor tile"
+	singular_name = "Grass floor tile"
 	desc = "A patch of grass like they often use on golf courses"
 	icon_state = "tile_grass"
 	w_class = 3.0

code/defines/obj/clothing/head.dm

@@ -149,6 +149,17 @@
 	protective_temperature = 500
 	heat_transfer_coefficient = 0.10
 
+/obj/item/clothing/head/seccoft
+	name = "Security Coft Hat"
+	desc = "An armored baseball hat."
+	icon_state = "seccoft"
+	flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES
+	item_state = "helmet"
+	armor = list(melee = 60, bullet = 40, laser = 40, taser = 10, bomb = 15, bio = 10, rad = 0)
+
+	protective_temperature = 500
+	heat_transfer_coefficient = 0.10
+
 /obj/item/clothing/head/helmet/space
 	name = "space helmet"
 	icon_state = "space"
@@ -355,6 +366,14 @@
 	flags = FPRINT|TABLEPASS|HEADSPACE
 	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
 
+/obj/item/clothing/head/helmet/greenbandana
+	name = "Green Bandana"
+	desc = "A green bandana with some fine nanotech lining."
+	icon_state = "greenbandana"
+	item_state = "greenbandana"
+	flags = FPRINT|TABLEPASS|HEADSPACE
+	armor = list(melee = 5, bullet = 5, laser = 5, taser = 5, bomb = 15, bio = 15, rad = 15)
+
 /obj/item/clothing/head/helmet/riot
 	name = "Riot Helmet"
 	desc = "A helmet specifically designed to protect against close range attacks."

code/defines/obj/hydro.dm

@@ -527,6 +527,38 @@
 	plant_type = 0
 	growthstages = 6
 
+/obj/item/seeds/athelasmorganstearsseed
+	name = "Athelas Morgan's Tears seeds"
+	desc = "A plant grown from the tears of Morgan."
+	icon_state = "seed-athelas-morganstears"
+	mypath = "/obj/item/seeds/athelasmorganstearsseed"
+	species = "athelas-morganstears"
+	plantname = "Athelas Morgan's Tears"
+	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/athelasmorganstears"
+	lifespan = 60
+	endurance = 25
+	maturation = 6
+	production = 6
+	yield = 8
+	plant_type = 0
+	growthstages = 6
+
+/obj/item/seeds/whitebeetseed
+	name = "White Beet seed"
+	desc = "A sugary beet."
+	icon_state = "seed-whitebeet"
+	mypath = "/obj/item/seeds/whitebeetseed"
+	species = "beet"
+	plantname = "White Beet"
+	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet"
+	lifespan = 60
+	endurance = 50
+	maturation = 6
+	production = 6
+	yield = 4
+	plant_type = 0
+	growthstages = 6
+
 /*
 /obj/item/seeds/
 	name = ""
@@ -668,6 +700,22 @@
 		..()
 		reagents.add_reagent("nutriment", 2)
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/athelasmorganstears
+	seed = "/obj/item/seeds/athelasmorganstearsseed"
+	name = "Morgan's Tears"
+	desc = "A tear of Morgan. Used for healing."
+	icon_state = "athelas-morganstears"
+	potency = 10
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("space_drugs", 10)
+		reagents.add_reagent("leporazine", 5)
+		reagents.add_reagent("kelotane", 5)
+		reagents.add_reagent("bicaridine", 5)
+		reagents.add_reagent("toxin", 5)
+		reagents.add_reagent("psilocybin", 10)
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/apple
 	seed = "/obj/item/seeds/appleseed"
 	name = "Apple"
@@ -676,7 +724,17 @@
 	potency = 15
 	New()
 		..()
-		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
+	seed = "/obj/item/seeds/whitebeetseed"
+	name = "White Beet"
+	desc = "A beeting of white."
+	icon_state = "whitebeet"
+	potency = 15
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/banana
 	seed = "/obj/item/seeds/bananaseed"

code/defines/obj/vending.dm

@@ -128,8 +128,8 @@
 	name = "MegaSeed Servitor"
 	desc = "When you need seeds fast!"
 	icon_state = "seeds"
-	product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed"
-	product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5"
+	product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/athelasmorganstearsseed;/obj/item/seeds/whitebeetseed"
+	product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3"
 	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/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
 	product_hideamt = "2;2;2;2;2"

code/game/machinery/kitchen/processor.dm

@@ -61,6 +61,14 @@
 		input = /obj/item/weapon/reagent_containers/food/snacks/flour
 		output = /obj/item/weapon/reagent_containers/food/snacks/spagetti
 
+	whitebeet
+		input = /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
+		output = /obj/item/weapon/reagent_containers/food/snacks/sugar
+
+	athelasmorganstears
+		input = /obj/item/weapon/reagent_containers/food/snacks/grown/athelasmorganstears
+		output = /obj/item/weapon/reagent_containers/food/snacks/athelasmorganstearscrushed
+
 	/* mobs */
 	mob
 		process(loc, what)

code/game/objects/closets/kitchen.dm

@@ -21,6 +21,21 @@
 	new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/sugar(src)
 	/*new /obj/item/weapon/tray(src)
 	new /obj/item/weapon/tray(src)
 	new /obj/item/weapon/tray(src)

code/game/objects/closets/l3closet.dm

@@ -2,8 +2,6 @@
 	..()
 	sleep(2)
 	new /obj/item/clothing/suit/bio_suit/general( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/general( src )
 
 /obj/closet/l3closet/general/New()
@@ -11,8 +9,6 @@
 	sleep(2)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/general( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/general( src )
 
 /obj/closet/l3closet/virology/New()
@@ -20,8 +16,6 @@
 	sleep(2)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/virology( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
 
 /obj/closet/l3closet/security/New()
@@ -29,8 +23,6 @@
 	sleep(2)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/security( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/security( src )
 
 /obj/closet/l3closet/janitor/New()
@@ -38,8 +30,6 @@
 	sleep(2)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/janitor( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/janitor( src )
 
 /obj/closet/l3closet/scientist/New()
@@ -47,6 +37,4 @@
 	sleep(2)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
-	new /obj/item/clothing/under/color/white( src )
-	new /obj/item/clothing/shoes/white( src )
 	new /obj/item/clothing/head/bio_hood/scientist( src )

code/game/objects/closets/secure/security.dm

@@ -14,6 +14,8 @@
 	new /obj/item/clothing/head/helmet(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/clothing/head/seccoft(src)
+	new /obj/item/clothing/head/seccoft(src)
 	return
 
 /obj/secure_closet/security1/proc/prison_break()
@@ -41,6 +43,7 @@
 	new /obj/item/device/detective_scanner( src )
 	new /obj/item/device/detective_scanner( src )
 	new /obj/item/device/detective_scanner( src )
+	new /obj/item/clothing/head/seccoft( src )
 	return
 
 /obj/secure_closet/highsec/New()
@@ -55,6 +58,7 @@
 	new /obj/item/clothing/glasses/sunglasses( src )
 	new /obj/item/clothing/suit/armor/vest( src )
 	new /obj/item/clothing/head/helmet( src )
+	new /obj/item/clothing/head/seccoft( src )
 	return
 
 /obj/secure_closet/hos/New()
@@ -74,6 +78,7 @@
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/handcuffs(src)
 	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/clothing/head/seccoft(src)
 	return
 
 /obj/secure_closet/injection/New()

code/modules/food/food.dm

@@ -84,6 +84,27 @@
 		..()
 		reagents.add_reagent("nutriment", 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/sugar
+	name = "sugar"
+	desc = "Give me some sugar honey!"
+	icon_state = "sugar"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/athelasmorganstearscrushed
+	name = "Crushed Athelas Morgan's Tears"
+	desc = "Crushed herbs with healing properties"
+	icon_state = "athelasmorganstearscrushed"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("leporazine", 8)
+		reagents.add_reagent("kelotane", 8)
+		reagents.add_reagent("bicaridine", 8)
+		reagents.add_reagent("anti_toxin", 5)
+		reagents.add_reagent("psilocybin", 10)
+
 /obj/item/weapon/reagent_containers/food/snacks/meat
 	name = "meat"
 	desc = "A slab of meat"

code/modules/food/recipes_microwave.dm

@@ -241,7 +241,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana
+		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
 
@@ -372,7 +372,7 @@
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/flour,
 		/obj/item/weapon/reagent_containers/food/snacks/flour,
-		 /obj/item/weapon/reagent_containers/food/snacks/grown/banana
+		 /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie
 /*

tgstation.dme

@@ -130,7 +130,6 @@
 #define FILE_DIR "icons/turf"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"