diff --git a/code/defines/obj/clothing/glasses.dm b/code/defines/obj/clothing/glasses.dm
index 9c4b03fc7bd..a3754496132 100644
--- a/code/defines/obj/clothing/glasses.dm
+++ b/code/defines/obj/clothing/glasses.dm
@@ -25,8 +25,8 @@
/obj/item/clothing/glasses/material
name = "Optical Material Scanner"
- icon_state = "blindfold"
- item_state = "blindfold"
+ icon_state = "material"
+ item_state = "glasses"
origin_tech = "magnets=2"
/obj/item/clothing/glasses/regular
diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index f3cbcb52989..ba80b20264d 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -89,6 +89,21 @@
plant_type = 0
growthstages = 6
+/obj/item/seeds/bananaseed
+ name = "Banana seeds"
+ icon_state = "seed-banana"
+ mypath = "/obj/item/seeds/bananaseed"
+ species = "banana"
+ plantname = "Banana tree"
+ productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/banana"
+ lifespan = 50
+ endurance = 30
+ maturation = 6
+ production = 6
+ yield = 3
+ plant_type = 0
+ growthstages = 6
+
/obj/item/seeds/eggplantseed
name = "Eggplant seeds"
icon_state = "seed-eggplant"
@@ -114,7 +129,7 @@
lifespan = 75
endurance = 15
maturation = 6
- production = 6
+ production = 12
yield = 2
plant_type = 0
growthstages = 6
@@ -179,7 +194,7 @@
endurance = 15
maturation = 10
production = 1
- yield = 2
+ yield = 4
plant_type = 0
oneharvest = 1
potency = 10
@@ -245,7 +260,7 @@
endurance = 15
maturation = 10
production = 1
- yield = 4
+ yield = 5
potency = 10
oneharvest = 1
plant_type = 0
@@ -296,7 +311,7 @@
endurance = 15
maturation = 7
production = 1
- yield = 6
+ yield = 5
potency = 15 // Lowish potency at start
oneharvest = 1
growthstages = 3
@@ -438,6 +453,23 @@
growthstages = 4
plant_type = 1
+/obj/item/seeds/sunflowerseed
+ name = "Sunflower seeds"
+ icon_state = "seed-sunflower"
+ mypath = "/obj/item/seeds/sunflowerseed"
+ species = "sunflower"
+ plantname = "Sunflower"
+ productname = "/obj/item/weapon/grown/sunflower"
+ lifespan = 25
+ endurance = 20
+ maturation = 6
+ production = 1
+ yield = 2
+ potency = -1
+ oneharvest = 1
+ growthstages = 3
+ plant_type = 1
+
/obj/item/seeds/brownmold
name = "Brown Mold"
icon_state = "seed"
@@ -550,6 +582,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
seed = "/obj/item/seeds/cornseed"
name = "Corn"
+ desc = "I like corm!"
icon_state = "corn"
New()
..()
@@ -595,6 +628,27 @@
..()
reagents.add_reagent("nutriment", 2)
+/obj/item/weapon/reagent_containers/food/snacks/grown/banana
+ seed = "/obj/item/seeds/bananaseed"
+ name = "Banana"
+ desc = "A banana."
+ icon = 'items.dmi'
+ icon_state = "banana"
+ item_state = "banana"
+ On_Consume()
+ if(!reagents.total_volume)
+ var/mob/M = usr
+ var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
+ M << "\blue You peel the banana."
+ M.put_in_hand(W)
+ W.add_fingerprint(M)
+ New()
+ ..()
+ reagents.add_reagent("banana", 5)
+ bitesize = 5
+ src.pixel_x = rand(-5.0, 5)
+ src.pixel_y = rand(-5.0, 5)
+
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
seed = "/obj/item/seeds/chiliseed"
name = "Chili"
@@ -797,12 +851,111 @@
user.sd_SetLuminosity(user.luminosity - potency/10)
src.sd_SetLuminosity(potency/10)
+// **********************
+// Other harvested materials from plants (that are not food)
+// **********************
+
+/obj/item/weapon/grown // Grown weapons
+ name = "grown_weapon"
+ icon = 'weapons.dmi'
+ var/seed = ""
+ var/plantname = ""
+ var/productname = ""
+ var/species = ""
+ var/lifespan = 20
+ var/endurance = 15
+ var/maturation = 7
+ var/production = 7
+ var/yield = 2
+ var/potency = -1
+ var/plant_type = 0
+ New()
+ var/datum/reagents/R = new/datum/reagents(50)
+ reagents = R
+ R.my_atom = src
+
+/obj/item/weapon/grown/log
+ desc = "This is a log grown from a tower cap mushroom."
+ icon = 'harvest.dmi'
+ name = "Tower Cap Log"
+ icon_state = "logs"
+ force = 5
+ flags = TABLEPASS
+ throwforce = 5
+ w_class = 3.0
+ throw_speed = 3
+ throw_range = 3
+ plant_type = 2
+ origin_tech = "materials=1"
+ seed = "/obj/item/seeds/towermycelium"
+
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/weapon/circular_saw))
+ W.visible_message(" \red You make planks out of the [src]! ", 1)
+ for(var/i=0,i<2,i++)
+ new /obj/item/stack/sheet/wood (src.loc)
+ del(src)
+ return
+
+/obj/item/weapon/grown/sunflower // FLOWER POWER!
+ desc = "This is a beautiful sunflower! A certain person might beat you to death if you trample these."
+ icon = 'harvest.dmi'
+ name = "Sunflower"
+ icon_state = "sunflower"
+ damtype = "fire"
+ force = 0
+ flags = TABLEPASS
+ throwforce = 1
+ w_class = 1.0
+ throw_speed = 1
+ throw_range = 3
+ plant_type = 1
+ seed = "/obj/item/seeds/sunflower"
+
+/obj/item/weapon/grown/nettle // -- Skie
+ desc = "This is a nettle. It's probably not wise to touch it with bare hands..."
+ icon = 'weapons.dmi'
+ name = "Nettle"
+ icon_state = "nettle"
+ damtype = "fire"
+ force = 15
+ flags = TABLEPASS
+ throwforce = 1
+ w_class = 1.0
+ throw_speed = 1
+ throw_range = 3
+ plant_type = 1
+ origin_tech = "combat=1"
+ seed = "/obj/item/seeds/nettleseed"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("acid", round(potency, 1))
+
+/obj/item/weapon/grown/deathnettle // -- Skie
+ desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!"
+ icon = 'weapons.dmi'
+ name = "Deathnettle"
+ icon_state = "deathnettle"
+ damtype = "fire"
+ force = 30
+ flags = TABLEPASS
+ throwforce = 1
+ w_class = 1.0
+ throw_speed = 1
+ throw_range = 3
+ plant_type = 1
+ seed = "/obj/item/seeds/deathnettleseed"
+ origin_tech = "combat=3"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("pacid", round(potency, 1))
// *************************************
// Pestkiller defines for hydroponics
// *************************************
-
/obj/item/pestkiller
name = ""
icon = 'chemical.dmi'
@@ -847,18 +1000,68 @@
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
+// *************************************
+// Hydroponics Tools
+// *************************************
+/obj/item/weapon/plantbgone // -- Skie
+ desc = "Plant-B-Gone! Kill those pesky weeds!"
+ icon = 'hydroponics.dmi'
+ name = "Plant-B-Gone"
+ icon_state = "plantbgone"
+ item_state = "plantbgone"
+ flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+ throwforce = 3
+ w_class = 2.0
+ throw_speed = 2
+ throw_range = 10
+ var/empty = 0
+/* Commented out due to being redundant. - Darem
+/obj/item/weapon/weedspray // -- Skie
+ desc = "Toxic mixture in spray form to kill small weeds."
+ icon = 'hydroponics.dmi'
+ name = "Weed Spray"
+ icon_state = "weedspray"
+ item_state = "spray"
+ flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+ throwforce = 4
+ w_class = 2.0
+ throw_speed = 2
+ throw_range = 10
+ var/toxicity = 4
+ var/WeedKillStr = 2
+*/
+/obj/item/weapon/pestspray // -- Skie
+ desc = "Pest eliminator spray! Do not inhale!"
+ icon = 'hydroponics.dmi'
+ name = "Pest Spray"
+ icon_state = "pestspray"
+ item_state = "spray"
+ flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+ throwforce = 4
+ w_class = 2.0
+ throw_speed = 2
+ throw_range = 10
+ var/toxicity = 4
+ var/PestKillStr = 2
-
-
-
+/obj/item/weapon/minihoe // -- Numbers
+ name = "Mini hoe"
+ desc = "Use for removing weeds or scratching your back."
+ icon = 'weapons.dmi'
+ icon_state = "hoe"
+ item_state = "hoe"
+ flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+ force = 5.0
+ throwforce = 7.0
+ w_class = 2.0
+ m_amt = 50
// *************************************
// Weedkiller defines for hydroponics
// *************************************
-
/obj/item/weedkiller
name = ""
icon = 'chemical.dmi'
@@ -891,18 +1094,10 @@
toxicity = 8
WeedKillStr = 7
-
-
-
-
-
-
// *************************************
// Nutrient defines for hydroponics
// *************************************
-
-
/obj/item/nutrient
name = ""
icon = 'chemical.dmi'
diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index b1c5a9a4481..2f9bca056f2 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -63,9 +63,9 @@
"/obj/item/weapon/reagent_containers/food/drinks/milk",
"/obj/item/kitchen/egg_box",
"/obj/item/weapon/reagent_containers/food/condiment/enzyme",
- "/obj/item/weapon/reagent_containers/food/snacks/banana",
- "/obj/item/weapon/reagent_containers/food/snacks/banana",
- "/obj/item/weapon/reagent_containers/food/snacks/banana")
+ "/obj/item/weapon/reagent_containers/food/snacks/grown/banana",
+ "/obj/item/weapon/reagent_containers/food/snacks/grown/banana",
+ "/obj/item/weapon/reagent_containers/food/snacks/grown/banana")
cost = 5
containertype = "/obj/crate/freezer"
containername = "Food crate"
@@ -408,6 +408,7 @@
"/obj/item/seeds/soyaseed",
"/obj/item/seeds/wheatseed",
"/obj/item/seeds/carrotseed",
+ "/obj/item/seeds/sunflowerseed",
"/obj/item/seeds/chantermycelium",
"/obj/item/seeds/potatoseed")
cost = 10
@@ -422,6 +423,7 @@
"/obj/item/seeds/plumpmycelium",
"/obj/item/seeds/libertymycelium",
"/obj/item/seeds/amanitamycelium",
+ "/obj/item/seeds/bananaseed",
"/obj/item/seeds/eggyseed")
cost = 15
containertype = /obj/crate/hydroponics
diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm
index 934ba8f60ad..b2acedf9986 100644
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -128,10 +128,10 @@
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
icon_state = "seeds"
- product_paths = "/obj/item/seeds/cornseed;/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/potatoseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/towermycelium;/obj/item/seeds/replicapod"
- product_amounts = "2;2;2;2;2;2;2;2;2;2;2;3"
+ 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"
+ product_amounts = "2;2;2;2;2;2;2;2;3;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/glowshroom;/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
+ 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"
/obj/machinery/vending/magivend
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 1a328bfc11f..e28fc2fbc5a 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1782,142 +1782,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
icon_state = "d20"
item_state = "dice"
-/obj/item/weapon/grown // Grown weapons
- name = "grown_weapon"
- icon = 'weapons.dmi'
- var/seed = ""
- var/plantname = ""
- var/productname = ""
- var/species = ""
- var/lifespan = 20
- var/endurance = 15
- var/maturation = 7
- var/production = 7
- var/yield = 2
- var/potency = -1
- var/plant_type = 0
- New()
- var/datum/reagents/R = new/datum/reagents(50)
- reagents = R
- R.my_atom = src
-
-/obj/item/weapon/grown/log
- desc = "This is a log grown from a tower cap mushroom."
- icon = 'harvest.dmi'
- name = "Tower Cap Log"
- icon_state = "logs"
- force = 5
- flags = TABLEPASS
- throwforce = 5
- w_class = 3.0
- throw_speed = 3
- throw_range = 3
- plant_type = 2
- origin_tech = "materials=1"
- seed = "/obj/item/seeds/towermycelium"
-
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/circular_saw))
- W.visible_message(" \red You make planks out of the [src]! ", 1)
- for(var/i=0,i<2,i++)
- new /obj/item/stack/sheet/wood (src.loc)
- del(src)
- return
-
-/obj/item/weapon/grown/nettle // -- Skie
- desc = "This is a nettle. It's probably not wise to touch it with bare hands..."
- icon = 'weapons.dmi'
- name = "Nettle"
- icon_state = "nettle"
- damtype = "fire"
- force = 15
- flags = TABLEPASS
- throwforce = 1
- w_class = 1.0
- throw_speed = 1
- throw_range = 3
- plant_type = 1
- origin_tech = "combat=1"
- seed = "/obj/item/seeds/nettleseed"
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("acid", round(potency, 1))
-
-/obj/item/weapon/grown/deathnettle // -- Skie
- desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!"
- icon = 'weapons.dmi'
- name = "Deathnettle"
- icon_state = "deathnettle"
- damtype = "fire"
- force = 30
- flags = TABLEPASS
- throwforce = 1
- w_class = 1.0
- throw_speed = 1
- throw_range = 3
- plant_type = 1
- seed = "/obj/item/seeds/deathnettleseed"
- origin_tech = "combat=3"
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("pacid", round(potency, 1))
-
-/obj/item/weapon/plantbgone // -- Skie
- desc = "Plant-B-Gone! Kill those pesky weeds!"
- icon = 'hydroponics.dmi'
- name = "Plant-B-Gone"
- icon_state = "plantbgone"
- item_state = "plantbgone"
- flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
- throwforce = 3
- w_class = 2.0
- throw_speed = 2
- throw_range = 10
- var/empty = 0
-
-/* Commented out due to being redundant. - Darem
-/obj/item/weapon/weedspray // -- Skie
- desc = "Toxic mixture in spray form to kill small weeds."
- icon = 'hydroponics.dmi'
- name = "Weed Spray"
- icon_state = "weedspray"
- item_state = "spray"
- flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
- throwforce = 4
- w_class = 2.0
- throw_speed = 2
- throw_range = 10
- var/toxicity = 4
- var/WeedKillStr = 2
-*/
-/obj/item/weapon/pestspray // -- Skie
- desc = "Pest eliminator spray! Do not inhale!"
- icon = 'hydroponics.dmi'
- name = "Pest Spray"
- icon_state = "pestspray"
- item_state = "spray"
- flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
- throwforce = 4
- w_class = 2.0
- throw_speed = 2
- throw_range = 10
- var/toxicity = 4
- var/PestKillStr = 2
-
-/obj/item/weapon/minihoe // -- Numbers
- name = "Mini hoe"
- desc = "Use for removing weeds or scratching your back."
- icon = 'weapons.dmi'
- icon_state = "hoe"
- item_state = "hoe"
- flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
- force = 5.0
- throwforce = 7.0
- w_class = 2.0
- m_amt = 50
-
/obj/item/weapon/plastique
name = "Plastic Explosives"
desc = "Used to put holes in specific areas without too much extra hole."
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index cef50a44c0e..993f446931a 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -45,7 +45,33 @@
synd_mind.special_role = "Syndicate"//So they actually have a special role/N
return 1
+////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////
+/datum/game_mode/nuclear/proc/update_all_synd_icons()
+ spawn(0)
+ for(var/datum/mind/synd_mind in syndicates)
+ if(synd_mind.current)
+ if(synd_mind.current.client)
+ for(var/image/I in synd_mind.current.client.images)
+ if(I.icon_state == "synd")
+ del(I)
+ for(var/datum/mind/synd_mind in syndicates)
+ if(synd_mind.current)
+ if(synd_mind.current.client)
+ for(var/datum/mind/synd_mind_1 in syndicates)
+ if(synd_mind_1.current)
+ var/I = image('mob.dmi', loc = synd_mind_1.current, icon_state = "synd")
+ synd_mind.current.client.images += I
+
+/datum/game_mode/nuclear/proc/update_synd_icons_added(datum/mind/synd_mind)
+ spawn(0)
+ if(synd_mind.current)
+ if(synd_mind.current.client)
+ var/I = image('mob.dmi', loc = synd_mind.current, icon_state = "synd")
+ synd_mind.current.client.images += I
+////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////
/datum/game_mode/nuclear/post_setup()
var/obj/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")
@@ -84,6 +110,7 @@
agent_number++
equip_syndicate(synd_mind.current)
+ update_synd_icons_added(synd_mind)
if(nuke_spawn)
var/obj/machinery/nuclearbomb/the_bomb = new /obj/machinery/nuclearbomb(nuke_spawn.loc)
diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index 33efa6a378d..8afa4a01c7c 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -336,7 +336,7 @@
src.equip_if_possible(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
- src.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/banana(src), slot_in_backpack)
+ src.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/stamp/clown(src), slot_in_backpack)
src.mutations |= 16
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index a6936ee0fdd..fb368e4878a 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -605,7 +605,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
user << "-Pest level: \blue [src.pestlevel]/10"
user << "-Toxicity level: \blue [src.toxic]/100"
user << "-Water level: \blue [src.waterlevel]/100"
- user << "-Nutrition level: \blue [src.nutrilevel]/100"
+ user << "-Nutrition level: \blue [src.nutrilevel]/10"
user << ""
else
user << "No plant found."
@@ -613,7 +613,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
user << "-Pest level: \blue [src.pestlevel]/10"
user << "-Toxicity level: \blue [src.toxic]/100"
user << "-Water level: \blue [src.waterlevel]/100"
- user << "-Nutrition level: \blue [src.nutrilevel]/100"
+ user << "-Nutrition level: \blue [src.nutrilevel]/10"
user << ""
else if (istype(O, /obj/item/weapon/plantbgone))
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index 3add60d7753..97e49f0b7a4 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -14,7 +14,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = "tomatojuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = "carrotjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
- /obj/item/weapon/reagent_containers/food/snacks/banana = "banana",
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = "banana",
/obj/item/weapon/reagent_containers/food/snacks/grown/potato = "potato",
)
@@ -157,13 +157,13 @@
new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/banana(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/banana(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/banana(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 69825e144af..2dd25d69c66 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -66,6 +66,10 @@ Deathnettle
..()
return
+// Sunflower
+/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
+ M << " [user] smacks you with a sunflower!FLOWER POWER"
+ user << " Your sunflower's FLOWER POWER strikes [M]"
// Nettle
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index 70b49fae1f1..fa539567f6f 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -26,26 +26,6 @@
// reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
// bitesize = 3 //This is the amount each bite consumes.
-/obj/item/weapon/reagent_containers/food/snacks/banana
- name = "Banana"
- desc = "A banana."
- icon = 'items.dmi'
- icon_state = "banana"
- item_state = "banana"
- On_Consume()
- if(!reagents.total_volume)
- var/mob/M = usr
- var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
- M << "\blue You peel the banana."
- M.put_in_hand(W)
- W.add_fingerprint(M)
- New()
- ..()
- reagents.add_reagent("banana", 5)
- bitesize = 5
- src.pixel_x = rand(-5.0, 5)
- src.pixel_y = rand(-5.0, 5)
-
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
desc = "Nougat love it or hate it."
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index e73c1103a33..05c07468bd8 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -11,7 +11,7 @@
/datum/recipe/bananaphone
reagents = list("psilocybin" = 5) //Trippin' balls, man.
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/banana,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
/obj/item/device/radio
)
result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
@@ -113,7 +113,7 @@
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/clothing/mask/gas/clown_hat,
- /* /obj/item/weapon/reagent_containers/food/snacks/banana, */
+ /* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */
)
result = /obj/item/weapon/reagent_containers/food/snacks/clownburger
@@ -213,7 +213,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/banana
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
@@ -337,7 +337,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/banana
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie
/*
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index a1645d9e1b0..b22f2281f73 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 11ebd5e6315..bda037ecb73 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 147cc635216..6b4461fd19a 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi
index e35d9c21b13..17780bd4b51 100644
Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ
diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi
index b2eb81ffbf8..2aa06c86a50 100644
Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ
diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index 2848a442e0b..bcbaefad103 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -7908,7 +7908,7 @@
"cWd" = (/obj/table/woodentable{dir = 1; icon_state = "woodentable"},/obj/item/clothing/shoes/clown_shoes,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cWe" = (/obj/table/woodentable{dir = 1; icon_state = "woodentable"},/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cWf" = (/obj/table/woodentable{dir = 5},/obj/item/clothing/mask/gas/clown_hat,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
-"cWg" = (/obj/item/weapon/reagent_containers/food/snacks/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
+"cWg" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cWh" = (/obj/table/woodentable{dir = 10; icon_state = "woodentable"},/obj/item/weapon/stamp/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cWi" = (/obj/table/woodentable,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cWj" = (/obj/table/woodentable{dir = 6},/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)