Replaces the weed sprites, and removes the /goon folder. (tgstation#6…

…6136)

Replaces weed sprites, and removes the goon folder

.github/CODEOWNERS

@@ -109,7 +109,6 @@
 # JohnFulpWizard
 
 /code/modules/mob/living/simple_animal/bot/ @JohnFulpWillard
-/goon/ @JohnFulpWillard
 
 # Kapu1178
 

.github/CONTRIBUTING.md

@@ -156,7 +156,7 @@ You can see each tag and their GBP values [Here](https://github.com/tgstation/tg
 
 If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed.
 
-Regarding sprites & sounds, you must credit the artist and possibly the codebase. All /tg/station assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. However if you are porting assets from GoonStation or usually any assets under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/) are to go into the 'goon' folder of the /tg/station codebase.
+Regarding sprites & sounds, you must credit the artist and possibly the codebase. All /tg/station assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
 
 ## Banned content
 Do not add any of the following in a Pull Request or risk getting the PR closed:

code/game/objects/effects/spawners/random/contraband.dm

@@ -74,8 +74,7 @@
 
 /obj/effect/spawner/random/contraband/cannabis
 	name = "Random Cannabis Spawner" //blasphemously overpowered, use extremely sparingly (if at all)
-	icon = 'goon/icons/obj/hydroponics.dmi'
-	icon_state = "cannabis_spawner"
+	icon_state = "cannabis"
 	loot = list(
 		/obj/item/food/grown/cannabis = 25,
 		/obj/item/food/grown/cannabis/white = 25,

code/modules/hydroponics/grown/cannabis.dm

@@ -10,7 +10,7 @@
 	potency = 20
 	growthstages = 1
 	instability = 40
-	growing_icon = 'goon/icons/obj/hydroponics.dmi'
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
 	icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "cannabis-dead" // Same for the dead icon
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
@@ -25,6 +25,7 @@
 	name = "pack of rainbow weed seeds"
 	desc = "These seeds grow into rainbow weed. Groovy... and also highly addictive."
 	icon_state = "seed-megacannabis"
+	icon_grow = "megacannabis-grow"
 	species = "megacannabis"
 	plantname = "Rainbow Weed"
 	product = /obj/item/food/grown/cannabis/rainbow
@@ -36,6 +37,7 @@
 	name = "pack of deathweed seeds"
 	desc = "These seeds grow into deathweed. Not groovy."
 	icon_state = "seed-blackcannabis"
+	icon_grow = "blackcannabis-grow"
 	species = "blackcannabis"
 	plantname = "Deathweed"
 	product = /obj/item/food/grown/cannabis/death
@@ -47,6 +49,7 @@
 	name = "pack of lifeweed seeds"
 	desc = "I will give unto him that is munchies of the fountain of the cravings of life, freely."
 	icon_state = "seed-whitecannabis"
+	icon_grow = "whitecannabis-grow"
 	species = "whitecannabis"
 	plantname = "Lifeweed"
 	instability = 30
@@ -60,6 +63,7 @@
 	name = "pack of omega weed seeds"
 	desc = "These seeds grow into omega weed."
 	icon_state = "seed-ocannabis"
+	icon_grow = "ocannabis-grow"
 	species = "ocannabis"
 	plantname = "Omega Weed"
 	product = /obj/item/food/grown/cannabis/ultimate
@@ -83,7 +87,7 @@
 
 /obj/item/food/grown/cannabis
 	seed = /obj/item/seeds/cannabis
-	icon = 'goon/icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/harvest.dmi'
 	name = "cannabis leaf"
 	desc = "Recently legalized in most galaxies."
 	icon_state = "cannabis"

code/modules/unit_tests/plantgrowth_tests.dm

@@ -8,7 +8,6 @@
 	states |= icon_states('icons/obj/hydroponics/growing_flowers.dmi')
 	states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi')
 	states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi')
-	states |= icon_states('goon/icons/obj/hydroponics.dmi')
 	var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland
 
 	for(var/seedpath in paths)