diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index c3d5fc3c51f..61d2ba77379 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -84,9 +84,9 @@
 		var/obj/item/gun/G = get_active_held_item()
 		if(G.has_gun_safety)
 			if(combat_mode)
-				G.toggle_safety(src, FALSE)
+				G.toggle_safety(src, "off")
 			else
-				G.toggle_safety(src, TRUE)
+				G.toggle_safety(src, "on")
 	if(!ishuman(src))
 		if(combat_mode)
 			set_combat_indicator(TRUE)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 363e6d88201..3a43108472f 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -1,3 +1,4 @@
+/* SKYRAT EDIT REMOVAL
 /datum/emote/silicon
 	mob_type_allowed_typecache = list(/mob/living/silicon)
 	emote_type = EMOTE_AUDIBLE
@@ -56,3 +57,4 @@
 	message = "blares an alarm!"
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/warning-buzzer.ogg'
+*/
diff --git a/modular_skyrat/modules/emotes/code/silicon_emotes.dm b/modular_skyrat/modules/emotes/code/silicon_emotes.dm
index 4d6437ce7ac..5455ff23301 100644
--- a/modular_skyrat/modules/emotes/code/silicon_emotes.dm
+++ b/modular_skyrat/modules/emotes/code/silicon_emotes.dm
@@ -1,18 +1,58 @@
-/datum/emote/silicon/dwoop
-	key = "dwoop"
-	key_third_person = "dwoops"
-	message = "chirps happily!"
-	vary = TRUE
-	sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg'
+/datum/emote/silicon
+	mob_type_allowed_typecache = list(/mob/living/silicon)
+	emote_type = EMOTE_AUDIBLE
 
-/datum/emote/silicon/yes
-	key = "yes"
-	message = "emits an affirmative blip."
-	vary = TRUE
-	sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_yes.ogg'
+/datum/emote/silicon/boops
+	key = "boops"
+	key_third_person = "boops"
+	message = "boops."
 
-/datum/emote/silicon/no
-	key = "no"
-	message = "emits a negative blip."
+/datum/emote/silicon/buzzes
+	key = "buzzes"
+	key_third_person = "buzzes"
+	message = "buzzes."
+	message_param = "buzzes at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/buzz-sigh.ogg'
+
+
+/datum/emote/silicon/buzzes2
+	key = "buzzes2"
+	message = "buzzes twice."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/buzz-two.ogg'
+
+/datum/emote/silicon/chimes
+	key = "chimes"
+	key_third_person = "chimes"
+	message = "chimes."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/chime.ogg'
+
+/datum/emote/silicon/honks
+	key = "honks"
+	key_third_person = "honks"
+	message = "honks."
+	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
-	sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_no.ogg'
+	sound = 'sound/items/bikehorn.ogg'
+
+/datum/emote/silicon/pings
+	key = "pings"
+	key_third_person = "pings"
+	message = "pings."
+	message_param = "pings at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/ping.ogg'
+
+/datum/emote/silicon/sads
+	key = "sads"
+	message = "plays a sad trombone..."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/misc/sadtrombone.ogg'
+
+/datum/emote/silicon/warns
+	key = "warns"
+	message = "blares an alarm!"
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/warning-buzzer.ogg'
diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm
index 7359169b32d..6abedde1c8e 100644
--- a/modular_skyrat/modules/emotes/code/synth_emotes.dm
+++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm
@@ -1,8 +1,34 @@
+/datum/emote/living/dwoop
+	key = "dwoop"
+	key_third_person = "dwoops"
+	message = "chirps happily!"
+	vary = TRUE
+	sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
+
+/datum/emote/living/yes
+	key = "yes"
+	message = "emits an affirmative blip."
+	vary = TRUE
+	sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_yes.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
+
+/datum/emote/living/no
+	key = "no"
+	message = "emits a negative blip."
+	vary = TRUE
+	sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_no.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
+
 /datum/emote/living/boop
 	key = "boop"
 	key_third_person = "boops"
 	message = "boops."
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/buzz
 	key = "buzz"
@@ -12,14 +38,16 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/buzz-sigh.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
-/datum/emote/living/beeps
-	key = "beeps"
+/datum/emote/living/beep
+	key = "beep"
 	key_third_person = "beeps"
 	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
 	sound = 'modular_skyrat/modules/emotes/sound/emotes/twobeep.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 
 /datum/emote/living/buzz2
@@ -28,6 +56,7 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/buzz-two.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/chime
 	key = "chime"
@@ -36,6 +65,7 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/chime.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/honk
 	key = "honk"
@@ -45,6 +75,7 @@
 	vary = TRUE
 	sound = 'sound/items/bikehorn.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/ping
 	key = "ping"
@@ -54,6 +85,7 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/ping.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/sad
 	key = "sad"
@@ -61,6 +93,7 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/misc/sadtrombone.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
+	cooldown = 2 SECONDS
 
 /datum/emote/living/warn
 	key = "warn"
@@ -68,4 +101,4 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/warning-buzzer.ogg'
 	mob_type_allowed_typecache = list(/mob/living/carbon/human/species/synth, /mob/living/carbon/human/species/synthliz, /mob/living/carbon/human/species/ipc)
-
+	cooldown = 2 SECONDS
diff --git a/modular_skyrat/modules/gunsafety/code/gun_safety.dm b/modular_skyrat/modules/gunsafety/code/gun_safety.dm
index 868070690bf..4cc43510099 100644
--- a/modular_skyrat/modules/gunsafety/code/gun_safety.dm
+++ b/modular_skyrat/modules/gunsafety/code/gun_safety.dm
@@ -30,7 +30,10 @@
 	if(!has_gun_safety)
 		return
 	if(override)
-		safety = override
+		if(override == "off")
+			safety = FALSE
+		else
+			safety = TRUE
 	else
 		safety = !safety
 	tsafety.button_icon_state = "safety_[safety ? "on" : "off"]"
diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
index d668b861439..879136b03fc 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
@@ -23,10 +23,10 @@
 	contains = list(/obj/item/storage/box/armament_tokens_primary)
 	crate_name = "primary armory token crate"
 
-/datum/supply_pack/security/primary_case
+/datum/supply_pack/security/energy_case
 	name = "Energy Armory Token Crate"
 	desc = "Contains a box of energy armory tokens for the Armadyne weapons vendor."
 	cost = CARGO_CRATE_VALUE * 15
 	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/storage/box/armament_tokens_primary)
-	crate_name = "primary armory token crate"
+	contains = list(/obj/item/storage/box/armament_tokens_energy)
+	crate_name = "energy armory token crate"