Skip to content

Commit

Permalink
SURELY THE FINAL UPDATE
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Aug 16, 2024
1 parent 27a9397 commit f13f7f8
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
18 changes: 18 additions & 0 deletions code/game/objects/items/storage/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,15 @@
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/pistol/highpower/black(src)

/obj/item/storage/box/loadout/HG44_loadout
name = "HG 44 'Automag' storage case"
desc = "A relatively large storage case containing a loaded HG 44 'Automag' and additional magazines."

/obj/item/storage/box/loadout/HG44_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower/automag())
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/pistol/highpower/automag(src)

/obj/item/storage/box/loadout/Spearhead_loadout
name = "Spearhead Armoury storage case"
desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."
Expand All @@ -164,6 +173,15 @@
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/revolver/spearhead(src)

/obj/item/storage/box/loadout/Spearhead_loadout/custom
name = "Spearhead Armoury storage case"
desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."

/obj/item/storage/box/loadout/Spearhead_loadout/custom/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead/black())
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/revolver/spearhead(src)

/obj/item/storage/box/loadout/M1911_loadout
name = "M1911 storage case"
desc = "A relatively large storage case containing a loaded M1911 and additional magazines."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -753,11 +753,21 @@ var/global/list/gear_datums_by_name = list()
path = /obj/item/storage/box/loadout/HG45_marine_loadout
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/hg44
display_name = "HG 44 'Automag' Pistol"
path = /obj/item/storage/box/loadout/HG45_marine_loadout
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/spearhead
display_name = "Spearhead Armoury Autorevolver"
display_name = "Spearhead Armoury Revolver"
path = /obj/item/storage/box/loadout/Spearhead_loadout
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/spearhead_custom
display_name = "Custom Spearhead Armoury Revolver"
path = /obj/item/storage/box/loadout/Spearhead_loadout/custom
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/m2100_machete
display_name = "M2100 Machete"
path = /obj/item/storage/large_holster/machete/arnold/weak
Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,9 @@
fire_sound = null
fire_sounds = list('sound/weapons/gun_cmb_1.ogg', 'sound/weapons/gun_cmb_2.ogg')
fire_rattle = 'sound/weapons/gun_cmb_rattle.ogg'
cylinder_click = list('sound/weapons/handling/gun_cmb_click1.ogg', 'sound/weapons/handling/gun_cmb_click2.ogg')
//cylinder_click = list('sound/weapons/handling/gun_cmb_click1.ogg', 'sound/weapons/handling/gun_cmb_click2.ogg')
unload_sound = 'sound/weapons/handling/pkd_open_chamber.ogg'
chamber_close_sound = 'sound/weapons/handling/pkd_close_chamber.ogg'
current_mag = /obj/item/ammo_magazine/internal/revolver/spearhead
force = 15
attachable_allowed = list(
Expand Down
Binary file modified icons/obj/items/clothing/belts.dmi
Binary file not shown.

0 comments on commit f13f7f8

Please sign in to comment.