diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index b15117bb2554..f057f6d3ca73 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -431,7 +431,7 @@ GLOBAL_LIST_EMPTY(alldepartments) P.stamped = new P.stamped += /obj/item/tool/stamp P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." + P.stamps += "
This paper has been stamped by The Office of the Colonial Marshals." if("Weyland-Yutani Quantum Relay") var/image/stampoverlay = image('icons/obj/items/paper.dmi') stampoverlay.icon_state = "paper_stamp-weyyu" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 96796db0434c..0fc81a9da4e1 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -1316,6 +1316,12 @@ icon_state = "s_xm51_holster" has_gamemode_skin = FALSE +/obj/item/storage/belt/gun/xm51/black/cmb + name = "\improper M276 pattern Model 1771 holster rig" + desc = "The M276 is the standard load-bearing equipment of the Office of Colonial Marshals. It consists of a modular belt with various clips. This version is for the Model 1771 breaching scattergun, allowing easier storage of the weapon. It features pouches for storing two magazines along with extra shells." + gun_has_gamemode_skin = FALSE + + #undef MAXIMUM_MAGAZINE_COUNT /obj/item/storage/belt/gun/m44 diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 029eda204f3a..bab3841346df 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1839,7 +1839,7 @@ P.stamped = new P.stamped += /obj/item/tool/stamp P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." + P.stamps += "
This paper has been stamped by The Office of the Colonial Marshals." to_chat(src.owner, "Message reply to transmitted successfully.") message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index d8d1c4a3561a..84726e2faf0f 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -437,10 +437,10 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) //belt - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/xm51/black, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm51, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/xm51/black/cmb, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm51/cmb, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51/cmb, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51/cmb, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index e5a761ee1849..8c4d9bb66f0a 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -2019,3 +2019,13 @@ /obj/item/weapon/gun/rifle/xm51/cock(mob/user) //Stops the "You cock the gun." message where nothing happens. return + +/obj/item/weapon/gun/rifle/xm51/cmb + name = "\improper Model 1771 Cobra Max Tactical" + desc = "Š’esigned by Armat Battlefield Systems for the Office of the Colonial Marshals as a breaching and crowd control weapon, the Model 1771 is a mag-fed, pump-action shotgun. It utilizes special 16-gauge breaching rounds which are effective at breaching walls and doors. Users are advised not to employ the weapon against soft or armored targets due to low performance of the shells." + icon_state = "m51b" + item_state = "m51b" + current_mag = /obj/item/ammo_magazine/rifle/xm51/cmb + map_specific_decoration = FALSE + starting_attachment_types = list(/obj/item/attachable/flashlight/grip, /obj/item/attachable/reflex) + diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 17b346967dbb..851ef9c5e242 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -529,3 +529,6 @@ max_rounds = 12 gun_type = /obj/item/weapon/gun/rifle/xm51 transfer_handful_amount = 6 + +/obj/item/ammo_magazine/rifle/xm51/cmb + name = "\improper Model 1771 magazine (16g)" diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 128b05455d6e..2ad4f7834b08 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index e5139e104537..c988950ba768 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 034987afde0f..19a5e7b21f4e 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 0a41940b7298..f5420d088bac 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 9549fa1ba789..28b1c7a12feb 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index 1f0b98967a25..e8898441d237 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ