Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427

[MIRROR] Warden Compact Combat Shotgun
2017-05-23 07:13:52 -05:00
parent e4ed038b15 8bc4cf3f41
commit 2deead1ab2
4 changed files with 14 additions and 1 deletions
@@ -106,7 +106,7 @@
 	new /obj/item/device/flashlight/seclite(src)
 	new /obj/item/clothing/gloves/krav_maga/sec(src)
 	new /obj/item/weapon/door_remote/head_of_security(src)
-	new /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube(src)
+	new /obj/item/weapon/gun/ballistic/shotgun/automatic/combat/compact(src)

 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
@@ -109,6 +109,11 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 	max_ammo = 6

+/obj/item/ammo_box/magazine/internal/shot/com/compact
+	name = "compact combat shotgun internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+	max_ammo = 4
+
 /obj/item/ammo_box/magazine/internal/shot/dual
 	name = "double-barrel shotgun internal magazine"
 	max_ammo = 2
@@ -192,6 +192,14 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_HUGE

+/obj/item/weapon/gun/ballistic/shotgun/automatic/combat/compact
+	name = "compact combat shotgun"
+	desc = "A compact version of the semi automatic combat shotgun. For close encounters."
+	icon_state = "cshotgunc"
+	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
+	w_class = WEIGHT_CLASS_BULKY
+
 //Dual Feed Shotgun

 /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube