diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 3e7ae72810a..c031290d947 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -68,6 +68,7 @@ var/list/engineering_positions = list(
 	"Chief Engineer",
 	"Station Engineer",
 	"Atmospheric Technician",
+	"Janitor",
 	"Engineering Apprentice"
 )
 
@@ -104,7 +105,6 @@ var/list/civilian_positions = list(
 	"Bartender",
 	"Gardener",
 	"Chef",
-	"Janitor",
 	"Librarian",
 	"Chaplain",
 	"Assistant"
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index a76310135f4..4da36a71977 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -676,8 +676,6 @@
 		/obj/item/clothing/under/syndicate/tracksuit = 0.2,
 		/obj/item/clothing/under/rank/clown = 0.1,
 		/obj/item/clothing/under/mime = 0.1,
-		/obj/item/clothing/accessory/badge = 0.2,
-		/obj/item/clothing/accessory/badge/old = 0.2,
 		/obj/item/clothing/accessory/storage/webbing = 0.6,
 		/obj/item/clothing/accessory/storage/knifeharness = 0.3,
 		/obj/item/clothing/head/collectable/petehat = 0.1,
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index e25bcdad2ae..e5ce44fe9e2 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -1161,6 +1161,8 @@ var/list/global/random_stock_large = list(
 			allsigns -= typesof(/obj/structure/sign/poster)
 			allsigns -= /obj/structure/sign/directions
 			allsigns -= typesof(/obj/structure/sign/christmas)
+			allsigns -= typesof(/obj/structure/sign/flag)
+
 			var/number = rand(1,5)
 
 			while (number > 0)
diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm
index 5fb8bb3d957..352790aee68 100644
--- a/code/modules/clothing/rings/rings.dm
+++ b/code/modules/clothing/rings/rings.dm
@@ -59,10 +59,10 @@
 
 /obj/item/clothing/ring/seal/signet/attack_self(mob/user)
 	if(nameset)
-		to_chat(user, "<span class='notice'>The [src] has already been claimed!</span>")
+		to_chat(user, "<span class='notice'>\The [src] has already been claimed!</span>")
 		return
 
-	to_chat(user, "<span class='notice'>You claim the [src] as your own!</span>")
+	to_chat(user, "<span class='notice'>You claim \the [src] as your own!</span>")
 	change_name(user)
 	nameset = 1
 
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index c77650fabe0..c08fb14a7a0 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -215,7 +215,7 @@
 		oxyloss = 0
 	else
 		amount = amount*species.oxy_mod
-		if(getOxyLoss() + amount >=  config.health_threshold_crit) //start taking brain damage if they go into crit from oxyloss
+		if(getOxyLoss() + amount >=  abs(config.health_threshold_crit)) //start taking brain damage if they go into crit from oxyloss
 			adjustBrainLoss(amount,55) //this brain damage won't be lethal)
 		..(amount)
 
diff --git a/icons/mob/human_face/facial_hair.dmi b/icons/mob/human_face/facial_hair.dmi
index 7e0028a0c91..fd1fa7a55c0 100644
Binary files a/icons/mob/human_face/facial_hair.dmi and b/icons/mob/human_face/facial_hair.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index fce54b7c143..4495332fb43 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ