cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] Walks back combat refactor, plus ammo balance changes (#8728)

Browse Source
This commit is contained in:
tacoguy7765093
2024-08-13 17:11:04 -05:00
committed by GitHub
parent 48ecf49f55
commit 99830636d9
53 changed files with 311 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/ammunition/ammo_boxes.dm
View File

@@ -342,7 +342,7 @@
icon_state = "sniper"
caliber = "14.5mm"
ammo_type = /obj/item/ammo_casing/a145
matter = list(MAT_STEEL = 8750)
matter = list(MAT_STEEL = 28000, MAT_PLASTEEL = 3500) //CHOMPedit Makes them a bit more expensive
max_ammo = 7
multiple_sprites = 1
@@ -351,8 +351,8 @@
desc = "A box of 14.5mm sabot rounds"
icon_state = "sniper"
caliber = "14.5mm"
ammo_type = /obj/item/ammo_casing/a145
matter = list(MAT_STEEL = 8750)
ammo_type = /obj/item/ammo_casing/a145/highvel //CHOMPedit
matter = list(MAT_STEEL = 2800, MAT_PLASTEEL = 7000) //CHOMPedit Makes them a bit more expensive
max_ammo = 7
multiple_sprites = 1
@@ -552,4 +552,4 @@
ammo_type = /obj/item/ammo_casing/a545/hunter
matter = list(MAT_STEEL = 18000)
max_ammo = 100
multiple_sprites = 1
multiple_sprites = 1

5
code/modules/projectiles/ammunition/rounds.dm
View File

@@ -398,11 +398,12 @@
icon_state = "lcasing"
caliber = "14.5mm"
projectile_type = /obj/item/projectile/bullet/rifle/a145
matter = list(MAT_STEEL = 1250)
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 500) //CHOMPedit Makes them a bit more expensive
/obj/item/ammo_casing/a145/highvel
desc = "A 14.5mm sabot shell."
projectile_type = /obj/item/projectile/bullet/rifle/a145
projectile_type = /obj/item/projectile/bullet/rifle/a145/highvel
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 1000) //CHOMPedit Makes them a bit more expensive
/obj/item/ammo_casing/a145/spent/Initialize()
..()

2
code/modules/projectiles/guns/energy/protector_vr.dm
View File

@@ -16,7 +16,7 @@
item_state = "gun"
fire_sound = 'sound/weapons/Taser.ogg'
projectile_type = /obj/item/projectile/beam/stun
projectile_type = /obj/item/projectile/beam/stun/med //CHOMPedit, default proj uses weak stun but firemode switches to med, fixing
modifystate = "stun"

3
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -522,6 +522,7 @@
bolt_name = "bolt"
sound_eject = 'sound/weapons/ballistics/boltactionopen.ogg'
sound_chamber = 'sound/weapons/ballistics/boltactionclose.ogg'
fire_sound = "sound/weapons/serdy/sks.ogg"
/obj/item/weapon/gun/projectile/automatic/serdy/mosin/scoped
name = "Scoped Mosin Nagant"
@@ -600,6 +601,7 @@
bolt_name = "bolt"
sound_eject = 'sound/weapons/ballistics/boltactionopen.ogg'
sound_chamber = 'sound/weapons/ballistics/boltactionclose.ogg'
fire_sound = "sound/weapons/serdy/sks.ogg"
/obj/item/weapon/gun/projectile/automatic/serdy/awp/ui_action_click()
scope()
@@ -636,6 +638,7 @@
bolt_name = "bolt"
sound_eject = 'sound/weapons/ballistics/boltactionopen.ogg'
sound_chamber = 'sound/weapons/ballistics/boltactionclose.ogg'
fire_sound = "sound/weapons/serdy/sks.ogg"
/obj/item/weapon/gun/projectile/automatic/serdy/hectate/ui_action_click()

2
code/modules/projectiles/projectile/bullets.dm
View File

@@ -451,7 +451,7 @@
desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
damage = 0 // It's a damn toy.
embed_chance = 0
agony = 50 // The riot part of the riot dart
agony = 20 // The riot part of the riot dart //CHOMPedit, nerf this >:3 old 50
nodamage = TRUE
sharp = FALSE
damage_type = HALLOSS