diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index c980ee1f50f..1dc39e91d21 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -181,6 +181,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list( /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, + /obj/item/gun/ballistic/shotgun/automatic/combat/compact, )) GLOBAL_LIST_INIT(security_vest_allowed, list( @@ -198,6 +199,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, list( /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, + /obj/item/gun/ballistic/shotgun/automatic/combat/compact, )) GLOBAL_LIST_INIT(security_wintercoat_allowed, list( @@ -211,6 +213,7 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list( /obj/item/storage/belt/holster/detective, /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, + /obj/item/gun/ballistic/shotgun/automatic/combat/compact, )) //Allowed list for all chaplain suits (except the honkmother robe) diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index caa0da143f5..3bf39db3b1d 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -260,6 +260,16 @@ /obj/item/gun/energy/e_gun/hos/add_stealing_item_objective() return add_item_to_steal(src, /obj/item/gun/energy/e_gun/hos) +/datum/objective_item/steal/compactshotty + name = "the head of security's personal compact shotgun" + targetitem = /obj/item/gun/ballistic/shotgun/automatic/combat/compact + excludefromjob = list(JOB_HEAD_OF_SECURITY) + item_owner = list(JOB_HEAD_OF_SECURITY) + exists_on_map = TRUE + +/obj/item/gun/ballistic/shotgun/automatic/combat/compact/add_stealing_item_objective() + return add_item_to_steal(src, /obj/item/gun/ballistic/shotgun/automatic/combat/compact) + /datum/objective_item/steal/handtele name = "a hand teleporter" targetitem = /obj/item/hand_tele 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 4b92f3a96da..f9b61598c98 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -71,6 +71,7 @@ // Traitor steal objectives new /obj/item/gun/energy/e_gun/hos(src) new /obj/item/pinpointer/nuke(src) + new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) /obj/structure/closet/secure_closet/warden name = "warden's locker" diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index d5e234034d6..dfd99e24766 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -21,6 +21,10 @@ ammo_type = /obj/item/ammo_casing/shotgun/beanbag max_ammo = 6 +/obj/item/ammo_box/magazine/internal/shot/com/compact + name = "compact shotgun internal magazine" + max_ammo = 5 + /obj/item/ammo_box/magazine/internal/shot/dual name = "double-barrel shotgun internal magazine" max_ammo = 2 diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 8f1d8217299..ff04499c41b 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -63,6 +63,13 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE +/obj/item/gun/ballistic/shotgun/automatic/combat/compact + name = "compact shotgun" + desc = "A compact version of the semi automatic combat shotgun. For close encounters." + icon_state = "cshotgunc" + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com/compact + w_class = WEIGHT_CLASS_BULKY + //Dual Feed Shotgun /obj/item/gun/ballistic/shotgun/automatic/dual_tube diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi index 69233ec07f3..9dd25af2a92 100644 Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ