diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm
new file mode 100644
index 0000000000..745824624b
--- /dev/null
+++ b/code/citadel/cit_guns.dm
@@ -0,0 +1,25 @@
+/obj/item/weapon/gun/energy/laser/carbine
+	name = "laser carbine"
+	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun."
+	icon_state = "lasernew"
+	item_state = "laser"
+	origin_tech = "combat=4;magnets=4"
+	force = 10
+	throwforce = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
+	cell_type = /obj/item/weapon/stock_parts/cell/lascarbine
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/weapon/stock_parts/cell/lascarbine
+	name = "laser carbine power supply"
+	maxcharge = 2500
+
+/datum/design/lasercarbine
+	name = "Laser Carbine"
+	desc = "Beefed up version of a standard laser gun."
+	id = "lasercarbine"
+	req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000)
+	build_path = /obj/item/weapon/gun/energy/laser/carbine
+	category = list("Weapons")
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 48d50750a5..4e42efa6af 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -100,6 +100,7 @@
 	options["Black Panther"] = "detective_panther"
 	options["Gold Trim"] = "detective_gold"
 	options["The Peacemaker"] = "detective_peacemaker"
+	options["The Spacemaker"] = "detective_future"
 	options["Cancel"] = null
 
 /obj/item/weapon/gun/ballistic/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index a16797fa17..35d8b36159 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 1baca493c2..b4a4a56719 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 40fd874a62..3b8b8365bb 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 811c95536a..6a96e0b326 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 3f473e684f..62f07406c5 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi
index c694d6789f..74053b6cdc 100644
Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index 7f5f05e3af..62a767007b 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index 0a2edd5dbe..5fab4aa9c3 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 4fefb18a9b..bb38c78117 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 4e6c7b0877..075f2dfc9d 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/robotics.dmi b/icons/obj/robotics.dmi
index c53e7823ca..5939f215b7 100644
Binary files a/icons/obj/robotics.dmi and b/icons/obj/robotics.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 8af4294eb6..70ee103b4b 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index a1a37ea4b9..eb7e002c04 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -147,6 +147,7 @@
 #include "code\citadel\cit_areas.dm"
 #include "code\citadel\cit_arousal.dm"
 #include "code\citadel\cit_genemods.dm"
+#include "code\citadel\cit_guns.dm"
 #include "code\citadel\cit_kegs.dm"
 #include "code\citadel\cit_reagents.dm"
 #include "code\citadel\cit_uniforms.dm"