Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMB/MP gear loadout edits, Mod 88 edits, CMB/MP resprites #311

Merged
merged 21 commits into from
Aug 5, 2024
Merged

CMB/MP gear loadout edits, Mod 88 edits, CMB/MP resprites #311

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2fa20a8
Multiple CMB/Riot related changes, mostly regarding sprites
AmoryBlaine Jun 27, 2024
17890b3
CMB belts and MP changes
AmoryBlaine Jun 27, 2024
39092e4
no accidental Hybrisa p90s
AmoryBlaine Jun 29, 2024
05705c9
updated cmb suit obj
AmoryBlaine Jun 29, 2024
e57c78d
MP uniform updated
AmoryBlaine Jun 29, 2024
87604c0
88 Mod FMJ standardized
AmoryBlaine Jun 29, 2024
556b8ec
merged RMC berets
AmoryBlaine Jun 29, 2024
1c3f428
fixes merge conflict
AmoryBlaine Jun 29, 2024
5c07a29
88 Mod AP nerf
AmoryBlaine Jul 2, 2024
845d1d0
Removes instances of Mod 88 9mm AP from every map
AmoryBlaine Jul 2, 2024
3277400
88 Mod doesn't do extra damage for no reason
AmoryBlaine Jul 2, 2024
e58325b
MP changes
AmoryBlaine Jul 2, 2024
1745218
mp helmet update
AmoryBlaine Jul 2, 2024
bc8f856
tie overlay fix
AmoryBlaine Jul 2, 2024
bf4e2c2
MARSOC armor & helmet update
AmoryBlaine Jul 3, 2024
b874b3a
MARSOC armor fix
AmoryBlaine Jul 3, 2024
74cb0c1
Afro be gone, dogtags welcome home
AmoryBlaine Jul 7, 2024
081492d
Combat nudity disengaged
AmoryBlaine Jul 12, 2024
2b8bb1e
Updated colony class vendor
AmoryBlaine Aug 1, 2024
4bb3bec
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AmoryBlaine Aug 1, 2024
de2c7dc
Merged Smartgun stuff
AmoryBlaine Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/factions/clf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", 0, null, null, null),
list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR),
list("Beretta 92FS Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
list("KT-42 Magazine (.44)", 5, /obj/item/ammo_magazine/pistol/kt42, null, VENDOR_ITEM_REGULAR),
list("Spearhead Speed Loader (.357)", 10, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -134,7 +134,7 @@
list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("Beretta 92FS Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/b92fs, VENDOR_ITEM_REGULAR),
list("KT-42 Magazine (.44)", 40, /obj/item/ammo_magazine/pistol/kt42, VENDOR_ITEM_REGULAR),
list("Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR),
Expand Down
4 changes: 2 additions & 2 deletions code/datums/factions/pmc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

list("SIDEARM AMMUNITION", 0, null, null, null),
list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR),

list("ATTACHMENTS", 0, null, null, null),
list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -87,7 +87,7 @@

list("SIDEARM AMMUNITION", 0, null, null, null),
list("VP78 magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("88M4 AP Magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 50, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
list("M94 Marking Flare Pack", 30, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED),
Expand Down
4 changes: 2 additions & 2 deletions code/datums/factions/royalmarinescommando.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

list("SIDEARM AMMUNITION", 0, null, null, null),
list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR),

list("ATTACHMENTS", 0, null, null, null),
list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -83,7 +83,7 @@

list("SIDEARM AMMUNITION", -1, null, null),
list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88/normalpoint, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", -1, null, null),
list("M94 Marking Flare Pack", 3, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED),
Expand Down
31 changes: 20 additions & 11 deletions code/game/machinery/vending/vending_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,36 +222,45 @@
)

/obj/structure/machinery/vending/security
name = "\improper SecTech"
desc = "A security equipment vendor."
name = "\improper ColMarTech Military Police Vendor"
desc = "A USCM Military Police vendor."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
icon_deny = "sec-deny"
req_access = list(ACCESS_MARINE_BRIG)
products = list(
/obj/item/handcuffs = 8,
/obj/item/handcuffs/zip = 10,
/obj/item/explosive/grenade/flashbang = 4,
/obj/item/weapon/gun/energy/taser = 4,
/obj/item/reagent_container/spray/pepper = 4,
/obj/item/weapon/baton = 4,
/obj/item/device/flashlight = 4,
/obj/item/storage/belt/security/MP = 4,
/obj/item/device/flash = 5,
/obj/item/reagent_container/food/snacks/donut/normal = 12,
/obj/item/storage/box/evidence = 6,
/obj/item/clothing/head/helmet/marine/MP = 6,
/obj/item/clothing/head/beret/marine/mp/mppeaked = 6,
/obj/item/clothing/head/beret/marine/mp/mpcap = 6,
/obj/item/clothing/head/helmet/marine/MP = 2,
/obj/item/clothing/under/marine/mp = 2,
/obj/item/storage/belt/security/MP = 6,
/obj/item/clothing/head/beret/marine/mp = 6,
/obj/item/clothing/glasses/sunglasses/sechud = 3,
/obj/item/device/radio/headset = 6,
/obj/item/tape/regulation = 5,
)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2)

/obj/structure/machinery/vending/security/colony
name = "\improper SecTech Police Vendor"
desc = "A generic police vendor."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "sec"
icon_deny = "sec-deny"
req_access = list(ACCESS_MARINE_BRIG)
products = list(
/obj/item/handcuffs = 8,
/obj/item/reagent_container/spray/pepper = 4,
/obj/item/device/flashlight = 4,
/obj/item/storage/belt/security/MP/CMB = 4,
/obj/item/device/flash = 5,
/obj/item/storage/box/evidence = 6,
/obj/item/tape/regulation = 5,
)

/obj/structure/machinery/vending/sea
name = "\improper SeaTech"
desc = "An equipment vendor designed to save lives"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/pilot_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
list("M82F Flare Gun", 4, /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", 20, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", 20, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
list("M4A3 AP Magazine (9mm)", 12, /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_apc_spare, list(
list("M82F Flare Gun", 2, /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", 10, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", 10, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
list("M4A3 AP Magazine (9mm)", 6, /obj/item/ammo_magazine/pistol/ap, VENDOR_ITEM_REGULAR),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@
list("M39 HV Magazine (10x20mm)", round(scale * 50), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
list("M44 Speed Loader (.44)", round(scale * 40), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
list("88 Mod 4 Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),

list("ARMOR-PIERCING AMMUNITION", -1, null, null),
list("88 Mod 4 AP Magazine (9mm)", round(scale * 50), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M4RA AP Magazine (10x24mm)", round(scale * 15.7), /obj/item/ammo_magazine/rifle/m4ra/ap, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", round(scale * 11.9), /obj/item/ammo_magazine/smg/m39/ap, VENDOR_ITEM_REGULAR),
list("M41A MK2 AP Magazine (10x24mm)", round(scale * 10.5), /obj/item/ammo_magazine/rifle/ap, VENDOR_ITEM_REGULAR),
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
list("M82F Flare Gun", round(scale * 10), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -440,7 +440,7 @@
list("M82F Flare Gun", round(scale * 1), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -559,7 +559,7 @@

list("SIDEARM AMMUNITION", -1, null, null),
list("M1911 Magazine (.45)", round(scale * 20), /obj/item/ammo_magazine/pistol/m1911, VENDOR_ITEM_REGULAR),
list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),
list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/wo_vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
list("M82F Flare Gun", round(scale * 5), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("88M4 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88/normalpoint, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/faction_spawners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
mags_min = 1
guns = list(
/obj/item/weapon/gun/pistol/vp78 = /obj/item/ammo_magazine/pistol/vp78,
/obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88
/obj/item/weapon/gun/pistol/mod88 = /obj/item/ammo_magazine/pistol/mod88/normalpoint
)

/obj/effect/spawner/random/gun/pmc_secondary/lowchance
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/headset.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@
desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Featured channels include: ; - CMB, :o - Colony, :g - public, :v - marine command, :m - medbay, :t - intel."
frequency = CMB_FREQ
icon_state = "cmb_headset"
initial_keys = list(/obj/item/device/encryptionkey/cmb)
initial_keys = list(/obj/item/device/encryptionkey/colony)
has_hud = TRUE
hud_type = MOB_HUD_FACTION_USCM

Expand Down
30 changes: 21 additions & 9 deletions code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,18 +406,20 @@
/obj/item/storage/belt/security/MP
name = "\improper M276 pattern military police rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is filled with an array of small pouches, meant to carry non-lethal equipment and restraints."
storage_slots = 6
storage_slots = 8
max_w_class = SIZE_MEDIUM
max_storage_space = 30


/obj/item/storage/belt/security/MP/full/fill_preset_inventory()
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/baton(src)
new /obj/item/handcuffs(src)
new /obj/item/handcuffs(src)
new /obj/item/handcuffs(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/device/clue_scanner(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)


/obj/item/storage/belt/security/MP/UPP
Expand All @@ -439,15 +441,25 @@
max_w_class = SIZE_MEDIUM
max_storage_space = 30

/obj/item/storage/belt/security/MP/CMB/full/fill_preset_inventory()
/obj/item/storage/belt/security/MP/CMB/full/revolver/fill_preset_inventory()
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/baton(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/device/clue_scanner(src)
new /obj/item/handcuffs(src)
new /obj/item/handcuffs(src)
new /obj/item/explosive/grenade/flashbang(src)
new /obj/item/handcuffs(src)
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)

/obj/item/storage/belt/security/MP/CMB/full/highpower/fill_preset_inventory()
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/baton(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/handcuffs(src)
new /obj/item/handcuffs(src)
new /obj/item/handcuffs(src)
new /obj/item/ammo_magazine/pistol/highpower(src)
new /obj/item/ammo_magazine/pistol/highpower(src)

/obj/item/storage/belt/security/MP/CMB/synth/fill_preset_inventory()
new /obj/item/explosive/grenade/flashbang(src)
Expand Down Expand Up @@ -1175,12 +1187,12 @@
/obj/item/storage/belt/gun/m4a3/mod88/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/mod88())
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)

/obj/item/storage/belt/gun/m4a3/mod88_near_empty/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/mod88())
for(var/i = 1 to 3)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)

/obj/item/storage/belt/gun/m4a3/vp78/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/vp78())
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@

/obj/item/storage/pouch/magazine/pistol/pmc_mod88/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)

/obj/item/storage/pouch/magazine/pistol/pmc_vp78/fill_preset_inventory()
for(var/i = 1 to storage_slots)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@

/obj/item/clothing/head/CMB
name = "\improper Colonial Marshal Bureau cap"
desc = "A dark cap enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
desc = "A black cap boldly presenting the acronym 'CMB'. Made using durable fabric, it might stop a very low caliber round from penetrating it, or a stab from piercing it. That isn't to say you won't have a dent in your head."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEJUMPSUIT
siemens_coefficient = 0.5
time_to_unequip = 20
time_to_equip = 20
Expand Down
10 changes: 6 additions & 4 deletions code/modules/clothing/suits/marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@

if(is_type_in_list(equipping_item, smartgun_back))
return

. = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP

if(equipping_item.flags_equip_slot == SLOT_BACK)
Expand Down Expand Up @@ -567,8 +567,10 @@

/obj/item/clothing/suit/storage/marine/light/vest/dcc
name = "\improper M3-VL pattern flak vest"
desc = "A combination of the standard non-combat M3-VL ballistics vest and M70 flak jacket, this piece of armor has been distributed to dropship crew to keep them safe from threats external and internal..."
desc = "Effectively a combination of the M3-VL ballistics vest and M70 flak jacket, this armor is used by primarily by flight personnel because of its combined flak and ballistic defense and high mobility. It is also typically worn by military police officers as a result of the blunt force protection offered by the aforementioned armor layering."
icon_state = "VL_FLAK"
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_MEDIUM
storage_slots = 2

/obj/item/clothing/suit/storage/marine/light/synvest
Expand Down Expand Up @@ -1530,7 +1532,7 @@

/obj/item/clothing/suit/storage/CMB
name = "\improper CMB Deputy jacket"
desc = "A thick and stylish black leather jacket with a Marshal's Deputy badge pinned to it. The back is enscribed with the powerful letters of 'DEPUTY' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
desc = "A polyster blue bomber jacket enforced with light ballistic weaving. It has a Marshal's Deputy badge pinned to it. The back is enscribed with the word 'DEPUTY'."
icon_state = "CMB_jacket"
item_state = "CMB_jacket"
blood_overlay_type = "coat"
Expand Down Expand Up @@ -1581,7 +1583,7 @@

/obj/item/clothing/suit/storage/CMB/marshal
name = "\improper CMB Marshal jacket"
desc = "A thick and stylish black leather jacket with a Marshal's badge pinned to it. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
desc = "A thick and stylish black leather bomber jacket with a Marshal's badge pinned to it. The back is enscribed with the word 'MARSHAL'."
icon_state = "CMB_jacket_marshal"
item_state = "CMB_jacket_marshal"

Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/under/ties.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,13 @@
desc = "An armband, worn by the rookie nurses to display they are still not doctors. This one is dark red."
icon_state = "nurse"

/obj/item/clothing/accessory/armband/mpsec
name = "military police armband"
desc = "An armband used by military police officers to denote their position."
icon_state = "armband_mp"
slot = ACCESSORY_SLOT_ARMBAND
jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED)

//patches
/obj/item/clothing/accessory/patch
name = "USCM patch"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/cm_marines/equipment/guncases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@
/obj/item/storage/box/guncase/mod88/fill_preset_inventory()
new /obj/item/attachable/flashlight(src)
new /obj/item/weapon/gun/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)
new /obj/item/ammo_magazine/pistol/mod88/normalpoint(src)

//M44 Combat Revolver
/obj/item/storage/box/guncase/m44
Expand Down
Loading
Loading