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.

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 snowflaked turf armor #12000

Merged
merged 3 commits into from
Dec 15, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Dec 7, 2024

About The Pull Request

  • Simplifies turf armor.

  • Fixed ripley armor list(should be datum)

  • Fixed armor value readout

Why It's Good For The Game

For some reason there were turf procs that could be overridden to get a turfs armor.

Instead of just redefining armor...?

Bizarre. Im counting it as a relic from before atom_integrity and armor subtypes. Now we can simply set and forget the armor on typepath instead of worrying whether its "generated" or not.

Big benefit is that one less turf armor proc is snowflaked!

Testing Photographs and Procedure

Screenshots&Videos

Reinforced wall (54 hits to destroy)

Screenshot 2024-12-07 164312

Armorless iron wall varedited to have the same integrity values as rwalls (38 hits to destroy)

Screenshot 2024-12-07 164432

Changelog

🆑
refactor: genericizes how turfs handle armor
fix: fix ripley goliath armor runtime
fix: fix armor tag examination runtime
/:cl:

@@ -67,24 +56,6 @@
else
after_damage(damage_amount, damage_type, damage_flag)

//returns the damage value of the attack after processing the obj's various armor protections
/turf/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
Copy link
Contributor Author

@Tsar-Salat Tsar-Salat Dec 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can dump the whole child proc since its now a duplicate of /atom/proc/run_atom_armor()

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Dec 15, 2024
Merged via the queue into BeeStation:master with commit d473da7 Dec 15, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants