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

HvH balance two atachments be gone #8233

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
+249 −166
Draft

HvH balance two atachments be gone #8233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b072044
HvH balance two atachment be gone
uuuuhuuuu Jan 24, 2025
16947ea
m56d acc buff
uuuuhuuuu Jan 24, 2025
cd6f4fa
m56d acc buff
uuuuhuuuu Jan 24, 2025
19dbe4c
m56d acc buff
uuuuhuuuu Jan 24, 2025
6c2968f
ehm
uuuuhuuuu Jan 25, 2025
038f06a
ehhh
uuuuhuuuu Jan 25, 2025
d826266
adds underbarrel atachements to 71 carabine
uuuuhuuuu Jan 25, 2025
c0d9798
adds underbarrel atachements to 71 carabine
uuuuhuuuu Jan 25, 2025
f713103
removes the unintended guns
uuuuhuuuu Jan 28, 2025
f46b4f1
removes pkp acc buff
uuuuhuuuu Jan 28, 2025
a754038
pkp tweeks
uuuuhuuuu Jan 28, 2025
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
15 changes: 13 additions & 2 deletions code/datums/ammo/bullet/pistol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@

/datum/ammo/bullet/pistol/setup_faction_clash_values()
. = ..()
accuracy += 20
accurate_range -= 2 //we want pistols to be more accurate but only at short range
accuracy += HIT_ACCURACY_TIER_5
accurate_range -= 3 //we want pistols to be more accurate but only at short range
damage *= 0.7 //they are accurate, but they are pisotls not gona do much even if you hit


/datum/ammo/bullet/pistol/tiny
Expand Down Expand Up @@ -195,6 +196,11 @@
shrapnel_chance = SHRAPNEL_CHANCE_TIER_2
damage_falloff = DAMAGE_FALLOFF_TIER_6

/datum/ammo/bullet/pistol/squash/setup_faction_clash_values()
accuracy = HIT_ACCURACY_TIER_2
. = ..()


/datum/ammo/bullet/pistol/squash/toxin
name = "toxic squash-head pistol bullet"
var/acid_per_hit = 10
Expand Down Expand Up @@ -272,3 +278,8 @@
penetration = 20
shrapnel_chance = SHRAPNEL_CHANCE_TIER_2

/datum/ammo/bullet/pistol/smart/setup_faction_clash_values()
accuracy = HIT_ACCURACY_TIER_1
. = ..()


5 changes: 5 additions & 0 deletions code/datums/ammo/bullet/smg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
scatter = SCATTER_AMOUNT_TIER_6
accuracy = HIT_ACCURACY_TIER_3

/datum/ammo/bullet/smg/setup_faction_clash_values()
accurate_range = 7 //I need to make noraml smg and m10 somewhat viable
penetration = ARMOR_PENETRATION_TIER_3
. = ..()

/datum/ammo/bullet/smg/m39
name = "high-velocity submachinegun bullet" //i don't want all smgs to inherit 'high velocity'

Expand Down
4 changes: 3 additions & 1 deletion code/datums/ammo/bullet/special_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
max_range = 17
accurate_range = 12
effective_range_max = 12
penetration = min(penetration + ARMOR_PENETRATION_TIER_1, 30)

/datum/ammo/bullet/smartgun/armor_piercing
name = "\improper AP smartgun tracer bullet"
Expand Down Expand Up @@ -170,6 +171,7 @@
/datum/ammo/bullet/machinegun/setup_faction_clash_values()
. = ..()
accurate_range = 12 //we revert the reduction
accuracy += HIT_ACCURACY_TIER_4

/datum/ammo/bullet/machinegun/set_bullet_traits()
. = ..()
Expand Down Expand Up @@ -266,4 +268,4 @@

/datum/ammo/bullet/pkp/setup_faction_clash_values()
. = ..()
accurate_range = 14
accurate_range = 5
37 changes: 0 additions & 37 deletions code/datums/supply_packs/upp_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,40 +96,3 @@
containertype = /obj/structure/closet/crate/weapon
containername = "QYJ-72 General Purpose Machine Gun Crate"
group = "UPP Weapons"

/datum/supply_packs/upp/minigun
name = "GSh-7.62 Rotary Machine Gun (x2)"
contains = list(
/obj/item/weapon/gun/minigun/upp,
/obj/item/weapon/gun/minigun/upp,
/obj/item/ammo_magazine/minigun,
/obj/item/ammo_magazine/minigun,
)
cost = 60
containertype = /obj/structure/closet/crate/weapon
containername = "GSh-7.62 Rotary Machine Gun Crate"
group = "UPP Special Weapon"

/datum/supply_packs/upp/Type88_marksman_rifle_x10
name = "Type 88 designated marksman rifle (x2)"
contains = list(
/obj/item/weapon/gun/rifle/sniper/svd,
/obj/item/weapon/gun/rifle/sniper/svd,
/obj/item/ammo_magazine/sniper/svd,
/obj/item/ammo_magazine/sniper/svd,
)
cost = 40
containertype = /obj/structure/closet/crate/weapon
containername = "Type 88 designated marksman rifle Crate"
group = "UPP Special Weapon"

/datum/supply_packs/upp/Type71_carbine_commando_x10
name = "Type 71 'Commando' pulse carbine (x2)"
contains = list(
/obj/item/weapon/gun/rifle/type71/carbine/commando,
/obj/item/weapon/gun/rifle/type71/carbine/commando,
)
cost = 40
containertype = /obj/structure/closet/crate/weapon
containername = "Type 71 'Commando' pulse carbine Crate"
group = "UPP Special Weapon"
1 change: 1 addition & 0 deletions code/game/gamemodes/extended/cm_vs_upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
/datum/gamemode_modifier/mortar_laser_warning,
/datum/gamemode_modifier/no_body_c4,
/datum/gamemode_modifier/weaker_explosions_fire,
/datum/gamemode_modifier/only_balanced_attachments,
)

taskbar_icon = 'icons/taskbar/gml_hvh.png'
Expand Down
4 changes: 4 additions & 0 deletions code/game/gamemodes/round_modifiers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,7 @@
/datum/gamemode_modifier/no_body_c4
modifier_name = "No body c4"
modifier_desc = "Prevents c4 explosives from being planted on dead body."

/datum/gamemode_modifier/only_balanced_attachments
modifier_name = "Only balanced attachments"
modifier_desc = "In squad and cargi vendors only attachmants with real drawbacks are available, still can be obtained using reqestions."
81 changes: 52 additions & 29 deletions code/game/machinery/vending/vendor_types/prep_upp/requisitions_upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,35 +175,58 @@
vendor_theme = VENDOR_THEME_UPP

/obj/structure/machinery/cm_vending/sorted/attachments/upp_attachments/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
list("Extended Barrel", 6.5, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("M5 Bayonet", 10.5, /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 6.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 6.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("B8 Smart-Scope", 3.5, /obj/item/attachable/scope/mini_iff, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 8.5, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),
list("Rail Flashlight", 10.5, /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 4.5, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR),
list("S5 Red-Dot Sight", 9.5, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR),
list("S6 Reflex Sight", 9.5, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR),
list("S8 4x Telescopic Scope", 4.5, /obj/item/attachable/scope, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Angled Grip", 6.5, /obj/item/attachable/angledgrip, VENDOR_ITEM_REGULAR),
list("Bipod", 6.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 4.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 4.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Laser Sight", 9.5, /obj/item/attachable/lasersight, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 4.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 4.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 4.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 4.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
list("Underbarrel Flashlight Grip", 9.5, /obj/item/attachable/flashlight/grip, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 9.5, /obj/item/attachable/verticalgrip, VENDOR_ITEM_REGULAR),
)
if(SSticker.mode && MODE_HAS_MODIFIER(/datum/gamemode_modifier/only_balanced_attachments))
listed_products = list(
list("BARREL", -1, null, null),
list("M5 Bayonet", 10.5, /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 6.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 6.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("Magnetic Harness", 8.5, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),
list("Rail Flashlight", 10.5, /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Bipod", 6.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 4.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 4.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 4.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 4.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 4.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 4.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
list("Underbarrel Flashlight Grip", 9.5, /obj/item/attachable/flashlight/grip, VENDOR_ITEM_REGULAR),
)

else
listed_products = list(
list("BARREL", -1, null, null),
list("Extended Barrel", 6.5, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("M5 Bayonet", 10.5, /obj/item/attachable/bayonet, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 6.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 6.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("B8 Smart-Scope", 3.5, /obj/item/attachable/scope/mini_iff, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 8.5, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),
list("Rail Flashlight", 10.5, /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 4.5, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR),
list("S5 Red-Dot Sight", 9.5, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR),
list("S6 Reflex Sight", 9.5, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR),
list("S8 4x Telescopic Scope", 4.5, /obj/item/attachable/scope, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Angled Grip", 6.5, /obj/item/attachable/angledgrip, VENDOR_ITEM_REGULAR),
list("Bipod", 6.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 4.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 4.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Laser Sight", 9.5, /obj/item/attachable/lasersight, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 4.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 4.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 4.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 4.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
list("Underbarrel Flashlight Grip", 9.5, /obj/item/attachable/flashlight/grip, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 9.5, /obj/item/attachable/verticalgrip, VENDOR_ITEM_REGULAR),
)

//------------UNIFORM VENDOR---------------

Expand Down
72 changes: 47 additions & 25 deletions code/game/machinery/vending/vendor_types/prep_upp/squad_prep_upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,52 @@
return GLOB.not_incapacitated_and_adjacent_strict_state

/obj/structure/machinery/cm_vending/sorted/attachments/upp_squad/populate_product_list(scale)
listed_products = list(
list("BARREL", -1, null, null),
list("Extended Barrel", 2.5, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 2.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 2.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("B8 Smart-Scope", 1.5, /obj/item/attachable/scope/mini_iff, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 4, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 2, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR),
list("S5 Red-Dot Sight", 3, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR),
list("S6 Reflex Sight", 3, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR),
list("S8 4x Telescopic Scope", 2, /obj/item/attachable/scope, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Angled Grip", 2.5, /obj/item/attachable/angledgrip, VENDOR_ITEM_REGULAR),
list("Bipod", 2.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 1.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 1.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Laser Sight", 3, /obj/item/attachable/lasersight, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 1.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 1.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 1.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 1.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 3, /obj/item/attachable/verticalgrip, VENDOR_ITEM_REGULAR),

if(SSticker.mode && MODE_HAS_MODIFIER(/datum/gamemode_modifier/only_balanced_attachments))

listed_products = list(
list("BARREL", -1, null, null),
list("Recoil Compensator", 2.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 2.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("Magnetic Harness", 4, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Bipod", 2.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 1.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 1.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 1.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 1.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 1.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 1.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
)

else
listed_products = list(
list("BARREL", -1, null, null),
list("Extended Barrel", 2.5, /obj/item/attachable/extended_barrel, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 2.5, /obj/item/attachable/compensator, VENDOR_ITEM_REGULAR),
list("Suppressor", 2.5, /obj/item/attachable/suppressor, VENDOR_ITEM_REGULAR),

list("RAIL", -1, null, null),
list("B8 Smart-Scope", 1.5, /obj/item/attachable/scope/mini_iff, VENDOR_ITEM_REGULAR),
list("Magnetic Harness", 4, /obj/item/attachable/magnetic_harness, VENDOR_ITEM_REGULAR),
list("S4 2x Telescopic Mini-Scope", 2, /obj/item/attachable/scope/mini, VENDOR_ITEM_REGULAR),
list("S5 Red-Dot Sight", 3, /obj/item/attachable/reddot, VENDOR_ITEM_REGULAR),
list("S6 Reflex Sight", 3, /obj/item/attachable/reflex, VENDOR_ITEM_REGULAR),
list("S8 4x Telescopic Scope", 2, /obj/item/attachable/scope, VENDOR_ITEM_REGULAR),

list("UNDERBARREL", -1, null, null),
list("Angled Grip", 2.5, /obj/item/attachable/angledgrip, VENDOR_ITEM_REGULAR),
list("Bipod", 2.5, /obj/item/attachable/bipod, VENDOR_ITEM_REGULAR),
list("Burst Fire Assembly", 1.5, /obj/item/attachable/burstfire_assembly, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 1.5, /obj/item/attachable/gyro, VENDOR_ITEM_REGULAR),
list("Laser Sight", 3, /obj/item/attachable/lasersight, VENDOR_ITEM_REGULAR),
list("Mini Flamethrower", 1.5, /obj/item/attachable/attached_gun/flamer, VENDOR_ITEM_REGULAR),
list("XM-VESG-1 Flamer Nozzle", 1.5, /obj/item/attachable/attached_gun/flamer_nozzle, VENDOR_ITEM_REGULAR),
list("U7 Underbarrel Shotgun", 1.5, /obj/item/attachable/attached_gun/shotgun, VENDOR_ITEM_REGULAR),
list("Underbarrel Extinguisher", 1.5, /obj/item/attachable/attached_gun/extinguisher, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 3, /obj/item/attachable/verticalgrip, VENDOR_ITEM_REGULAR),

)
Loading
Loading