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

Ammo resupply for VP70 and M4A3 #425

Merged
merged 2 commits into from
Aug 30, 2024
Merged

Ammo resupply for VP70 and M4A3 #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334a1d8
Ammo resupply for VP70 and M4A3
AmoryBlaine Aug 30, 2024
1ef0348
autorevolver misnames
AmoryBlaine Aug 30, 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 @@ -60,7 +60,7 @@
list("SIDEARMS", 0, null, null, null),
list("VP70 Combat Pistol", 15, /obj/item/weapon/gun/pistol/vp70, null, VENDOR_ITEM_REGULAR),
list("Beretta 92FS Pistol", 15, /obj/item/weapon/gun/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
list("CMB Spearhead Autorevolver", 15, /obj/item/weapon/gun/revolver/spearhead, null, VENDOR_ITEM_REGULAR),
list("CMB Spearhead revolver", 15, /obj/item/weapon/gun/revolver/spearhead, null, VENDOR_ITEM_REGULAR),
list("Holdout Pistol", 10, /obj/item/weapon/gun/pistol/holdout, null, VENDOR_ITEM_REGULAR),
list("KT-42 Automag", 15, /obj/item/weapon/gun/pistol/kt42, null, VENDOR_ITEM_REGULAR),
list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -128,7 +128,7 @@
list("SIDEARMS", -1, null, null),
list("VP70 Combat Pistol", 20, /obj/item/weapon/gun/pistol/vp70, VENDOR_ITEM_REGULAR),
list("Beretta 92FS Pistol", 20, /obj/item/weapon/gun/pistol/b92fs, VENDOR_ITEM_REGULAR),
list("CMB Spearhead Autorevolver", 20, /obj/item/weapon/gun/revolver/spearhead, VENDOR_ITEM_REGULAR),
list("CMB Spearhead revolver", 20, /obj/item/weapon/gun/revolver/spearhead, VENDOR_ITEM_REGULAR),
list("Holdout Pistol", 20, /obj/item/weapon/gun/pistol/holdout, VENDOR_ITEM_REGULAR),
list("KT-42 Automag", 20, /obj/item/weapon/gun/pistol/kt42, VENDOR_ITEM_REGULAR),
list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR),
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@

/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."
desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver and additional speedloaders."

/obj/item/storage/box/loadout/Spearhead_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead())
Expand All @@ -175,7 +175,7 @@

/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."
desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver 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())
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/revolvers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
current_mag = /obj/item/ammo_magazine/internal/revolver/spearhead/hollowpoint

/obj/item/weapon/gun/revolver/spearhead/black
name = "\improper Spearhead Armoury autorevolver"
name = "\improper Spearhead Armoury revolver"
desc = "A sleek high-quality revolver designed by Spearhead Armoury chambered in .357 commonly issued to Colonial Marshals, though this version has been customized with a black metal finish indicating it is unlikely to be a service weapon."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi'
icon_state = "spearhead_black"
Expand Down
8 changes: 8 additions & 0 deletions maps/map_files/golden_arrow/golden_arrow.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9827,6 +9827,14 @@
},
/obj/structure/surface/rack,
/obj/item/storage/box/guncase/shotguncombat,
/obj/item/ammo_box/magazine/m4a3{
layer = 3;
pixel_y = -5;
pixel_x = -2
},
/obj/item/ammo_box/magazine/vp70{
layer = 3
},
/turf/open/floor/almayer,
/area/golden_arrow/platoonarmory)
"LQ" = (
Expand Down
Loading