Please refer to #20867 and #20870 for a easier view of the changes. Those two PRs show all meaningful changes (hopefully) and doesn't show the files changed with just 3 lines changed.
This PR does three things:
It makes all children of /obj/ use the same damage system.
Previously to make your new machine/structure be destroyable you needed to give it a var/health, and its own version of many damage related proc such as bullet_act(), take_damage(), attacked_by(), attack_animal(), attack_hulk(), ex_act(), etc... But now, all /obj/ use the same version of those procs at the /obj/ level in code/game/obj_defense.dm. All these obj share the same necessary vars: obj_integrity (health), max_integrity, integrity_failure (optional, below that health level failure happens), and the armor list var which was previously only for items, as well as the resistance_flags bitfield. When you want your new object to be destroyable, you only have to give it a value for those vars and maybe override one proc if you want a special behavior but that's it. This reorganization removes a lot of copypasta (most bullet_act() version for each obj were nearly identical). Two new elements are added to the armor list var: fire and acid armor values.
How much damage an obj take depends on the armor value for each damage category. But some objects are INDESTRUCTIBLE and simply never take any damage no matter the type.
The armor categories are:
-melee(punches, item attacks, xeno/animal/hulk attacks, blob attacks, thrown weapons)
-bullet
-laser
-energy (used by projectiles like ionrifle, taser, and also by EMPs)
-bio (unused for this, only here because clothes use them when worn)
-rad (same)
-bomb (self-explanatory)
-fire (for fire damage, not for heat damage though)
-acid
For machines and structures, when their health reaches zero the object is not just deleted but gets somewhat forcedeconstructed (the proc used is shared with the actual deconstruction system) which can drops things. To not frustrates players most of these objects drop most of the elements necessary to rebuild them (think window dropping shards). Machines drop a machine frame and all components for example (but the frame can then be itself smashed to pieces).
For clothes, when they are damaged, they get a "damaged" overlay, which can also be seen when worn, similar to the "bloody" overlay.
It refactors acid. See #20537.
Some objects are ACID_PROOF and take no damage from acid, while others take varying amounts
of damage depending on their acid armor value. Some objects are even UNACIDABLE, no acid effect can even land on them. Acid on objects can be washed off using water.
It changes some aspect of damage from fires.
All /obj/ can now take fire damage and be flammable, instead of just items. And instead of having just FLAMMABLE objs that become ON_FIRE as soon as some fire touch them (paper), we now have objects that are non flammable but do take damage from fire and become ashes if their health reaches zero (only for items). The damage taken varies depending on the obj's fire armor value and total health. There's also still obj and items that are FIRE_PROOF (although some might still be melted by lava if they're not LAVA_PROOF).
When a mob is on fire, its clothes now take fire damage and can turn to ashes. Similarly, when a mob takes melee damages, its clothes gets damaged a bit and can turn to shreds. You can repair clothes with cloth that is produceable by botany's biogenerator.
It also does many minor things:
Clicking a structure/machine with an item on help intent never results in an attack (so you don't destroy a structure while trying to figure out which tool to use).
I moved a lot of objects away from /obj/effect, it should only be used for visual effects, decals and stuff, not for things you can hit and destroy.
I tweaked a bit how clothes shredding from bombs work.
I made a machine or structure un/anchorable with the wrench, I don't remember which object...
Since I changed the meaning of the FIRE_PROOF bitflag to actually mean fire immune, I'm buffing the slime extract that you apply on items to make them fire proof. well now they're really 100% fire proof!
animals with environment_smash = 1 no longer one-hit destroy tables and stuff, we give them a decent obj_damage value so they can destroy most obj relatively fast depending on the animal.
Probably a million things I forgot.
If you want to know how the damage system works all you need is the three obj vars "obj_integrity", "max_integrity", "integrity_failure", as well as the armor list var and the resistance_flags bitfield, and read the file obj_defense.dm
* a very calming act
when the world is too much, too fast
* i'm tired
but i have to be efficient, infinite
* lick your lips at the sight of me
a fantasy made reality
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.
Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
* Random dirtiness refactor
* Further speeds up MakeDirty
* Removes legacy code
* Replaces flag numbers with defines
* Adds another define in place of an integer
* Re-adds attackby arguments in holofloors
Added a submenu to the Station Blueprints that lists wire color purposes for the round for NT made items
Does not list duds
Removed WIRE_ELECTRIFY as it was synonymous with WIRE_SHOCK
Added a Experimental Limb Grower to the medbay department, now medical stuff can grow synthetic limbs using Synthflesh to help crew that suffer any work related accidents.
* Only holy water will clean blood runes
* macro!
* holy no longer required
* i am far too unethical and spite driven half the time
* it appears code done in the middle of the night in the hope that oranges hasn't merged my pr isn't always that good
* Bringing computers to the light side
Bringing computers to the light side
* Lighter and lighter
Lighter and lighter
* Missed some lists
Missed some lists
* Text to defines
Text to defines
* Last commit
Last commit
* How did this even get here
How did this even get here
* Removing bad stuff
Removing bad stuff
* Fixes verb adding and idle check
Fixes verb adding and idle check
* Adds semi-transparent colored fullscreen overlays which are used by glasses with tint_color.
Currently only red, blue, and green are available. And only nightvision glasses currently have a tint_color when worn (green).
* Completely rewrites how I did color tinting. We now use datum/client_colour and the client's color var.
I fixed items in our inventory UI being colored when using client.color.
I added an altclick() option on all glasses to toggle a new pref regarding the use of glass coloring your view.
I made a lot more glasses use vision coloring.
I fixed Thermal HUD Scanner not having its action button to switch hud type.
Better comments explaining the purpose of everything
Better name scheme: color_matrix_foo() instead of just color_foo()
Contrast was completely wrong. Total derpage, formula is now right
A few examples of interesting and useful matrices. And by "a few" I mean 3, but whatever
Addition and multiplication
Single-axis rotations
color_matrix2color_hex and color_hex2color_matrix in case anybody wants to convert back and forth for whatever reason
All values within the matrix are rounded to the thousandths place to cut down on floating point error and 1.000000001 type values
The megaphone is no longer used by clicking it and entering a message, you simply keep it in your active hand and talk normally.
Remove the insults feature of the emagged megaphone. The span of the emagged megaphone is now big and red.
* Adds brass, used to construct various brass objects
* brasshole
* give em the brass
* give em more brass
* DYNAMIC
* VAR MURDER SPREE
* brassy
* acceptaphil
* this is super against my general preferences but eeeeeh sure okay i guess
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.
- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.
* More merge conflict fixes and adding the new files I forgot to add.
* of course I forgot birdstation
* More typos and stuff I forgot to undo.
* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)
* Fixing more conflicts with remie's multihands PR.
* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().
* Derp, forgot to remove debug message.
* goals initial
* Revamps Meteor Shield
Minor UI touchups.
Fixes DNA Vault completion check.
* Allows admins to varedit goal completion.
Does not clear dna probe on upload.
* Missed icons and template.
* Spelling, proper attackby returns
* Meteor shield emag effect only works when it's active.
* Admin panel for station goals.
* Some visual feedback and spans.
* Announcement now shows the goal name.
* Fixes
* Fixes and adminlog
* Tgui build
* Moves the information to intercept report except for admin spawned ones.
* HIEROPHANT
* whoops
* that'd be hilarious but unwise
* BIRD_SCORE
* density
* BIRD THREAT
* maybe a threat tm
* danger boss
* it's always the paren
* bird murder
* recall
* no message
* yelling bird
* time
time
come on, time
time
shades
* A ruin!
* I think five blasts is enough
* birdboss wants you dead
* giant boss arena
* hierophant no longer literally unfightable
* smaller ruin?
* no longer innate
* can toggle friendly fire, teleport is AoE
* comments!
* just fucking spawn the arena wew
* heal on resetting
* not as common
* I cannot be trusted
* eeeh
* !
* keep it off the station
* as common as sin
* stop cheesing the boss you asshole
* this looks better
* that ruin didn't even exist what the fuck
* wew
* rip
* it doesn't need full healing if it heals for half when it resets
* good for fighting mobs
* rune where you are
* mechanics; armor doesn't fucking matter rip you
* armor matters but not much so
* )
* meaner than hell and more likely to kill you
* remove those beasts from my beautiful square house
* fix
* you should be able to tell what it's doing, even if you can't actually react to it
being totally unable to tell what the fuck just killed you is bad design, you should know how you died even if you couldn't do shit
rip 3x3 chaser
* start higher scale to the same
* the ruin that doesn't exist and costs 10 points to place
* now what's all this commented out stuff hmmmmmmmmmmm
what could it possibly be
* accurate
* tracking
* boring unused lore
* it needs to be open, oranges. open.
* I did that specifically to note which commit it was on ree
* oh there's a proc for that. duh.
* logging is good
* horrifying
* the marginal kindness of a giant bird boss
* ruin tweak
* idiot bird
* adjust
- Fixed swap hands finding the wrong index
- Fixed dual HANDS_LAYER reading for abductors
- Fixed old comments
- Removed lingering pieces of a previous version
- Finish hooking up stripping
* Adds framework for status effects
* Completes the Renew define
* Lots of work, refactoring
* Further work on status effects
* Gives status effects autism
* Fixes and stuff
🆑 Joan
rscadd: Once the blob alert message is sent in the blob game mode, all mobs get to see how many tiles the blob has until it wins, via the Status tab.
rscdel: Removed/merged a bunch of blob chems, you probably don't care about the specifics.
tweak: The remaining blob chems should, overall, be more powerful.
tweak: Shield blobs soak brute damage less well.
tweak: Flashbangs do higher damage to blobs up close, but their damage falls off faster.
experiment: Shield blobs now cost 15 resources to make instead of 10. Node blobs now cost 50 resources to make instead of 60.
experiment: Expanding/attacking now costs 4 resources instead of 5, and blobs can now ATTACK DIAGONALLY. Diagonal attacks are weaker than normal attacks, especially against cyborgs(which may be entirely immune, depending), and they remain unable to expand diagonally.
rscadd: Shield blobs no longer block atmos while under half health. Shield blobs are still immune to fire, even if they can't block atmos.
tweak: Blobs should block explosions less well.
rscadd: Blob cores and nodes are no longer immune to fire and no longer block atmos.
rscadd: Blobs can only auto-expand one tile at a time per expanding thing, and should be easier to beat back in general.
tweak: Blobbernauts now attack faster.
tweak: Blob Overminds attack mobs slower but can attack non-mobs much faster.
rscadd: Blob Overminds start with some amount of resources; in the gamemode, it's 80 divided by the number of overminds, in the event, it's 20 plus the number of active players, and otherwise, it's 60.
bugfix: You can no longer move blob cores into space, onto the mining shuttle, white ship, gulag shuttle, or solars.
bugfix: Blob rounds might be less laggy, if they were laggy?
tweak: Blobs don't heal as fast, excluding the core.
experiment: Blobs are marginally less destructive to their environment.
/🆑
Objective:
maybe possibly make blob something you can fight instead of wishing the blob didn't exist?
but also make the blob lethal enough that it can still deal with the crew if it knows what it's doing(and still lose if the crew is good instead of snowballing forever)
* Clockcult fixes and tweaks
* die but don't stay dead
* stay dead but never die
* instinct
* unreadable dark magic
* idiocy knows no bounds
* danger close
* like four fucking times faster
* superdynamics
* Xenomorph Tweaks
- Xenos are now considered female.
- (Nerf) Hunter pounce are now always blocked by shields, and may be
blocked more often by other protective items.
- (Buff) Alien Queen is 2 points faster.
- Adjusted larva growth sprites.
- Removed 20% facehugger failure chance for masks.
- (Tweak) Disarm now always forces a person to drop an item in the
active hand, and if a person's hand is empty/undroppable, Disarm will
always result in a tackle.
- (Nerf) Borgs are no longer stunned by Xeno disarms.
- (Buff) Tail Sweep now has a slightly longer stun.
* Teaks and Fixes
- Pouncing is now a LEAP_ATTACK, and is now ALWAYS blocked by shields.
- Changed Disarm combat for borgs: First disarm strike disables the
borg's active module. The second strike pushes the borg back and stuns
it.
* Mini Fix
* Get that one too
phil235
Joan Lung
phil235
Xhuis
Cyberboss
Incoming
Cheridan
Hamzah
AnturK
Razharas
MrPerson
Remie Richards
Ergovisavi
Shadowlight213
KorPhaeron
oranges
Kyle Spier-Swenson
GunHog
lordpidey