Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Blundir committed Jul 20, 2024
1 parent b2e7ff8 commit b4bab33
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/fax_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ GLOBAL_LIST_EMPTY(alldepartments)
P.stamped = new
P.stamped += /obj/item/tool/stamp
P.overlays += stampoverlay
P.stamps += "<HR><i>This paper has been stamped by The Office of Colonial Marshals.</i>"
P.stamps += "<HR><i>This paper has been stamped by The Office of the Colonial Marshals.</i>"
if("Weyland-Yutani Quantum Relay")
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
stampoverlay.icon_state = "paper_stamp-weyyu"
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1839,7 +1839,7 @@
P.stamped = new
P.stamped += /obj/item/tool/stamp
P.overlays += stampoverlay
P.stamps += "<HR><i>This paper has been stamped by The Office of Colonial Marshals.</i>"
P.stamps += "<HR><i>This paper has been stamped by The Office of the Colonial Marshals.</i>"

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)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

3 changes: 3 additions & 0 deletions code/modules/projectiles/magazines/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_slot.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/belts.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
Binary file not shown.

0 comments on commit b4bab33

Please sign in to comment.