cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time (#3478)

Browse Source 
* replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time

* a

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-18 21:00:40 +00:00
committed by GitHub
co-authored by Kylerace Gandalf2k15
parent 9e07263fdf
commit d2c0090c83
30 changed files with 173 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/gunpoint.dm
+10 -10
View File
@@ -135,21 +135,21 @@
qdel(src)
return
if(weapon.chambered && weapon.chambered.BB)
weapon.chambered.BB.damage *= damage_mult
if(weapon.chambered.BB.wound_bonus != CANT_WOUND)
weapon.chambered.BB.wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS
weapon.chambered.BB.bare_wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS
if(weapon.chambered && weapon.chambered.loaded_projectile)
weapon.chambered.loaded_projectile.damage *= damage_mult
if(weapon.chambered.loaded_projectile.wound_bonus != CANT_WOUND)
weapon.chambered.loaded_projectile.wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS
weapon.chambered.loaded_projectile.bare_wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS
if(weapon.check_botched(shooter))
return
var/fired = weapon.process_fire(target, shooter)
if(!fired && weapon.chambered?.BB)
weapon.chambered.BB.damage /= damage_mult
if(weapon.chambered.BB.wound_bonus != CANT_WOUND)
weapon.chambered.BB.wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS
weapon.chambered.BB.bare_wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS
if(!fired && weapon.chambered?.loaded_projectile)
weapon.chambered.loaded_projectile.damage /= damage_mult
if(weapon.chambered.loaded_projectile.wound_bonus != CANT_WOUND)
weapon.chambered.loaded_projectile.wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS
weapon.chambered.loaded_projectile.bare_wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS
qdel(src)
code/datums/components/pellet_cloud.dm
+9 -9
View File
@@ -106,9 +106,9 @@
zone_override = shooter.zone_selected
// things like mouth executions and gunpoints can multiply the damage and wounds of projectiles, so this makes sure those effects are applied to each pellet instead of just one
var/original_damage = shell.BB.damage
var/original_wb = shell.BB.wound_bonus
var/original_bwb = shell.BB.bare_wound_bonus
var/original_damage = shell.loaded_projectile.damage
var/original_wb = shell.loaded_projectile.wound_bonus
var/original_bwb = shell.loaded_projectile.bare_wound_bonus
for(var/i in 1 to num_pellets)
shell.ready_proj(target, user, SUPPRESSED_VERY, zone_override, fired_from)
@@ -118,12 +118,12 @@
else //Smart spread
spread = round((i / num_pellets - 0.5) * distro)
RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range)
shell.BB.damage = original_damage
shell.BB.wound_bonus = original_wb
shell.BB.bare_wound_bonus = original_bwb
pellets += shell.BB
RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
RegisterSignal(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range)
shell.loaded_projectile.damage = original_damage
shell.loaded_projectile.wound_bonus = original_wb
shell.loaded_projectile.bare_wound_bonus = original_bwb
pellets += shell.loaded_projectile
if(!shell.throw_proj(target, targloc, shooter, params, spread))
return
if(i != num_pellets)