diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index b42f221aaa5..85b26cfed8f 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -176,8 +176,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_or_collect(new /obj/item/clothing/glasses/hud/health/health_advanced, slot_glasses)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit)
-		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
 		H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda)
+
+		if(H.backbag == 1)
+			H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H), slot_l_hand)
+		else
+			H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H.back), slot_in_backpack)
+
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand)
 		else
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index d47424d3489..be567173078 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -241,7 +241,6 @@
 		sleep(2)
 		new /obj/item/weapon/storage/briefcase(src)
 		new	/obj/item/weapon/storage/firstaid/adv(src)
-		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/weapon/grenade/flashbang(src)
 		new /obj/item/device/flash(src)
diff --git a/code/modules/projectiles/guns/energy/blueshield.dm b/code/modules/projectiles/guns/energy/blueshield.dm
new file mode 100644
index 00000000000..1ba9e26eba1
--- /dev/null
+++ b/code/modules/projectiles/guns/energy/blueshield.dm
@@ -0,0 +1,37 @@
+/obj/item/weapon/gun/energy/blueshield
+	name = "advanced stun revolver"
+	desc = "An advanced stun revolver with the capacity to shoot both electrodes and lasers."
+	icon_state = "bsgun_stun"
+	item_state = "gun"
+	modifystate = "bsgun_stun"
+	force = 7
+	fire_sound = 'sound/weapons/gunshot.ogg'
+	charge_cost = 2000
+	projectile_type = "/obj/item/projectile/energy/electrode"
+	fire_delay = 15
+	var/fire_mode = 0 // 0 for taser, 1 for lethals.
+
+/obj/item/weapon/gun/energy/blueshield/attack_self(mob/living/user as mob)
+	if(!fire_mode)
+		fire_mode = 1
+		charge_cost = 1000
+		fire_delay = 0
+
+		fire_sound = 'sound/weapons/Laser.ogg'
+		projectile_type = "/obj/item/projectile/beam"
+		modifystate = "bsgun_kill"
+
+		user << "<span class = 'warning'>You adjust [src.name] to the kill setting.</span>"
+
+	else
+		fire_mode = 0
+		charge_cost = 2000
+		fire_delay = 15
+
+		projectile_type = "/obj/item/projectile/energy/electrode"
+		fire_sound = 'sound/weapons/gunshot.ogg'
+		modifystate = "bsgun_stun"
+
+		user << "<span class = 'info'>You adjust [src.name] to the stun setting.</span>"
+
+	update_icon()
\ No newline at end of file
diff --git a/html/changelogs/davetheheadcrab-PR-blueshitgun.yml b/html/changelogs/davetheheadcrab-PR-blueshitgun.yml
new file mode 100644
index 00000000000..1676cf75c99
--- /dev/null
+++ b/html/changelogs/davetheheadcrab-PR-blueshitgun.yml
@@ -0,0 +1,9 @@
+
+author: Dave The Headcrab
+
+delete-after: True
+
+changes: 
+  - rscadd: "Adds the advanced energy revolver, toggles between taser and laser modes."
+  - rscdel: "Removes the detective's revolver from the blueshield's locker."
+  - tweak: "Changes the taser the blueshield starts with into an advanced energy revolver."
\ No newline at end of file
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 0ceb1f7d7f0..d2eca5637a7 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/paradise.dme b/paradise.dme
index ef97cd9bf11..edd7c70ffd1 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1642,6 +1642,7 @@
 #include "code\modules\projectiles\guns\projectile.dm"
 #include "code\modules\projectiles\guns\syringe_gun.dm"
 #include "code\modules\projectiles\guns\energy\advtaser.dm"
+#include "code\modules\projectiles\guns\energy\blueshield.dm"
 #include "code\modules\projectiles\guns\energy\hos.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
 #include "code\modules\projectiles\guns\energy\nuclear.dm"