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

[MIRROR] Vendor and Phasegun adjustments (#10900)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-05-17 10:20:36 -07:00
committed by GitHub
parent 9a214e26ad
commit 1e5d31ff04
44 changed files with 620 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/projectile.dm
View File

@@ -103,8 +103,7 @@
var/damage = 10
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE, HALLOSS, ELECTROCUTE, BIOACID, SEARING are the only things that should be in here
var/SA_bonus_damage = 0 // Some bullets inflict extra damage on simple animals.
var/SA_vulnerability = null // What kind of simple animal the above bonus damage should be applied to. Set to null to apply to all SAs.
var/mob_bonus_damage = 0 // Some bullets inflict extra damage on simple animals.
var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
var/taser_effect = 0 //If set then the projectile will apply it's agony damage using stun_effect_act() to mobs it hits, and other damage will be ignored
var/check_armour = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid
@@ -667,7 +666,7 @@
/obj/item/projectile/proc/get_structure_damage()
if(damage_type == BRUTE || damage_type == BURN)
return damage + SA_bonus_damage //CHOMP Edit: Added SA_bonus_damage to the returned value so that phaser can do damage against shields.
return damage + mob_bonus_damage //CHOMP Edit: Added mob_bonus_damage to the returned value so that phaser can do damage against shields.
return 0
//return 1 if the projectile should be allowed to pass through after all, 0 if not.

9
code/modules/projectiles/projectile/beams_ch.dm
View File

@@ -1,7 +1,6 @@
/obj/item/projectile/beam/phaser //The "medium" phaser beam.
damage = 20
SA_bonus_damage = 20
SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION)
mob_bonus_damage = 20
icon = 'icons/obj/projectiles_ch.dmi'
icon_state = "phaser"
light_color = "#F18F12"
@@ -13,7 +12,7 @@
/obj/item/projectile/beam/phaser/light
damage = 10
SA_bonus_damage = 10
mob_bonus_damage = 10
icon_state = "phaser_light"
light_range = 1.5
light_power = 0.3
@@ -24,7 +23,7 @@
/obj/item/projectile/beam/phaser/heavy
damage = 30
SA_bonus_damage = 30
mob_bonus_damage = 30
icon_state = "phaser_heavy"
light_range = 3
light_power = 1
@@ -35,7 +34,7 @@
/obj/item/projectile/beam/phaser/heavy/cannon
damage = 40
SA_bonus_damage = 40
mob_bonus_damage = 40
/obj/effect/projectile/tracer/phaser

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

@@ -216,8 +216,7 @@
/obj/item/projectile/bullet/rifle/a762/hunter // Optimized for killing simple animals and not people, because Balance(tm)
damage = 20
SA_bonus_damage = 50 // 70 total on animals.
SA_vulnerability = SA_ANIMAL
mob_bonus_damage = 50
hud_state = "rifle_heavy"
/obj/item/projectile/bullet/rifle/a545
@@ -238,8 +237,7 @@
/obj/item/projectile/bullet/rifle/a545/hunter
damage = 15
SA_bonus_damage = 35 // 50 total on animals.
SA_vulnerability = SA_ANIMAL
mob_bonus_damage = 35
hud_state = "rifle_heavy"
/obj/item/projectile/bullet/rifle/a145 // 14.5×114mm is bigger than a .50 BMG round.

10
code/modules/projectiles/projectile/energy.dm
View File

@@ -294,24 +294,20 @@
icon_state = "phase"
range = 13 //Chompedit This range was still awful
damage = 5
SA_bonus_damage = 45 // 50 total on animals
SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list
mob_bonus_damage = 45
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/light
range = 11 //Chompedit This range was absolutely pathetic
SA_bonus_damage = 35 // 40 total on animals
range = 4
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy
range = 16 //Chompedit This range was not great
SA_bonus_damage = 55 // 60 total on animals
range = 8
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy/cannon
range = 20 //Chompedit This range was mediocre, but not worth a cannon.
damage = 15
SA_bonus_damage = 60 // 75 total on animals
hud_state = "laser_heat"
*/

13
code/modules/projectiles/projectile/energy_ch.dm
View File

@@ -1,12 +1,12 @@
/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,15 +30,14 @@
fire_sound = 'sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds.
range = 13
damage = 5
SA_bonus_damage = 45
mob_bonus_damage = 45
armor_penetration = -35
SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/light
fire_sound = 'sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds.
range = 11
SA_bonus_damage = 35
mob_bonus_damage = 35
armor_penetration = -50
hud_state = "laser_heat"
@@ -46,7 +45,7 @@
fire_sound = 'sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds.
range = 16 //Chompedit This range was not great
damage = 10
SA_bonus_damage = 50
mob_bonus_damage = 50
armor_penetration = -25
hud_state = "laser_heat"
@@ -54,6 +53,6 @@
fire_sound = 'sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds.
range = 20 //Chompedit This range was mediocre, but not worth a cannon.
damage = 15
SA_bonus_damage = 60
mob_bonus_damage = 60
armor_penetration = -20
hud_state = "laser_heat"

3
code/modules/projectiles/projectile/magnetic.dm
View File

@@ -37,8 +37,7 @@
/obj/item/projectile/bullet/magnetic/flechette/hunting
name = "shredder slug"
armor_penetration = 30
SA_bonus_damage = 40
SA_vulnerability = SA_ANIMAL
mob_bonus_damage = 40
hud_state = "alloy_spike"
/obj/item/projectile/bullet/magnetic/heated

3
code/modules/projectiles/projectile_ch.dm
View File

@@ -6,8 +6,7 @@
name = "shrapnel"
fire_sound = 'sound/weapons/weaponsounds_shotgunshot.ogg'
damage = 10
SA_bonus_damage = 16 // Potential 156 Damage against demons at point blank.
SA_vulnerability = MOB_CLASS_DEMONIC | MOB_CLASS_ABERRATION
mob_bonus_damage = 16 // Potential 156 Damage against demons at point blank.
embed_chance = -1
pellets = 6
range_step = 1