diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index b3126fd3cd..0ff30453f2 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -2427,7 +2427,8 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/deepstorage/power)
 "fo" = (
-/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/suit_storage_unit/mining/eva,
+/obj/item/tank/jetpack/oxygen,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/deepstorage/power)
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 17315683d5..9f3e6b4db0 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -57,11 +57,11 @@
 #define DNA_HAIR_STYLE_BLOCK		7
 #define DNA_COLOR_ONE_BLOCK			8
 #define DNA_COLOR_TWO_BLOCK			9
-#define DNA_COLOR_THREE_BLOCK			10
+#define DNA_COLOR_THREE_BLOCK		10
 #define DNA_MUTANTTAIL_BLOCK		11
-#define DNA_MUTANTEAR_BLOCK		12
-#define DNA_MUTANTMARKING_BLOCK	13
-#define DNA_TAUR_BLOCK 14
+#define DNA_MUTANTEAR_BLOCK			12
+#define DNA_MUTANTMARKING_BLOCK		13
+#define DNA_TAUR_BLOCK 				14
 
 #define DNA_STRUC_ENZYMES_BLOCKS	18
 #define DNA_UNIQUE_ENZYMES_LEN		32
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index f2bb718be9..540803848d 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -757,6 +757,9 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 			to_chat(src, "<span class='danger'>Your previous click was ignored because you've done too many in a second</span>")
 			return
 
+	if(ab) //Citadel edit, things with stuff.
+		return
+
 	if (prefs.hotkeys)
 		// If hotkey mode is enabled, then clicking the map will automatically
 		// unfocus the text bar. This removes the red color from the text bar
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 4c23279a9a..181a692831 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -205,7 +205,7 @@
 		var/old_eye_blurry = eye_blurry
 		eye_blurry = max(amount, eye_blurry)
 		if(!old_eye_blurry)
-			add_eyeblur()
+			add_eyeblur() //Citadel edit blurry eye memes entailed. syncs beware
 
 /mob/proc/adjust_blurriness(amount)
 	var/old_eye_blurry = eye_blurry
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 509d33faa0..f4ca82b4e6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -69,7 +69,7 @@
 /obj/item/projectile/beam/disabler
 	name = "disabler beam"
 	icon_state = "omnilaser"
-	damage = 36
+	damage = 24 // Citadel change for balance from 36
 	damage_type = STAMINA
 	flag = "energy"
 	hitsound = 'sound/weapons/tap.ogg'
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index edec0daa17..92e7e9f789 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -223,7 +223,7 @@
 	list_reagents = list("chloralhydrate" = 50)
 
 /obj/item/reagent_containers/syringe/lethal/execution
-	list_reagents = list("plasma" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10)
+	list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10) //Citadel edit, changing out plasma from lethals
 
 /obj/item/reagent_containers/syringe/mulligan
 	name = "Mulligan"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 0c7b7327fa..908de02f3a 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -148,7 +148,7 @@
 	materials = list(MAT_METAL = 3000)
 	build_path = /obj/item/grenade/chem_grenade/large
 	category = list("Weapons")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE //Citadel edit added to science
 
 /datum/design/pyro_grenade
 	name = "Pyro Grenade"
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 38967711fe..6d1aebc6a3 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -106,7 +106,7 @@
 	..()
 	if(crit_fail)
 		return
-
+	owner.adjustStaminaLoss(-3.5) //Citadel edit, makes it more useful in Stamina based combat
 	if(owner.AmountStun() > STUN_SET_AMOUNT)
 		owner.SetStun(STUN_SET_AMOUNT)
 	if(owner.AmountKnockdown() > STUN_SET_AMOUNT)
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 1804a28c0e..77450b6ac3 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ