M20A Unloaded (#649)

cmss13-devs · Jan 5, 2025 · 16911d5 · 16911d5
1 parent b3d8586
commit 16911d5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm
@@ -140,3 +140,19 @@
 
 /obj/structure/gun_rack/mk221/empty
 	initial_stored = 0
+
+/obj/structure/gun_rack/m20a
+	name = "M20A pulse rifle rack"
+	icon_state = "m20a"
+	max_stored = 5
+	initial_stored = 5
+	allowed_type = /obj/item/weapon/gun/rifle/m20a
+	populate_type = /obj/item/weapon/gun/rifle/m20a
+
+/obj/structure/gun_rack/m20a/empty
+	initial_stored = 0
+
+/obj/structure/gun_rack/m20a/unloaded
+	initial_stored = 5
+	allowed_type = /obj/item/weapon/gun/rifle/m20a/unloaded
+	populate_type = /obj/item/weapon/gun/rifle/m20a/unloaded
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
@@ -3241,6 +3241,9 @@ Defined in conflicts.dm of the #defines folder.
 			return
 	to_chat(user, SPAN_WARNING("[src] only accepts shotgun buckshot."))
 
+/obj/item/attachable/attached_gun/shotgun/m20a/unloaded
+	current_rounds = 0
+
 /obj/item/attachable/attached_gun/shotgun/m20a
 	name = "\improper U3 underbarrel shotgun"
 	desc = "An ARMAT U3 tactical shotgun. Integrated into the M20A Harrington rifle. Only capable of loading up to five buckshot shells."
@@ -3249,6 +3252,7 @@ Defined in conflicts.dm of the #defines folder.
 	flags_attach_features = ATTACH_ACTIVATION|ATTACH_PROJECTILE|ATTACH_RELOADABLE|ATTACH_WEAPON
 	hidden = TRUE
 
+
 /obj/item/attachable/attached_gun/shotgun/m20a/set_bullet_traits()
 	return
 

diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
@@ -491,6 +491,11 @@
 	scatter = SCATTER_AMOUNT_TIER_8
 	burst_scatter_mult = SCATTER_AMOUNT_TIER_8
 
+/obj/item/weapon/gun/rifle/m20a/unloaded
+	flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_TRIGGER_SAFETY
+	current_mag = null
+	starting_attachment_types = list(/obj/item/attachable/stock/m20a,/obj/item/attachable/attached_gun/shotgun/m20a/unloaded)
+
 //----------------------------------------------
 //Special gun for the CO to replace the smartgun
 

diff --git a/icons/obj/structures/gun_racks.dmi b/icons/obj/structures/gun_racks.dmi