Addressing some comments on beewrite PR.

Author: MistakeNot4892

code/__defines/misc.dm

@@ -407,3 +407,4 @@
 // In theory, one pollen every 5 seconds (at time of writing)
 #define POLLEN_PER_SECOND 0.2
 #define POLLEN_PRODUCTION_MULT (POLLEN_PER_SECOND * (SSplants.wait / 10))
+#define MAX_POLLEN_PER_FLOWER = 10

code/game/objects/structures/flora/plant.dm

@@ -7,7 +7,7 @@
 	var/dead = FALSE
 	var/sampled = FALSE
 	var/datum/seed/plant
-	var/harvestable = 0
+	var/harvestable = 0 // Note that this is a counter, not a bool.
 	var/pollen = 0
 
 /obj/structure/flora/plant/large
@@ -17,7 +17,7 @@
 /obj/structure/flora/plant/Process()
 	if(plant?.produces_pollen <= 0)
 		return PROCESS_KILL
-	if(pollen < 10)
+	if(pollen < MAX_POLLEN_PER_FLOWER)
 		pollen += plant.produces_pollen * POLLEN_PRODUCTION_MULT
 
 /* Notes for future work moving logic off hydrotrays onto plants themselves:
@@ -164,6 +164,7 @@
 	icon_state = "flower5"
 	is_spawnable_type = TRUE
 
+// Only contains roundstart plants, this is meant to be a mapping helper.
 /obj/structure/flora/plant/random_flower/proc/get_flower_variants()
 	var/static/list/flower_variants
 	if(isnull(flower_variants))

code/modules/client/preference_setup/occupation/occupation.dm

@@ -185,7 +185,7 @@
 					skill_link = "<a href='byond://?src=\ref[src];set_skills=[title]'>View Skills</a>"
 				skill_link = "<td>[skill_link]</td>"
 
-				if(!user.skillset?.skills_transferable)
+				if(!user.skillset.skills_transferable)
 					skill_link = ""
 
 				// Begin assembling the actual HTML.

code/modules/hydroponics/trays/tray_process.dm

@@ -65,7 +65,7 @@
 			mutate((rand(100) < 15) ? 2 : 1)
 			mutation_level = 0
 
-	if(pollen < 10)
+	if(pollen < MAX_POLLEN_PER_FLOWER)
 		pollen += seed?.produces_pollen * POLLEN_PRODUCTION_MULT
 
 	// Maintain tray nutrient and water levels.

mods/content/beekeeping/hives/hive_swarm.dm

@@ -18,8 +18,6 @@
 	var/swarm_agitation = 0
 	/// Percentage value; if it drops to 0, the swarm will be destroyed.
 	var/swarm_intensity = 1
-	/// if more states are added to swarm.dmi, increase this
-	var/const/MAX_SWARM_STATE = 6
 	/// Cooldown timer for next tick.
 	VAR_PRIVATE/next_work = 0
 	/// Time that smoke will wear off.
@@ -46,8 +44,7 @@
 	if(!istype(owner))
 		PRINT_STACK_TRACE("Insect swarm created with invalid hive: '[owner]'")
 		return INITIALIZE_HINT_QDEL
-	color = insect_type.swarm_color
-	icon  = insect_type.swarm_icon
+	update_transform()
 	update_swarm()
 	LAZYDISTINCTADD(owner.swarms, src)
 	START_PROCESSING(SSobj, src)
@@ -61,9 +58,29 @@
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 
+// Resolves the current swarm amount to a coarser value used for icon state selection.
+/obj/effect/insect_swarm/proc/get_swarm_state()
+	return ceil((swarm_intensity / insect_type.max_swarm_intensity) * insect_type.max_swarm_state)
+
+/obj/effect/insect_swarm/on_update_icon()
+	. = ..()
+	color = insect_type.swarm_color
+	icon  = insect_type.swarm_icon
+	icon_state = num2text(get_swarm_state())
+	if(is_smoked())
+		icon_state = "[icon_state]_smoked"
+
+/obj/effect/insect_swarm/update_transform()
+	. = ..()
+	// Some icon variation via transform.
+	if(prob(75))
+		var/matrix/swarm_transform = transform || matrix()
+		swarm_transform.Turn(pick(90, 180, 270))
+		transform = swarm_transform
+
 /obj/effect/insect_swarm/proc/update_swarm()
-	icon_state = num2text(ceil((swarm_intensity / insect_type.max_swarm_intensity) * MAX_SWARM_STATE))
-	if(icon_state == "1")
+	update_icon()
+	if(get_swarm_state() == 1)
 		SetName(insect_type.name_singular)
 		desc = insect_type.insect_desc
 		gender = NEUTER
@@ -72,11 +89,6 @@
 		desc = insect_type.swarm_desc
 		gender = PLURAL
 
-	// Some icon variation via transform.
-	if(prob(75))
-		var/matrix/swarm_transform = matrix()
-		swarm_transform.Turn(pick(90, 180, 270))
-
 /obj/effect/insect_swarm/proc/is_agitated()
 	return QDELETED(owner) || (swarm_agitation > 0 && !is_smoked())
 
@@ -349,10 +361,10 @@
 	else
 		start_automove(owner.holder)
 
-// TODO: update icon (twitching on ground?)
-// TODO: lower agitation
 /obj/effect/insect_swarm/proc/was_smoked(smoke_time = 10 SECONDS)
 	smoked_until = max(smoked_until, world.time + smoke_time)
+	swarm_agitation = round(swarm_agitation * 0.75)
+	addtimer(CALLBACK(src, PROC_REF(update_icon), TRUE), smoke_time, (TIMER_UNIQUE|TIMER_OVERRIDE))
 
 /obj/effect/insect_swarm/proc/is_smoked()
 	return world.time < smoked_until

mods/content/beekeeping/hives/insect_species/_insects.dm

@@ -22,6 +22,7 @@
 	var/swarm_type  = /obj/effect/insect_swarm
 	var/max_swarm_growth_intensity = 50
 	var/max_swarm_intensity = 100
+	var/max_swarm_state = 6
 
 	// Venom delivered by swarms whens stinging a victim.
 	var/sting_reagent
@@ -72,6 +73,17 @@
 		if(!istype(produce_material, /decl/material))
 			. += "non-material product material type: '[produce_material]'"
 
+	if(!swarm_icon)
+		. += "null swarm icon"
+	else
+		for(var/i = 0 to max_swarm_state)
+			var/check_state = num2text(i)
+			if(!check_state_in_icon(check_state, swarm_icon))
+				. += "missing active icon_state '[check_state]'"
+			check_state = "[check_state]_smoked"
+			if(!check_state_in_icon(check_state, swarm_icon))
+				. += "missing smoked icon_state '[check_state]'"
+
 /decl/insect_species/proc/fill_hive_frame(obj/item/frame)
 
 	if(!istype(frame) || QDELETED(frame))