diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index 3ee1169c3320..1ea000edcf09 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -293,3 +293,6 @@
 
 /obj/machinery/atmospherics/components/update_layer()
 	layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
+
+/obj/machinery/atmospherics/components/container_resist_act(mob/living/user)
+	INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, handle_ventcrawl), src)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 1ea4ef90c69a..6b692f8ba64c 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -582,6 +582,10 @@
 	if(!GLOB.current_anonymous_theme && player_client.prefs.read_preference(/datum/preference/name/cyborg) != DEFAULT_CYBORG_NAME)
 		apply_pref_name(/datum/preference/name/cyborg, player_client)
 
+	// monkestation edit start
+	TryConnectToAI() // needs to happen before the client is transfered to the mob
+	// monkestation edit end
+
 /**
  * Called after a successful roundstart spawn.
  * Client is not yet in the mob.
diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm
index 3c84ab55548c..2759c70b6847 100644
--- a/code/modules/jobs/job_types/cyborg.dm
+++ b/code/modules/jobs/job_types/cyborg.dm
@@ -52,7 +52,6 @@
 	spawned.gender = NEUTER
 	var/mob/living/silicon/robot/robot_spawn = spawned
 	robot_spawn.notify_ai(AI_NOTIFICATION_NEW_BORG)
-	robot_spawn.TryConnectToAI()
 	if(!robot_spawn.connected_ai) // Only log if there's no Master AI
 		robot_spawn.log_current_laws()
 	return TRUE
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index ce6e9d296ce8..6139ab8679c7 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -626,6 +626,8 @@ monkestation edit end */
 	key = "me"
 	key_third_person = "custom"
 	message = null
+	muzzle_ignore = TRUE // monkestation addition
+	stat_allowed = SOFT_CRIT // monkestation addition
 
 /datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional)
 	. = ..() && intentional
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index b7eec15d104d..4027d9b06cf8 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -216,3 +216,7 @@
 /obj/item/ammo_box/magazine/handle_atom_del(atom/A)
 	stored_ammo -= A
 	update_ammo_count()
+
+/obj/item/ammo_box/handle_atom_del(atom/A)
+	stored_ammo.Remove(A)
+	return ..()
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 134980255e35..fdfa715a9daa 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -718,6 +718,11 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
 	chamber_round()
 	update_appearance()
 
+/obj/item/gun/ballistic/handle_atom_del(atom/A)
+	if(istype(A, /obj/item/ammo_casing) && magazine)
+		magazine.handle_atom_del(A)
+	return ..()
+
 /obj/item/suppressor
 	name = "suppressor"
 	desc = "A syndicate small-arms suppressor for maximum espionage."
diff --git a/monkestation/code/modules/emotes/code/emote.dm b/monkestation/code/modules/emotes/code/emote.dm
index a1ce73574ea1..70720d522153 100644
--- a/monkestation/code/modules/emotes/code/emote.dm
+++ b/monkestation/code/modules/emotes/code/emote.dm
@@ -501,6 +501,7 @@
 /datum/emote/spin/speen
 	key = "speen"
 	key_third_person = "speens"
+	message = "speens!"
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
 	mob_type_allowed_typecache = /mob/living
 	mob_type_blacklist_typecache = list(/mob/living/brain)
diff --git a/monkestation/code/modules/security/code/weapons/lawbringer.dm b/monkestation/code/modules/security/code/weapons/lawbringer.dm
index b03842aa28df..035e88a2d1e7 100644
--- a/monkestation/code/modules/security/code/weapons/lawbringer.dm
+++ b/monkestation/code/modules/security/code/weapons/lawbringer.dm
@@ -154,6 +154,7 @@
 		owner_dna = null
 		update_id(user)
 		return TRUE
+	return ..()
 
 /obj/item/gun/energy/e_gun/lawbringer/attack_self(mob/living/user as mob)
 	if(!iscarbon(user))