diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 9beb08adc22..35ff79cac16 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -696,15 +696,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Weapons crate"
 	contains = list(/obj/item/weapon/melee/baton,
 					/obj/item/weapon/melee/baton,
-					/obj/item/weapon/gun/energy/laser,
-					/obj/item/weapon/gun/energy/laser,
+					/obj/item/weapon/gun/energy/gun,
+					/obj/item/weapon/gun/energy/gun,
 					/obj/item/weapon/gun/energy/taser,
 					/obj/item/weapon/gun/energy/taser,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/weapon/storage/box/flashbangs,
 					/obj/item/weapon/storage/box/flashbangs)
-	cost = 30
+	cost = 40
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Weapons crate"
 	access = access_security
@@ -777,7 +777,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Energy weapons crate"
 	contains = list(/obj/item/weapon/gun/energy/laser,
 					/obj/item/weapon/gun/energy/laser,
-					/obj/item/weapon/gun/energy/gun)
+					/obj/item/weapon/gun/energy/laser)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure
 	containername = "energy weapons crate"
@@ -789,9 +789,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	contains = list(/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/weapon/storage/box/shotgunammo,
-					/obj/item/weapon/gun/projectile/shotgun/pump,
+					/obj/item/weapon/storage/box/shotgunshells,
+					/obj/item/weapon/gun/projectile/shotgun/pump/combat,
 					/obj/item/weapon/gun/projectile/shotgun/pump/combat)
-	cost = 50
+	cost = 65
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Shotgun crate"
 	access = access_armory
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index d9a12efa6cc..7508d34a948 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -177,8 +177,8 @@
 	icon_state = "energykill100"
 	item_to_spawn()
 		return pick(prob(2);/obj/item/weapon/gun/energy/laser,\
-					prob(1);/obj/item/weapon/gun/energy/gun,\
-					prob(2);/obj/item/weapon/gun/energy/stunrevolver)
+					prob(2);/obj/item/weapon/gun/energy/gun,\
+					prob(1);/obj/item/weapon/gun/energy/stunrevolver)
 
 /obj/random/projectile
 	name = "Random Projectile Weapon"
@@ -206,15 +206,15 @@
 	icon = 'icons/obj/ammo.dmi'
 	icon_state = "45-10"
 	item_to_spawn()
-		return pick(prob(3);/obj/item/weapon/storage/box/beanbags,\
-					prob(1);/obj/item/weapon/storage/box/shotgunammo,\
-					prob(2);/obj/item/weapon/storage/box/shotgunshells,\
-					prob(2);/obj/item/weapon/storage/box/stunshells,\
-					prob(1);/obj/item/ammo_magazine/c45m,\
-					prob(2);/obj/item/ammo_magazine/c45m/rubber,\
-					prob(2);/obj/item/ammo_magazine/c45m/flash,\
-					prob(1);/obj/item/ammo_magazine/mc9mmt,\
-					prob(3);/obj/item/ammo_magazine/mc9mmt/rubber)
+		return pick(prob(6);/obj/item/weapon/storage/box/beanbags,\
+					prob(2);/obj/item/weapon/storage/box/shotgunammo,\
+					prob(4);/obj/item/weapon/storage/box/shotgunshells,\
+					prob(1);/obj/item/weapon/storage/box/stunshells,\
+					prob(2);/obj/item/ammo_magazine/c45m,\
+					prob(4);/obj/item/ammo_magazine/c45m/rubber,\
+					prob(4);/obj/item/ammo_magazine/c45m/flash,\
+					prob(2);/obj/item/ammo_magazine/mc9mmt,\
+					prob(6);/obj/item/ammo_magazine/mc9mmt/rubber)
 
 
 /obj/random/action_figure