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

SA .357 Custom Item Addition #193

Closed
wants to merge 27 commits into from
Closed

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Mar 30, 2024

Adds a new loadout option in gear preferences for the SA .357 Spearhead. Provides a guncase with ammunition for it, with potential for the player to scavenge more ammunition in the field from the standard CMB Spearhead. Also changes the custom M44 to come in a gun case with marksman ammunition and adjusts pistol belts to include the new addition..

Copy link
Contributor

@AndroBetel AndroBetel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should be fixed

The M276 pattern M44 holster rig cannot hold the SA .357 Revolver.
image

@Max-023
Copy link
Contributor Author

Max-023 commented Mar 30, 2024

Alright, that should fix all the issues.

Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel I misunderstand, what is the reasoning for the switch?

@morrowwolf morrowwolf marked this pull request as draft April 1, 2024 17:00
@Max-023
Copy link
Contributor Author

Max-023 commented Apr 1, 2024

The swap is based on the fact that the Spearhead is shown to be the canonical revolver for the USCM, based on the game Aliens: Dark Descent. So I've just gone in and swapped the M44 from the vendors with a new Spearhead, as well as updating the CMB to look better.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Max-023 Max-023 changed the title SA .357 Swap SA .357 Custom Item Addition Apr 10, 2024
@Max-023 Max-023 marked this pull request as ready for review April 10, 2024 15:47
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

@AndroBetel AndroBetel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

morrow still gotta approve of adding it to loadout, but i think its fine personally

@@ -1232,13 +1232,15 @@
"icon_y" = -5))

/obj/item/storage/belt/gun/m44
name = "\improper M276 pattern M44 holster 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 for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay."
name = "\improper M276 pattern revolver pistol holster rig"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be just "M276 pattern revolver holster rig"

new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a lot of non-standard ammo for apparently no reason, and also a flashlight? dont think thats necessary

new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont think custom revolver needs that many speedloaders and a flashlight, make it 2 just like with 1911

besides, you can still scavenge ammo from CMBs and security groundside, i think that would be interesting

@@ -347,6 +347,9 @@
icon_state = "m44rc"
item_state = "m44rc"

/obj/item/weapon/gun/revolver/m44/custom/mp //loadout w/ ammo
current_mag = /obj/item/ammo_magazine/internal/revolver/m44/marksman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont think loadout equipment should have buffs.....

@AndroBetel AndroBetel marked this pull request as draft April 30, 2024 17:47
Copy link

github-actions bot commented May 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@AndroBetel
Copy link
Contributor

stale for more than a month, author seems to be inactive

@AndroBetel AndroBetel closed this Jun 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants