Merge pull request #15693 from TripleShades/code-fixes

Fixes some minor bits of code

code/modules/admin/admin_verbs.dm

@@ -69,6 +69,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
 	/client/proc/cmd_admin_man_up, //CIT CHANGE - adds man up verb
 	/client/proc/cmd_admin_man_up_global, //CIT CHANGE - ditto
 	/client/proc/cmd_admin_create_centcom_report,
+	/client/proc/cmd_admin_make_priority_announcement, //CIT CHANGE
 	/client/proc/cmd_change_command_name,
 	/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
 	/client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud

code/modules/hydroponics/grown/cannabis.dm

@@ -11,8 +11,8 @@
 	growthstages = 1
 	instability = 40
 	growing_icon = 'goon/icons/obj/hydroponics.dmi'
-	icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes
-	icon_dead = "cannabis-dead" // Same for the dead icon
+	icon_grow = "cannabis-grow"
+	icon_dead = "cannabis-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cannabis/rainbow,
 						/obj/item/seeds/cannabis/death)
@@ -26,6 +26,8 @@
 	species = "megacannabis"
 	plantname = "Rainbow Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
+	icon_grow = "megacannabis-grow"
+	icon_dead = "megacannabis-dead"
 	mutatelist = list(/obj/item/seeds/cannabis/ultimate)
 	reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/toxin/lipolicide = 0.35)
 	rarity = 40
@@ -37,6 +39,8 @@
 	species = "blackcannabis"
 	plantname = "Deathweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
+	icon_grow = "blackcannabis-grow"
+	icon_dead = "blackcannabis-dead"
 	mutatelist = list(/obj/item/seeds/cannabis/white)
 	reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
@@ -48,6 +52,8 @@
 	species = "whitecannabis"
 	plantname = "Lifeweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
+	icon_grow = "whitecannabis-grow"
+	icon_dead = "whitecannabis-dead"
 	mutatelist = list()
 	reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
@@ -60,6 +66,8 @@
 	species = "ocannabis"
 	plantname = "Omega Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
+	icon_grow = "ocannabis-grow"
+	icon_dead = "ocannabis-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green)
 	mutatelist = list()
 	reagents_add = list(/datum/reagent/drug/space_drugs = 0.3,