diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm
index 28267bf158..3679802733 100644
--- a/code/game/antagonist/station/renegade.dm
+++ b/code/game/antagonist/station/renegade.dm
@@ -24,19 +24,32 @@ var/datum/antagonist/renegade/renegades
 	initial_spawn_target = 6
 
 	var/list/spawn_guns = list(
-		/obj/item/weapon/gun/energy/gun,
 		/obj/item/weapon/gun/energy/laser,
-		/obj/item/weapon/gun/projectile,
-		/obj/item/weapon/gun/projectile/revolver/detective,
-		/obj/item/weapon/gun/projectile/automatic/c20r,
-		/obj/item/weapon/gun/projectile/deagle/camo,
-		/obj/item/weapon/gun/projectile/pistol,
-		/obj/item/weapon/silencer,
-		/obj/item/weapon/gun/projectile/shotgun/pump,
-		/obj/item/weapon/gun/projectile/shotgun/pump/combat,
+		/obj/item/weapon/gun/energy/captain,
+		/obj/item/weapon/gun/energy/lasercannon,
+		/obj/item/weapon/gun/energy/xray,
+		/obj/item/weapon/gun/energy/gun,
+		/obj/item/weapon/gun/energy/gun/burst,
+		/obj/item/weapon/gun/energy/gun/nuclear,
+		/obj/item/weapon/gun/energy/crossbow,
+		/obj/item/weapon/gun/energy/crossbow/largecrossbow,
 		/obj/item/weapon/gun/projectile/automatic,
 		/obj/item/weapon/gun/projectile/automatic/mini_uzi,
-		/obj/item/weapon/gun/energy/crossbow
+		/obj/item/weapon/gun/projectile/automatic/c20r,
+		/obj/item/weapon/gun/projectile/automatic/sts35,
+		/obj/item/weapon/gun/projectile/automatic/wt550,
+		/obj/item/weapon/gun/projectile/automatic/z8,
+		/obj/item/weapon/gun/projectile/colt/detective,
+		/obj/item/weapon/gun/projectile/sec/wood,
+		/obj/item/weapon/gun/projectile/silenced,
+		/obj/item/weapon/gun/projectile/pistol,
+		/obj/item/weapon/gun/projectile/revolver,
+		/obj/item/weapon/gun/projectile/shotgun/pump,
+		/obj/item/weapon/gun/projectile/shotgun/pump/combat,
+		/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
+		list(/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn),
+		list(/obj/item/weapon/gun/projectile/deagle, /obj/item/weapon/gun/projectile/deagle/gold, /obj/item/weapon/gun/projectile/deagle/camo),
+		list(/obj/item/weapon/gun/projectile/revolver/detective, /obj/item/weapon/gun/projectile/revolver/deckard)
 		)
 
 /datum/antagonist/renegade/New()
@@ -58,7 +71,19 @@ var/datum/antagonist/renegade/renegades
 		return
 
 	var/gun_type = pick(spawn_guns)
+	if(islist(gun_type))
+		gun_type = pick(gun_type)
 	var/obj/item/gun = new gun_type(get_turf(player))
+
+	// Attempt to put into a container.
+	if(player.equip_to_storage(gun))
+		return
+
+	// If that failed, attempt to put into any valid non-handslot
+	if(player.equip_to_appropriate_slot(gun))
+		return
+
+	// If that failed, then finally attempt to at least let the player carry the weapon
 	player.put_in_hands(gun)