diff --git a/code/_onclick/hud/action/types/item.dm b/code/_onclick/hud/action/types/item.dm
index 6adec05d61..ff3c0ed38a 100644
--- a/code/_onclick/hud/action/types/item.dm
+++ b/code/_onclick/hud/action/types/item.dm
@@ -158,3 +158,17 @@
 
 /datum/action/item_action/toggle_mlembulance
 	name = "Toggle Mlembulance Mode"
+
+// YW Additions
+
+/datum/action/item_action/toggle_headphones
+	name = "Toggle Headphones"
+
+/datum/action/item_action/flip_aviation_goggles
+	name = "Flip Aviation Goggles"
+
+/datum/action/item_action/toggle_cloak_hood
+	name = "Toggle Cloak Hood"
+
+/datum/action/item_action/toggle_shield_gauntlet
+	name = "Toggle Shield Gauntlet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 52f34a4d6e..129c828fbf 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -106,7 +106,7 @@
 	closet_appearance = /decl/closet_appearance/secure_closet/lumber
 
 	starts_with = list(
-		/obj/item/radio/headset/headset_mine,
+		/obj/item/radio/headset/miner,
 		/obj/item/clothing/under/overalls,
 		/obj/item/clothing/gloves/light_brown,
 		/obj/item/clothing/gloves/black,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
index 3538f92de8..217b332be0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
@@ -45,7 +45,7 @@
 		/obj/item/clothing/under/rank/khi/sec/pilot,
 		/obj/item/clothing/gloves/fingerless,
 		/obj/item/cartridge/security,
-		/obj/item/radio/headset/headset_sec/alt,
+		/obj/item/radio/headset/alt/headset_sec,
 		/obj/item/storage/belt/security,
 		/obj/item/clothing/glasses/sunglasses/sechud,
 		/obj/item/storage/box/flare,
diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm
index 406f3837d0..aa0296ee86 100644
--- a/code/modules/admin/admin_verb_lists_vr.dm
+++ b/code/modules/admin/admin_verb_lists_vr.dm
@@ -129,7 +129,7 @@ var/list/admin_verbs_admin = list(
 	/client/proc/delbook,
 	/client/proc/toggle_spawning_with_recolour,
 	/client/proc/start_vote,
-	/client/proc/setckey, //YW add - readds SetCkey proc
+	/client/proc/setCKey, //YW add - readds SetCkey proc
 	/client/proc/dbcon_fix //YW add - adds Fix Database Connection proc
 	)
 
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 7c95bfc336..db4cbfdd8d 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -35,7 +35,7 @@
 	if(check_rights(R_ADMIN, 0))
 		sender_name = span_admin("[sender_name]")
 	for(var/client/C in GLOB.admins)
-		if(check_rights(R_ADMIN|R_MOD|, 0, C)) //VOREStation Edit //YW Edit, fix issue with C missing from check_rights, so all admins could see mchat
+		if(check_rights(R_ADMIN|R_MOD, 0, C)) //VOREStation Edit //YW Edit, fix issue with C missing from check_rights, so all admins could see mchat
 			to_chat(C, span_mod_channel(create_text_tag("mod", "MOD:", C) + " " + span_name("[sender_name]") + "([admin_jump_link(mob, C.holder)]): " + span_name("[msg]") ))
 
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/clothing/suits/aliens/teshari_yw.dm b/code/modules/clothing/suits/aliens/teshari_yw.dm
index 11bafc71ee..48d6758fe9 100644
--- a/code/modules/clothing/suits/aliens/teshari_yw.dm
+++ b/code/modules/clothing/suits/aliens/teshari_yw.dm
@@ -25,7 +25,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	flags_inv = HIDEHOLSTER|HIDETIE
 	//hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm
-	action_button_name = "Toggle Cloak Hood"
+	actions_types = list(/datum/action/item_action/toggle_cloak_hood)
 	hoodtype = /obj/item/clothing/head/tesh_hood
 	allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
 
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 2f98fdd5f2..5c45402b1f 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -717,8 +717,7 @@
 					/obj/item/circuitboard/sleeper,
 					/obj/item/circuitboard/dna_analyzer,
 					/obj/item/clothing/glasses/omnihud/eng = 6)
-	contraband = list(/obj/item/cell/potato = 3
-					//YW Removal:	/obj/item/rms = 5)
+	contraband = list(/obj/item/cell/potato = 3) // YW Removal RMS
 	premium = list(/obj/item/storage/belt/utility = 3)
 	product_records = list()
 	req_log_access = access_ce
diff --git a/code/modules/events/event_container_yw.dm b/code/modules/events/event_container_yw.dm
index 97e2278f4f..ec7a2fcfaa 100644
--- a/code/modules/events/event_container_yw.dm
+++ b/code/modules/events/event_container_yw.dm
@@ -109,7 +109,7 @@
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration",		/datum/event/carp_migration,		10,		list(ASSIGNMENT_SECURITY = 5), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach",	/datum/event/prison_break/station,	0,	list(ASSIGNMENT_ANY = 5), 1),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Jellyfish Migration",	/datum/event/jellyfish_migration,	5,	list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Virus Outbreak", 		/datum/event/viral_infection, 	0,		list(ASSIGNMENT_MEDICAL = 30), 2),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Disease Outbreak", 		/datum/event/disease_outbreak, 	0,		list(ASSIGNMENT_MEDICAL = 30), 2),
 	)
 	add_disabled_events(list(
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike",		/datum/event/meteor_strike,			10,		list(ASSIGNMENT_ENGINEER = 15), 1),
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 31a83169eb..d3d5aeb06b 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -269,7 +269,7 @@
 	cost = 1
 /datum/trait/positive/sonar/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
-	add_verb(H, /mob/living/carbon/human/proc/sonar_ping
+	add_verb(H, /mob/living/carbon/human/proc/sonar_ping)
 
 
 /datum/trait/positive/coldadapt
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_yw/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_yw/neutral.dm
index f9fda1ef08..39877b3991 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_yw/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_yw/neutral.dm
@@ -63,6 +63,6 @@
 
 /datum/trait/neutral/hydra_heads/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..()
-	add_verb(H, /mob/living/carbon/human/proc/hydra_activate
-	add_verb(H, /mob/living/carbon/human/proc/hydra_reset
+	add_verb(H, /mob/living/carbon/human/proc/hydra_activate)
+	add_verb(H, /mob/living/carbon/human/proc/hydra_reset)
 //End hydra
diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm
index f21d996991..1244b2a665 100644
--- a/code/modules/tgs/v5/chat_commands.dm
+++ b/code/modules/tgs/v5/chat_commands.dm
@@ -169,5 +169,5 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations)
 /datum/tgs_chat_command/readfax/Run(sender, params)
 	var/list/all_params = splittext(params, " ")
 	var/faxid = all_params[1]
-	var/faxmsg = return_file_text("[config.fax_export_dir]/fax_[faxid].html")
+	var/faxmsg = return_file_text("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html")
 	return "FAX: ```[strip_html_properly(faxmsg)]```"
diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm
index f17790a12f..8774c152a8 100644
--- a/code/modules/vehicles/Securitrain_vr.dm
+++ b/code/modules/vehicles/Securitrain_vr.dm
@@ -376,7 +376,7 @@
 	else
 		move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines)	//limits base overweight so you cant overspeed trains
 		move_delay *= (1 / max(1, active_engines)) * 2 										//overweight penalty (scaled by the number of engines)
-		move_delay += config.run_speed 														//base reference speed
+		move_delay += CONFIG_GET(number/run_speed)													//base reference speed
 		move_delay *= 1.1																	//makes cargo trains 10% slower than running when not overweight
 
 /obj/vehicle/train/security/trolley/update_car(var/train_length, var/active_engines)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index b8e1206dbf..b693ab960b 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -916,7 +916,7 @@
 	var/hoodtype = null //so the chaplain hoodie or other hoodies can override this
 	var/suittoggled = 0
 	var/hooded = 0
-	action_button_name = "Toggle Hood"
+	actions_types = list(/datum/action/item_action/toggle_cloak_hood)
 	icon = 'icons/vore/custom_clothes_yw.dmi'
 	icon_override = 'icons/vore/custom_onmob_yw.dmi'
 
@@ -1668,7 +1668,7 @@
 	icon_state = "avigoggles"
 	item_state = "avigoggles"
 	icon_override = 'icons/vore/custom_onmob_yw.dmi'
-	action_button_name = "Flip Aviation Goggles"
+	actions_types = list(/datum/action/item_action/flip_aviation_goggles)
 	item_flags = AIRTIGHT
 	var/up = 0
 
@@ -1712,7 +1712,7 @@
 	item_state = "kbraid_outfit"
 	body_parts_covered = UPPER_TORSO|ARMS|FEET
 	hoodtype = /obj/item/clothing/head/hood/kbraid_hood
-	action_button_name = "Toggle Headphones"
+	actions_types = list(/datum/action/item_action/toggle_headphones)
 
 /obj/item/clothing/head/hood/kbraid_hood
 	name = "Earphones"
diff --git a/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm b/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
index 5afa3f0548..79a36d7597 100644
--- a/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
+++ b/code/modules/yw-halo/weapons/covenant/shield_gauntlet.dm
@@ -11,7 +11,7 @@
 	icon = SHIELD_GAUNTLET_ICON
 	icon_state = "gauntlet"
 
-	action_button_name = "Toggle Shield Gauntlet"
+	actions_types = list(/datum/action/item_action/toggle_shield_gauntlet)
 
 	var/shield_max_charge = 380
 	var/shield_current_charge = 380
diff --git a/vorestation.dme b/vorestation.dme
index 96623d2104..335561163b 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2514,7 +2514,6 @@
 #include "code\modules\events\spontaneous_appendicitis.dm"
 #include "code\modules\events\spontaneous_appendicitis_vr.dm"
 #include "code\modules\events\supply_demand_vr.dm"
-#include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\wallrot.dm"
 #include "code\modules\examine\examine.dm"
 #include "code\modules\examine\stat_icons.dm"
@@ -3390,11 +3389,6 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\glamour\blaidd.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\glamour\ddraig.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\glamour\fluffball.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\glamour\homunculus.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\glamour\unicorn.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\clown.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm"