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.

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

Implements M1911 pistol into Loadout Options and changes its sprite. #126

Merged
merged 4 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions code/game/objects/items/storage/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,20 @@
new /obj/item/ammo_magazine/pistol/t73(src)
new /obj/item/ammo_magazine/pistol/t73(src)

/obj/item/storage/box/M1911_loadout
name = "M1911 storage case"
desc = "A relatively large storage case containing the 1911 and additional magazines. Purchased by enlisted or aspiring PMCs looking to carry a timeless classic"
icon = 'icons/obj/items/storage.dmi'
icon_state = "matebacase"
w_class = SIZE_MEDIUM
max_w_class = SIZE_MEDIUM
storage_slots = 3

/obj/item/storage/box/M1911_loadout/fill_preset_inventory()
new /obj/item/weapon/gun/pistol/m1911(src)
new /obj/item/ammo_magazine/pistol/m1911(src)
new /obj/item/ammo_magazine/pistol/m1911(src)

/obj/item/storage/box/co2_knife
name = "M8 cartridge bayonet packaging"
desc = "Contains one M8 Cartridge Bayonet and two sister CO2 cartridges. Thanks for being a dedicated Boots magazine subscriber!"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,11 @@ var/global/list/gear_datums_by_name = list()
path = /obj/item/weapon/gun/revolver/m44/custom
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/m1911
display_name = "M1911 Service Pistol"
path = /obj/item/storage/box/M1911_loadout
allowed_origins = USCM_ORIGINS

/datum/gear/drink
category = "Canned drinks"

Expand Down
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.
Loading