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

SA .357 Custom Item Addition #193

Closed
wants to merge 27 commits into from
Closed

SA .357 Custom Item Addition #193

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
9661ab5
Oopsiedaisies
Mar 27, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
38e537c
Name alterration
Max-023 Mar 30, 2024
c3991c7
Resprites
Mar 30, 2024
0e65c01
Update code/modules/projectiles/guns/revolvers.dm
Max-023 Mar 30, 2024
ce06c20
Belt/Pouch Fixes
Mar 30, 2024
7a7f2a3
M44 Custom Case
Mar 30, 2024
b90fe2c
Attachment Overlays
Mar 31, 2024
4b9e162
Text Adjustments
Mar 31, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
24810a3
Smartgunner Belt Fix
Apr 1, 2024
d26c27c
Sprite Adjustments
Apr 1, 2024
b254812
Missed One
Apr 1, 2024
ecb8f8e
Grip Fix
Apr 1, 2024
5769a6d
Belt Clipping Fix
Apr 1, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
5f29030
Changes
Apr 10, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
9715676
Auto stash before merge of "revolver" and "origin/revolver"
Apr 23, 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/ammo/bullet/revolver.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@
name = "small revolver bullet"
headshot_state = HEADSHOT_OVERLAY_LIGHT

damage = 45
damage = 70

penetration = ARMOR_PENETRATION_TIER_3

/datum/ammo/bullet/revolver/small/hollowpoint
name = "small hollowpoint revolver bullet"
headshot_state = HEADSHOT_OVERLAY_MEDIUM

damage = 75 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong
damage = 85 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong
penetration = 0
damage_falloff = DAMAGE_FALLOFF_TIER_6

Expand Down
19 changes: 9 additions & 10 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 @@ -32,13 +32,13 @@

list("SIDEARMS", -1, null, null),
list("88 Mod 4 Combat Pistol", round(scale * 25), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M44 Combat Revolver", round(scale * 25), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
list("SA .357 Combat Revolver", round(scale * 25), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR),
list("M4A3 Service Pistol", round(scale * 25), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
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("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),

list("ATTACHMENTS", -1, null, null),
Expand Down Expand Up @@ -105,7 +105,7 @@
list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 Pattern M40 Grenade Rig", round(scale * 10), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
list("M276 Pattern M44 Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Revolver Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 Pattern M82F Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("M276 G8-A General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -263,7 +263,7 @@
list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine/standard, VENDOR_ITEM_REGULAR),
list("M276 Pattern M40 Grenade Rig", round(scale * 10), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m4a3/standard, VENDOR_ITEM_REGULAR),
list("M276 Pattern M44 Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44/standard, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Revolver Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44/standard, VENDOR_ITEM_REGULAR),
list("M276 Pattern M82F Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("M276 G8-A General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt/standard, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -432,14 +432,14 @@

list("SIDEARMS", -1, null, null),
list("88 Mod 4 Combat Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M44 Combat Revolver", round(scale * 2), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
list("SA .357 Combat Revolver", round(scale * 2), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR),
list("M4A3 Service Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
list("VP78 pistol", round(scale * 2), /obj/item/weapon/gun/pistol/vp78, VENDOR_ITEM_REGULAR),
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("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, 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 @@ -550,15 +550,15 @@
list("SIDEARMS", -1, null, null), //forecon loves their pistols
list("M48A4 Service Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/m1911/socom, VENDOR_ITEM_REGULAR),
list("88 Mod 4 Combat Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M44 Combat Revolver", round(scale * 5), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
list("SA .357 Combat Revolver", round(scale * 5), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR),
list("M4A3 Service Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
list("VP78 pistol", round(scale * 5), /obj/item/weapon/gun/pistol/vp78, VENDOR_ITEM_REGULAR),
list("M82F Flare Gun", round(scale * 3), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

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("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, 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 @@ -637,8 +637,7 @@
list("M37 Wooden Stock", round(scale * 1.5), /obj/item/attachable/stock/shotgun, VENDOR_ITEM_REGULAR),
list("M39 Arm Brace", round(scale * 1.5), /obj/item/attachable/stock/smg/collapsible/brace, VENDOR_ITEM_REGULAR),
list("M39 Stock", round(scale * 1.5), /obj/item/attachable/stock/smg, VENDOR_ITEM_REGULAR),
list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR),
list("M44 Magnum Sharpshooter Stock", round(scale * 1.5), /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR)
list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR)
)

//------------ESSENTIAL SETS---------------
Expand Down
6 changes: 4 additions & 2 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 @@ -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"

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 revolver pistols of various types, along with six small pouches for speedloaders."
icon_state = "m44r_holster"
storage_slots = 7
can_hold = list(
/obj/item/weapon/gun/revolver/m44,
/obj/item/weapon/gun/revolver/cmb,
/obj/item/ammo_magazine/revolver,
/obj/item/ammo_magazine/revolver/cmb,
)
has_gamemode_skin = TRUE
holster_slots = list(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ var/global/list/gear_datums_by_name = list()

/datum/gear/weapon/m44_custom_revolver
display_name = "M44 Custom Revolver"
path = /obj/item/weapon/gun/revolver/m44/custom
path = /obj/item/storage/box/guncase/m44/custom
allowed_origins = USCM_ORIGINS

/datum/gear/weapon/m1911
Expand Down
17 changes: 17 additions & 0 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 @@ -388,6 +388,23 @@
new /obj/item/ammo_magazine/revolver/marksman(src)
new /obj/item/ammo_magazine/revolver/marksman(src)

//M44 Combat Revolver Custom
/obj/item/storage/box/guncase/m44/custom
name = "\improper M44 Custom Revolver case"
desc = "A gun case containing an M44 Custom Revolver loaded with marksman ammo."
storage_slots = 7
can_hold = list(/obj/item/attachable/flashlight, /obj/item/weapon/gun/revolver/m44/custom, /obj/item/ammo_magazine/revolver)

/obj/item/storage/box/guncase/m44/fill_preset_inventory()
new /obj/item/attachable/flashlight(src)
new /obj/item/weapon/gun/revolver/m44/custom/mp(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)
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


//M4A3 Service Pistol
/obj/item/storage/box/guncase/m4a3
name = "\improper M4A3 Service Pistol case"
Expand Down
16 changes: 15 additions & 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 @@ -342,6 +342,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.....


//----------------------------------------------
// Blade Runner Blasters.
/obj/item/weapon/gun/revolver/m44/custom/pkd_special
Expand Down Expand Up @@ -731,7 +734,7 @@
return ..()

/obj/item/weapon/gun/revolver/cmb/set_gun_attachment_offsets()
attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18)
attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 20,"rail_x" = 12, "rail_y" = 23, "under_x" = 20, "under_y" = 17, "stock_x" = 20, "stock_y" = 17)

/obj/item/weapon/gun/revolver/cmb/set_gun_config_values()
..()
Expand All @@ -746,3 +749,14 @@

/obj/item/weapon/gun/revolver/cmb/normalpoint
current_mag = /obj/item/ammo_magazine/internal/revolver/cmb

//-------------------------------------------------------
//MARINE REVOLVER //Spearhead exists in Alien cannon, this one is based on the Dark Descent model.

/obj/item/weapon/gun/revolver/cmb/marine
name = "\improper SA .357 revolver"
desc = "An automatic revolver chambered in .357, recognizably similar to its civilian counterpart. In Limited Service with the USCM, typically provided to more veteran units."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
icon_state = "mspearhead"
item_state = "mspearhead"
current_mag = /obj/item/ammo_magazine/internal/revolver/cmb
2 changes: 1 addition & 1 deletion code/modules/projectiles/magazines/revolvers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

/obj/item/ammo_magazine/revolver/cmb/normalpoint //put these in the marshal ert - ok sure :)
name = "\improper Spearhead speed loader (.357)"
desc = "A speedloader of 6 FMJ .357 bullets, uncommonly issued to Colonial Marshals due to overpenetration risks."
desc = "A speedloader of 6 FMJ .357 bullets, uncommonly issued to Colonial Marshals due to overpenetration risks but service standard for the USCM."
default_ammo = /datum/ammo/bullet/revolver/small
icon_state = "cmb"

Expand Down
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/belts.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/colony.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
View file
Open in desktop
Binary file not shown.
Loading