[MIRROR] Vendor and Phasegun adjustments (#10900)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-05-17 19:20:36 +02:00
committed by GitHub
co-authored by Cameron Lennox
parent 9a214e26ad
commit 1e5d31ff04
44 changed files with 620 additions and 762 deletions
@@ -21,5 +21,5 @@
#define AMMO_RUBBER_AGONY_MULT 2 //Multiply a projectile's damage by this to get the agony for it's rubber counterpart
#define AMMO_RUBBER_DAMAGE_MULT 0.25 //Rubber bullets still do some regular damage. This is the multiplier for their damage amount.
#define AMMO_HUNTER_SA_DAMAGE_MULT 1.2 //Multiply by original projectile damage to get SA_bonus_damage
#define AMMO_HUNTER_SA_DAMAGE_MULT 1.2 //Multiply by original projectile damage to get mob_bonus_damage
#define AMMO_HUNTER_DAMAGE_MULT 0.2 //Damage multiplier for hunter rounds, SA bonus makes up for it
@@ -43,7 +43,7 @@
return P.launch_from_gun(target, target_zone, user, params, angle_override, forced_spread, launcher)
if(ammo_flags & AMMO_FLAG_HUNTER)
var/obj/item/projectile/P = new projectile_type_real(src.loc)
P.SA_bonus_damage = round(P.damage * AMMO_HUNTER_SA_DAMAGE_MULT) //In exchange for SA damage
P.mob_bonus_damage = round(P.damage * AMMO_HUNTER_SA_DAMAGE_MULT) //In exchange for SA damage
P.damage = round(P.damage * AMMO_HUNTER_DAMAGE_MULT) //Severely reduced damage
qdel(src)
return P.launch_from_gun(target, target_zone, user, params, angle_override, forced_spread, launcher)
@@ -48,20 +48,20 @@
//Damage values back to old values for combat refactor walkback, keeping simplemob bonus damage.
/obj/item/projectile/beam/phaser //The "medium" phaser beam.
//damage = 10
SA_bonus_damage = 10
mob_bonus_damage = 10
/obj/item/projectile/beam/phaser/light
//damage = 5
SA_bonus_damage = 5
mob_bonus_damage = 5
/obj/item/projectile/beam/phaser/heavy
//damage = 12
SA_bonus_damage = 12
mob_bonus_damage = 12
/obj/item/projectile/beam/phaser/heavy/cannon
//damage = 15
SA_bonus_damage = 15
mob_bonus_damage = 15
/obj/item/projectile/scatter/laser
@@ -37,7 +37,7 @@
/obj/item/projectile/bullet/rifle/a545/hunter
damage = 15
SA_bonus_damage = 35 // 50 total on animals.
mob_bonus_damage = 35 // 50 total on animals.
SA_vulnerability = SA_ANIMAL
hud_state = "rifle_heavy"
@@ -124,7 +124,7 @@
/obj/item/projectile/bullet/rifle/a762/hunter
damage = 10
SA_bonus_damage = 30
mob_bonus_damage = 30
/obj/item/projectile/bullet/rifle/a545
damage = 20
@@ -140,7 +140,7 @@
/obj/item/projectile/bullet/rifle/a545/hunter
damage = 5
SA_bonus_damage = 25
mob_bonus_damage = 25
/obj/item/projectile/bullet/rifle/a145
damage = 60
@@ -15,13 +15,13 @@
//
/obj/item/projectile/energy/phase/bolt
range = 4
SA_bonus_damage = 15 // 30 total on animals
mob_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
mob_bonus_damage = 25 // 20 total on animals
hud_state = "taser"
/obj/item/projectile/energy/plasma/vepr
@@ -30,20 +30,20 @@
/obj/item/projectile/energy/phase
//damage = 5
SA_bonus_damage = 15
mob_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
mob_bonus_damage = 5
armor_penetration = 0
/obj/item/projectile/energy/phase/heavy
//damage = 5
SA_bonus_damage = 20
mob_bonus_damage = 20
armor_penetration = 0
/obj/item/projectile/energy/phase/heavy/cannon
//damage = 5
SA_bonus_damage = 35
mob_bonus_damage = 35
armor_penetration = 0
@@ -19,7 +19,7 @@
*/
/obj/item/projectile/bullet/magnetic/flechette/hunting
armor_penetration = 15
SA_bonus_damage = 20
mob_bonus_damage = 20
/*
/obj/item/projectile/bullet/magnetic/heated/weak
damage = 7
@@ -33,7 +33,7 @@
/obj/item/projectile/beam/phaser/shotgun
damage = 7
SA_bonus_damage = 7
mob_bonus_damage = 7
range = 4
icon_state = "phaser_heavy"
light_range = 3