Revert "fixes various bugs and runtimes"

This reverts commit 9860480e91.

code/controllers/subsystem/job.dm

@@ -390,6 +390,7 @@ SUBSYSTEM_DEF(job)
 	var/datum/job/job = GetJob(rank)
 
 	H.job = rank
+	equip_loadout(N, H)
 
 	//If we joined at roundstart we should be positioned at our workstation
 	if(!joined_late)
@@ -410,17 +411,27 @@ SUBSYSTEM_DEF(job)
 		if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
 			log_world("Couldn't find a round start spawn point for [rank]")
 			SendToLateJoin(H)
-	
+
+
 	if(H.mind)
 		H.mind.assigned_role = rank
-	
+
+	if(job)
+		var/new_mob = job.equip(H, null, null, joined_late)
+		if(ismob(new_mob))
+			H = new_mob
+			if(!joined_late)
+				N.new_character = H
+			else
+				M = H
+
+		SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()
+
+	var/display_rank = rank
+	if(M.client && M.client.prefs && M.client.prefs.alt_titles_preferences[rank])
+		display_rank = M.client.prefs.alt_titles_preferences[rank]
+	to_chat(M, "<b>You are the [display_rank].</b>")
 	if(job)
-		equip_loadout(N, H, job, joined_late)	//Handles loadout and job equipping
-		
-		var/display_rank = rank
-		if(M.client && M.client.prefs && M.client.prefs.alt_titles_preferences[rank])
-			display_rank = M.client.prefs.alt_titles_preferences[rank]
-		to_chat(M, "<b>You are the [display_rank].</b>")
 		to_chat(M, "<b>As the [display_rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>")
 		to_chat(M, "<b>To speak on your departments radio, use the :h button. To see others, look closely at your headset.</b>")
 		if(job.req_admin_notify)
@@ -430,14 +441,16 @@ SUBSYSTEM_DEF(job)
 		if(CONFIG_GET(number/minimal_access_threshold))
 			to_chat(M, "<span class='notice'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></span>")
 
-		SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()
-	
 	if(ishuman(H))
 		var/mob/living/carbon/human/wageslave = H
 		to_chat(M, "<b><span class = 'big'>Your account ID is [wageslave.account_id]</span></b>")
 		to_chat(M, "<b><span class = 'notice'>You do not have a pin, can set your pin at a ATM.</b>")
 		H.add_memory("Your account ID is [wageslave.account_id].")
 
+	if(job && H)
+		job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
+		equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
+
 	return H
 
 

code/game/atoms.dm

@@ -36,7 +36,7 @@
 	var/buckle_message_cooldown = 0
 	var/fingerprintslast
 
-	var/list/filter_data = list() //For handling persistent filters
+	var/list/filter_data //For handling persistent filters
 
 	var/datum/component/orbiter/orbiters
 
@@ -861,15 +861,14 @@ Proc for attack log creation, because really why not
 		filters += filter(arglist(arguments))
 
 /atom/movable/proc/get_filter(name)
-	if(filter_data)
-		if(filter_data[name])	return filters[filter_data.Find(name)]
+	if(filter_data && filter_data[name])
+		return filters[filter_data.Find(name)]
 
 /atom/movable/proc/remove_filter(name)
-	if(filter_data)
-		if(filter_data[name])
-			filter_data -= name
-			update_filters()
-			return TRUE
+	if(filter_data[name])
+		filter_data -= name
+		update_filters()
+		return TRUE
 
 /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1)
 	. |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels)

code/modules/hydroponics/grown/peas.dm

@@ -31,11 +31,11 @@
 
 // Laughin' Peas
 /obj/item/seeds/peas/laugh
-	name = "pack of laughing peas"
-	desc = "These seeds give off a very soft purple glow.. they should grow into Laughing Peas."
+	name = "pack of laughin' peas"
+	desc = "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
 	icon_state = "seed-laughpeas"
 	species = "laughpeas"
-	plantname = "Laughing Peas"
+	plantname = "Laughin' Peas"
 	product = /obj/item/reagent_containers/food/snacks/grown/laugh
 	maturation = 7
 	potency = 10
@@ -53,7 +53,7 @@
 
 /obj/item/reagent_containers/food/snacks/grown/laugh
 	seed = /obj/item/seeds/peas/laugh
-	name = "pod of laughing peas"
+	name = "pod of laughin' peas"
 	desc = "Ridens Cicer, guaranteed to improve your mood dramatically upon consumption!"
 	icon_state = "laughpeas"
 	filling_color = "#ee7bee"

code/modules/hydroponics/seed_extractor.dm

@@ -167,7 +167,7 @@
 
 	for (var/obj/T in contents)//Now we find the seed we need to vend
 		var/obj/item/seeds/O = T
-		if (sanitize(O.plantname) == sanitize(href_list["name"]) && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"])
+		if (O.plantname == href_list["name"] && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"])
 			O.forceMove(drop_location())
 			break
 

code/modules/mob/mob.dm

@@ -260,7 +260,7 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 //This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the round starts and when events happen and such.
 //Also bypasses equip delay checks, since the mob isn't actually putting it on.
 /mob/proc/equip_to_slot_or_del(obj/item/W, slot)
-	return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, FALSE)
+	return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE)
 
 /mob/proc/equip_to_slot_or_store(obj/item/W, slot)
 	return equip_to_slot_if_possible(W, slot, FALSE, TRUE, FALSE, TRUE, TRUE)