* Make energy guns able to use burst fire.
* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.
Syringe gun, energy guns and magic guns can now use burst fire.
* fixing merge conflict shit
* fixing map conflicts
* more map conflict fix
* two tiny fixes.
* tiny tweak
* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm
* map conflict fixes
* This doesn't actually matter, because you're dead forever once it happens...
* is this entire pr chaff for something else
* you'll do it? nah, fuck that I'll do it
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
* Replaces a bunch of istypes with their proper macros
* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it
* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
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.
Adds a large ash and large molten item decal (for future use)
simplifies decal/cleanable/replace_decal() code a bit.
Changes construction() proc to on_construction() for consistency, same for deconstruction().
Made a deconstruct() proc for machinery and computer (also for future use).
* - 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.
* adds growth serum, puts it in fly amanita
* changes reagent check to cycle check
* Growth serum now works, and if you have more than 20 units in you at a time, you will pulsate between sizes.
* Update other_reagents.dm
Removes erroneous typecast.
* Names the cannibas leaves and enables weapon/grown to be added to the smart fridge
* Gives cannabis seed packets sprites consistent with other seed packets, and so they also look different.
Added a new plant to the game to encourage the Chef to be a more relevant job, alongside a recipe for a food related to it. Throw a cannabis leaf on a table and check the recipes list to find it.
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
You can now remove all plants and weeds from a hydroponics tray by using a spade on it. This process takes five seconds.
Hydroponics trays now have a unique variable, using_irrigation, that replaces the previous iteration of irrigation hoses that used the anchored variable to track it instead.
Fixes a possible runtime error that can occur when using irrigation hoses to transfer non-water reagents (specifically nutrients, although it hasn't been tested with any other reagents).
Added meatwheat, which is mutated from normal wheat plants. It's essentially a blood-red version of wheat that can be crushed into a meat slab by activating it with an empty hand. These meatwheat clumps are slightly bloodier than normal meat, but it still works for recipes that use normal meat slabs.
Added ambrosia gaia, which is mutated from ambrosia deus. It's yellow, glows brightly, and contains only earthsblood (renamed adminordrazine). The plant is destroyed after a single harvest, and its product can be planted in an empty hydroponics tray to cause it to become self-sufficient, no longer requiring nutrients, water, or weed/pest removal. Gaia-blessed trays will glow bright yellow in comparison to normal trays, and gaia-blessed soil will turn yellow. Both will emit light.
Added cherry bombs, which are mutated from blue cherries. They're orange and have a black stem, and start with a tiny amount of black powder in them. Activating them in an empty hand will ignite them and cause them to explode after three seconds, with explosion strength varying based on potency (at the most, it's around that of a minibomb).
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
* Re-making the branch and PR of demon. See #15118 for the old PR
* Adds toy demonologist to arcade machine reward list.
* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.
Suiciding with signed contract now uses forcesay instead of say.
* Fixes compile errors.
Re factors contracts to be subtypes rather than datums. <--- incomplete, still need to summon them appropriately.
* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM
* Fixes compile errors
* Corrects orientation of true demon sprite
* Begins work on the sNPC for the true demon/ arch-demon
* Added funeral garment sprites. These will be used in banishment rituals (hopefully)
* Stashing my work so I can move to another computer.
Re-working the true-demon, it will be a carbon rather than a simple mob.
* Revert "Stashing my work so I can move to another computer."
This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.
* Git exploded for me, so I have to make a new branch with EVERYTHING. sorry.
* Fixes compile error
* Ghosts can now click on an arch demon to become a slaughter demon
* Begins to convert demons into a carbon rather than simple mob.
* Demons now resurrect if not banished.
* Beepsky now properly tells security chat about the level 666 threat.
* Contracts now work again.
* old spells now get removed properly.
* adding pitchfork sprites
* Adds hud for the true-demon. Not functional.
* Fixes another error in the demon hud. Still broken.
* Demons are no longer immortal, demon huds work properly now. (it's barebones, but it works.)
* Fixes the "Have mortals sign at least # contracts of TYPE" objective
* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.
* Adds huds for demons/sintouched/soulless, however they are currently unused.
* Updates the demon's hud to work with the recent hud changes.
* Cleaned up infernal jaunt, it works a lot better now and is less buggy.
* Revival contracts now actually take your soul.
* Fixes#16513
* Replaces the infinite slaughter demons with infinite imps. Sprites for imps are still needed.
* Adds sprite for imps. It's a redder, smaller slaughter demon.
* Fixes lack of icon for pitchforks
* Gives summon wealth a more appropriate icon.
* Fixes small part I forgot to merge.
* Fixes a few bugs with demonic resurrection. It's still very buggy.
* Derp, my bad, I didn't mean to admin myself on the main server.
* Fixes edge case of demonic resurrection failing. Debraining the demon is NOT supposed to be an alternative for the banishment ritual.
* Also did not mean to change this config file.
* Fixes another error in type 1 demonic resurrection. It works properly now.
* Updates employment contract text.
* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.
* Replaces toy demonologist with toy demonomicon. It still works the same, just different icon/name.
* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.
I could not add it to mini/bird due to conflicts.
* Edits ministation and BirdStation to have demonomicons and employment cabinets.
* Fixes spelling error
* Adds burial garments to maps.
* Update photocopier.dm
Fixes the span when inserting items into photocopier
* Fixes disrupt_spells proc
* Makes a lot of changes as reccomended by Remie.
* Fixes a compile error.
* Updates the lawify/loreify to be lists. Does not compile.
* Fixes compile errors.
* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.
* Fixes startup error. Demonic summoning now works. It's very simple, just say their true name.
* Demons now have a tongue. True demon bodies are deleted upon regression.
* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.
* true demons show up in player panel. Hellfire works again.
* Prepares for commit 16940
* Demons are now known as devils.
Still needs testing.
* Oops, didn't commit everything last commit.
* Finishes converting demons to devils.
* Fixes speech for lizards/flymen when they speak a demon's name.
* Update tips.txt
* Changes variable from static to global as per Remie's suggestion.
I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.
* Removes devil summoning. Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.
* Removes carriage returns
* Combined modified icon files
* Fixes#17184
* Imps no longer show up in the end round report. This is because there can EASILY be 100+ imps if the crew is well armed.
Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.
* The lawyer can actually buy souls back now. Oops.
* Fixes true/arch devil spritesheet to have correct sprite names.
* Relocates Box's employment cabinet to Law office.
* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils
* Re-factors whiteness code for jumpsuits.
* Merges icons, reverts failed merge of map
* Merges map with CAS decks
* Fixes copying employment contracts
* Derp, fixes compile error.
* Replaces antaghud with customizable vision range for knowledge boon.
* Prevents a runtime if devil is gibbed while ascending.
* Neatens contract code, and removes excess variable from humans.
* Fixes compile errors
* Organizes weakness code slightly. Adds ability for a species override on weakness. (Make flypeople take 2x damage from flyswatters for example)
* Removes sixteen erroneous characters from the codebase.
* Removes trailing return
* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
