Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Particle Accelerators being unable to activate tesla/singulo engine. #9942

Merged
merged 9 commits into from
Oct 9, 2023
Merged

Fixes Particle Accelerators being unable to activate tesla/singulo engine. #9942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f553391
Accelerated Particles pass through machines once again
HowToLoLu Oct 2, 2023
6fa4628
Plan B- trust me
HowToLoLu Oct 2, 2023
c146457
All part of the plan...
HowToLoLu Oct 2, 2023
d96bc77
The Plan (Proritizes Piercing over Phasing)
HowToLoLu Oct 2, 2023
c5b7c7f
Forgot about blobs for a moment there
HowToLoLu Oct 2, 2023
f1cc95a
Adds back the XORed stuff, shouldn't affect the behaviour change though
HowToLoLu Oct 4, 2023
e383406
Completely back to the original
HowToLoLu Oct 4, 2023
83999a8
Better than original here
HowToLoLu Oct 4, 2023
4262d82
There actually was a comment- updated now
HowToLoLu Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/modules/projectiles/projectile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
var/phasing_ignore_direct_target = FALSE
/// Bitflag for things the projectile should just phase through entirely - No hitting unless direct target and [phasing_ignore_direct_target] is FALSE. Uses pass_flags flags.
var/projectile_phasing = NONE
/// Bitflag for things the projectile should hit, but pierce through without deleting itself. Defers to projectile_phasing. Uses pass_flags flags.
/// Bitflag for things the projectile should hit, but pierce through without deleting itself. Considered before just purely phasing. Uses pass_flags flags.
var/projectile_piercing = NONE
/// number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc!
var/pierces = 0
Expand Down Expand Up @@ -570,10 +570,10 @@
* Return PROJECTILE_DELETE_WITHOUT_HITTING to delete projectile without hitting at all!
*/
/obj/projectile/proc/prehit_pierce(atom/A)
if((projectile_phasing & A.pass_flags_self) && (!phasing_ignore_direct_target || original != A))
return PROJECTILE_PIERCE_PHASE
if(projectile_piercing & A.pass_flags_self)
return PROJECTILE_PIERCE_HIT
if((projectile_phasing & A.pass_flags_self) && (!phasing_ignore_direct_target || original != A))
return PROJECTILE_PIERCE_PHASE
if(ismovable(A))
var/atom/movable/AM = A
if(AM.throwing)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/energy/accelerator_particle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
range = 10
speed = 1
projectile_piercing = PASSMOB | PASSANOMALY | PASSMACHINE
projectile_phasing = (ALL & (~PASSMOB) & (~PASSBLOB) & (~PASSANOMALY) & (~PASSMACHINE))
projectile_phasing = (ALL & ~(PASSMOB | PASSBLOB | PASSANOMALY | PASSMACHINE))
suppressed = SUPPRESSED_VERY //we don't want every machine that gets hit to spam chat
hitsound = null
irradiate = 60
Expand Down