Combat Refactor (#6910)

Co-authored-by: Fluff <jasper0601.com@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com> Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
2025-12-12 03:02:54 +00:00 · 2023-09-26 09:45:11 -04:00
parent 662e11bb01
commit 1f87db4602
40 changed files with 1164 additions and 163 deletions
--- a/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
+++ b/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
@@ -49,7 +49,7 @@

 /obj/item/projectile/bullet/rifle/clockwork
 	fire_sound = 'modular_chomp/sound/weapons/clockwork/cwc_rifle_fire.ogg'
-	damage = 20
+	damage = 10
 	hud_state = "rifle_heavy"

 /obj/item/projectile/beam/shock/clockwork
@@ -62,7 +62,7 @@
 	tracer_type = /obj/effect/projectile/tracer/voltbeam
 	impact_type = /obj/effect/projectile/impact/voltbeam

-	damage = 40
+	damage = 20
 	agony = 15
 	eyeblur = 2
 	hitsound = 'sound/effects/lightningshock.ogg'
--- a/modular_chomp/code/modules/projectiles/guns/ammo.dm
+++ b/modular_chomp/code/modules/projectiles/guns/ammo.dm
@@ -0,0 +1,230 @@
+/obj/item/ammo_magazine/mfoam_dart/pistol
+	max_ammo = 22
+
+/obj/item/ammo_magazine/mfoam_dart/smg
+	max_ammo = 50
+
+/obj/item/ammo_magazine/s357
+	max_ammo = 15
+
+/obj/item/ammo_magazine/s38
+	max_ammo = 15
+
+// Makarov
+/obj/item/ammo_magazine/m38/makarov
+	max_ammo = 20
+
+/obj/item/ammo_magazine/m38/giskard
+	max_ammo = 25
+
+/obj/item/ammo_magazine/m45
+	max_ammo = 17
+
+/obj/item/ammo_magazine/m45uzi
+	max_ammo = 40
+
+/obj/item/ammo_magazine/m45tommy
+	max_ammo = 50
+
+/obj/item/ammo_magazine/m45tommydrum
+	max_ammo = 125
+
+/obj/item/ammo_magazine/clip/c45
+	max_ammo = 22
+
+/obj/item/ammo_magazine/s45
+	max_ammo = 15
+
+/obj/item/ammo_magazine/m5mmcaseless
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m9mm
+	max_ammo = 25
+
+/obj/item/ammo_magazine/m9mm/large
+	max_ammo = 42
+
+/obj/item/ammo_magazine/m9mm/compact
+	max_ammo = 20
+
+/obj/item/ammo_magazine/m9mm/luger
+	max_ammo = 20
+
+/obj/item/ammo_magazine/m9mmt
+	max_ammo = 50
+
+/obj/item/ammo_magazine/clip/c9mm
+	max_ammo = 22
+
+/obj/item/ammo_magazine/m9mmAdvanced
+	max_ammo = 52
+
+/obj/item/ammo_magazine/m10mm
+	max_ammo = 50
+
+/obj/item/ammo_magazine/m10mm/pistol
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m545
+	max_ammo = 50
+
+/obj/item/ammo_magazine/m545/ext
+	max_ammo = 80
+
+/obj/item/ammo_magazine/m545/practice/ext
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m545/ap/ext
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m545/hunter/ext
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m545/small
+	max_ammo = 25
+
+/obj/item/ammo_magazine/clip/c545
+	max_ammo = 12
+
+/obj/item/ammo_magazine/m545saw
+	max_ammo = 150
+
+/obj/item/ammo_magazine/m44
+	max_ammo = 17
+
+/obj/item/ammo_magazine/clip/c44
+	max_ammo = 22
+
+/obj/item/ammo_magazine/s44
+	max_ammo = 15
+
+/obj/item/ammo_magazine/m762
+	max_ammo = 25
+
+/obj/item/ammo_magazine/m762/ext
+	max_ammo = 50
+
+/obj/item/ammo_magazine/m762enbloc
+	max_ammo = 20
+
+/obj/item/ammo_magazine/clip/c762
+	max_ammo = 12
+
+/obj/item/ammo_magazine/m762svd
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m12gdrum
+	max_ammo = 60
+
+/obj/item/ammo_magazine/clip/c12g
+	max_ammo = 5
+
+/obj/item/ammo_magazine/m75
+	max_ammo = 10
+
+//zz_magazines
+/obj/item/ammo_magazine/a57p90
+	max_ammo = 125
+
+/obj/item/ammo_magazine/m10mm
+	max_ammo = 50
+
+/obj/item/ammo_magazine/a57
+	max_ammo = 50
+
+/obj/item/ammo_magazine/mp5mag
+	max_ammo = 75
+
+/obj/item/ammo_magazine/pitchmag
+	max_ammo = 75
+
+/obj/item/ammo_magazine/asval
+	max_ammo = 50
+
+/obj/item/ammo_magazine/akm
+	max_ammo = 75
+
+/obj/item/ammo_magazine/akm/rubber
+	max_ammo = 75
+
+/obj/item/ammo_magazine/ak74
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m16
+	max_ammo = 75
+
+/obj/item/ammo_magazine/m16/patriot
+	max_ammo = 250
+
+/obj/item/ammo_magazine/m41
+	max_ammo = 100
+
+/obj/item/ammo_magazine/m41/rubber
+	max_ammo = 100
+
+/obj/item/ammo_magazine/t12
+	max_ammo = 100
+
+/obj/item/ammo_magazine/clip/sks
+	max_ammo = 25
+
+/obj/item/ammo_magazine/clip/mosin
+	max_ammo = 12
+
+/obj/item/ammo_magazine/type901
+	max_ammo = 75
+
+/obj/item/ammo_magazine/ar10
+	max_ammo = 50
+
+/obj/item/ammo_magazine/fal
+	max_ammo = 50
+
+/obj/item/ammo_magazine/awp
+	max_ammo = 12
+
+/obj/item/ammo_magazine/hectate
+	max_ammo = 17
+
+/obj/item/ammo_magazine/ppsh
+	max_ammo = 177
+
+/obj/item/ammo_magazine/plamya
+	max_ammo = 125
+
+/obj/item/ammo_magazine/strela
+	max_ammo = 17
+
+/obj/item/ammo_magazine/molniya
+	max_ammo = 250
+
+/obj/item/ammo_magazine/kord
+	max_ammo = 250
+
+/obj/item/ammo_magazine/pkm
+	max_ammo = 250
+
+/obj/item/ammo_magazine/rpd
+	max_ammo = 250
+
+/obj/item/ammo_magazine/akm/drum
+	max_ammo = 187
+
+/obj/item/ammo_magazine/ssp4
+	max_ammo = 20
+
+/obj/item/ammo_magazine/makarov
+	max_ammo = 20
+
+/obj/item/ammo_magazine/m9mm/vp70
+	max_ammo = 37
+
+
+/obj/item/ammo_magazine/tp23s
+	max_ammo = 25
+
+/obj/item/ammo_magazine/tp23
+	max_ammo = 35
+
+/obj/item/ammo_magazine/s45lc
+	max_ammo = 15
--- a/modular_chomp/code/modules/projectiles/guns/beam.dm
+++ b/modular_chomp/code/modules/projectiles/guns/beam.dm
@@ -0,0 +1,81 @@
+/obj/item/projectile/beam
+	damage = 20
+
+/obj/item/projectile/beam/weaklaser
+	damage = 10
+	armor_penetration = -25
+
+/obj/item/projectile/beam/smalllaser
+	damage = 10
+
+
+/obj/item/projectile/beam/burstlaser
+	damage = 10
+	armor_penetration = 10
+
+/obj/item/projectile/beam/midlaser
+	damage = 20
+	armor_penetration = 20
+
+/obj/item/projectile/beam/heavylaser
+	damage = 25
+	armor_penetration = 30
+
+/obj/item/projectile/beam/heavylaser/cannon
+	damage = 30
+	armor_penetration = 50
+
+/obj/item/projectile/beam/xray
+	damage = 20
+	armor_penetration = 50
+
+
+/obj/item/projectile/beam/gamma
+	damage = 6
+	armor_penetration = 90
+
+/obj/item/projectile/beam/cyan
+	damage = 20
+
+/obj/item/projectile/beam/sniper
+	damage = 20
+	armor_penetration = 40
+
+/obj/item/projectile/beam/precursor
+	damage = 25
+
+/obj/item/projectile/beam/phaser //The "medium" phaser beam.
+	damage = 10
+	SA_bonus_damage = 10
+
+/obj/item/projectile/beam/phaser/light
+	damage = 5
+	SA_bonus_damage = 5
+
+/obj/item/projectile/beam/phaser/heavy
+	damage = 12
+	SA_bonus_damage = 12
+
+
+/obj/item/projectile/beam/phaser/heavy/cannon
+	damage = 15
+	SA_bonus_damage = 15
+
+
+/obj/item/projectile/scatter/laser
+	damage = 20
+
+	submunition_spread_max = 40
+	submunition_spread_min = 10
+
+	submunitions = list(
+		/obj/item/projectile/beam/prismatic = 4
+		)
+
+/obj/item/projectile/beam/prismatic
+	name = "prismatic beam"
+	icon_state = "omnilaser"
+	damage = 5
+	damage_type = BURN
+	check_armour = "laser"
+	light_color = "#00C6FF"
--- a/modular_chomp/code/modules/projectiles/guns/bullet.dm
+++ b/modular_chomp/code/modules/projectiles/guns/bullet.dm
@@ -0,0 +1,129 @@
+/obj/item/projectile/bullet
+	damage = 25 //seems many bullets use this vaule for some reason
+
+/obj/item/projectile/bullet/pistol
+	damage = 10
+
+/obj/item/projectile/bullet/pistol/ap
+	damage = 5
+	armor_penetration = 30
+
+/obj/item/projectile/bullet/pistol/hp
+	damage = 15
+	armor_penetration = -50
+
+/obj/item/projectile/bullet/pistol/medium
+	damage = 15
+
+/obj/item/projectile/bullet/pistol/medium/ap
+	damage = 10
+	armor_penetration = 15
+
+/obj/item/projectile/bullet/pistol/medium/hp
+	damage = 20
+	armor_penetration = -50
+
+/obj/item/projectile/bullet/pistol/strong
+	damage = 30
+
+/obj/item/projectile/bullet/pistol/rubber/strong
+	damage = 10
+	agony = 60
+
+/obj/item/projectile/bullet/pistol/rubber
+	damage = 5
+	agony = 40
+	embed_chance = 0
+
+/obj/item/projectile/bullet/shotgun
+	damage = 30
+	armor_penetration = 40
+
+/obj/item/projectile/bullet/shotgun/beanbag
+	damage = 5
+	agony = 60
+	embed_chance = 0
+
+/obj/item/projectile/bullet/pellet/shotgun
+	damage = 6
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+
+/obj/item/projectile/bullet/pellet/shotgun/flak
+	damage = 2
+	range_step = 2
+	spread_step = 30
+	armor_penetration = 10
+
+/obj/item/projectile/bullet/shotgun/ion
+	damage = 15
+
+
+/* "Rifle" rounds */
+
+/obj/item/projectile/bullet/rifle
+	armor_penetration = 15
+	penetrating = 1
+
+/obj/item/projectile/bullet/rifle/a762
+	damage = 25
+
+/obj/item/projectile/bullet/rifle/a762/sniper
+	hitscan = 1
+
+/obj/item/projectile/bullet/rifle/a762/ap
+	damage = 20
+	armor_penetration = 50
+
+/obj/item/projectile/bullet/rifle/a762/hp
+	damage = 30
+	armor_penetration = -50
+	penetrating = 0
+
+/obj/item/projectile/bullet/rifle/a762/hunter
+	damage = 10
+	SA_bonus_damage = 30
+
+/obj/item/projectile/bullet/rifle/a545
+	damage = 20
+
+/obj/item/projectile/bullet/rifle/a545/ap
+	damage = 15
+	armor_penetration = 50
+
+/obj/item/projectile/bullet/rifle/a545/hp
+	damage = 30
+	armor_penetration = -50
+	penetrating = 0
+
+/obj/item/projectile/bullet/rifle/a545/hunter
+	damage = 5
+	SA_bonus_damage = 25
+
+/obj/item/projectile/bullet/rifle/a145
+	damage = 60
+	stun = 3
+	weaken = 3
+	penetrating = 5
+	armor_penetration = 80
+
+/obj/item/projectile/bullet/rifle/a145/highvel
+	damage = 20
+	stun = 3
+	weaken = 3
+	penetrating = 20
+	armor_penetration = 90
+
+/obj/item/projectile/bullet/rifle/a44rifle
+	damage = 30
+
+/obj/item/projectile/bullet/pellet
+	damage = 10
+
+/obj/item/projectile/bullet/pellet/fragment
+	damage = 5
+	muzzle_type = null
+
+/obj/item/projectile/bullet/pellet/fragment/strong
+	damage = 7
--- a/modular_chomp/code/modules/projectiles/guns/energy.dm
+++ b/modular_chomp/code/modules/projectiles/guns/energy.dm
@@ -0,0 +1,49 @@
+//I think most of the energy weapons are security but I regonize a few of this from the aliens and drones.
+/obj/item/projectile/energy/excavate
+	damage = 20
+	armor_penetration = 60
+
+/obj/item/projectile/energy/excavate/weak
+	damage = 10
+	excavation_amount = 100
+
+/obj/item/projectile/energy/acid
+	damage = 15
+
+/obj/item/projectile/energy/neurotoxin/toxic
+	damage = 10
+
+/obj/item/projectile/energy/phase/bolt
+	range = 4
+	SA_bonus_damage = 15	// 30 total on animals
+	icon_state = "cbbolt"
+	hud_state = "taser"
+
+/obj/item/projectile/energy/phase/bolt/heavy
+	range = 4
+	SA_bonus_damage = 25	// 20 total on animals
+	hud_state = "taser"
+
+/obj/item/projectile/energy/plasma/vepr
+	damage = 30
+	armor_penetration = 15
+
+/obj/item/projectile/energy/phase
+	damage = 5
+	SA_bonus_damage = 15
+	armor_penetration = 0
+	SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION)
+
+/obj/item/projectile/energy/phase/light
+	SA_bonus_damage = 5
+	armor_penetration = 0
+
+/obj/item/projectile/energy/phase/heavy
+	damage = 5
+	SA_bonus_damage = 20
+	armor_penetration = 0
+
+/obj/item/projectile/energy/phase/heavy/cannon
+	damage = 5
+	SA_bonus_damage = 35
+	armor_penetration = 0
--- a/modular_chomp/code/modules/projectiles/guns/magnetic.dm
+++ b/modular_chomp/code/modules/projectiles/guns/magnetic.dm
@@ -0,0 +1,38 @@
+//Oh this are apparently a thing
+// Rod for railguns. Slightly less nasty than the sniper round.
+/obj/item/projectile/bullet/magnetic
+	damage = 33
+
+/obj/item/projectile/bullet/magnetic/slug
+	damage = 37
+
+/obj/item/projectile/bullet/magnetic/flechette
+	damage = 10
+
+/obj/item/projectile/bullet/magnetic/flechette/small
+	damage = 6
+
+/obj/item/projectile/bullet/magnetic/flechette/small/khi
+	damage = 9
+
+/obj/item/projectile/bullet/magnetic/flechette/hunting
+	armor_penetration = 15
+	SA_bonus_damage = 20
+
+/obj/item/projectile/bullet/magnetic/heated/weak
+	damage = 7
+
+/obj/item/projectile/bullet/magnetic/fuelrod
+	damage = 15
+
+/obj/item/projectile/bullet/magnetic/fuelrod/tritium
+	damage = 20
+
+/obj/item/projectile/bullet/magnetic/fuelrod/phoron
+	damage = 17
+
+/obj/item/projectile/bullet/magnetic/fuelrod/supermatter
+	damage = 7
+
+/obj/item/projectile/bullet/magnetic/bore
+	damage = 10
--- a/modular_chomp/code/modules/projectiles/mob.dm
+++ b/modular_chomp/code/modules/projectiles/mob.dm
@@ -6,7 +6,7 @@
 	icon_state = "impact_beam_heavy"
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	damage = 60
+	damage = 25
 	armor_penetration = 30
 	light_range = 3
 	light_power = 1
@@ -17,7 +17,7 @@
 	icon_state = "impact_laser"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	damage = 40
+	damage = 20
 	armor_penetration = 10
 	damage_type = BURN
 	check_armour = "laser"
@@ -27,7 +27,7 @@
 	icon_state = "impact_laser"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	damage = 30
+	damage = 10
 	armor_penetration = 0
 	damage_type = BURN
 	check_armour = "laser"
@@ -74,7 +74,7 @@
 	light_color = "#FF0099"

 	hud_state = "plasma_rifle"
-	damage = 48
+	damage = 25
 	armor_penetration = 10