* icon, icon_state defined twice
* desc defined twice
* desc defined twice
* desc, icon_state defined twice
* icon_state, name defined twice
* item_state defined twice
* gender defined twice
* stop_automated_movement_when_pulled defined twice
* attacktext defined twice
* speak_emote defined twice
* flying defined twice
* item_state defined twice
* speak_chance defined twice
* attack_sound defined twice (x2)
* icon_state, item_state defined twice
* icon_state defined twice
* Revert "desc defined twice"
This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.
* desc defined twice
* Revert "desc defined twice"
This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.
* desc defined twice
* 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
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.
ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
* Added in a neckslot. Moved some tie items over to said neckslot.
* Changng some stuff to fix the new neckslot items.
* no message
* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.
* no message
* Changed the number for this.
* Fixed jaws of life not having a category, thus they only would show up when searched.
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.
Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
* Plane master handling + new chemical Rotatium
A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.
Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20
Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.
No pictures right now, I'll get some later. Sorry.
* Pay no attention to the commit behind the curtain
* Updates travis to 1346, the stable version for 510 for linux
* 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
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
* When any object is hit by an explosion, we no longer always call ex_act() on all its contents indiscriminately.
The default contents_explosion() does nothing and it's overriden for certain objects only like storage items, machines with occupants, mechs.
I've also overriden handle_atom_del() for many objects so that any sudden deletion of an object referenced in an object var of its container properly nullifies such references, avoiding potential runtime and updating the container's icon_state (e.g. admin-delete a mixer's beaker and the mixer's sprite updates immediately).
I've tweaked bomb effect on worn clothes, having some armor but not 100% now still protects your clothes somewhat.
Fixes some arguments of ex_act in living/ex_act() and other mobs.
* derp and map fixes.
* dem map fixes, man.
* More work on code that use implants, simplified now that we can use the "implants" carbon var.
* some fixes
* more typos and fixes.
Buffs the hp of items, backpacks and clothes.
Fixes storage items not dropping their content if destroyed when worn by a mob.
Simplifies acid_melt() and burn(), we no longer try to acid/burn the content of an object that just burn/melted.
Nerfs damage to clothes from bombs when worn by a mob.
Fixes worn clothes taking damage when mob is hit by holo weapons.
New power tools for the CE! It's like goof's golden tools but less memey and makes more sense, power tools are much faster than normal tools and take the place of two.
Hand drill, activate to switch between between screwdriver bit and bolt bit (screwdriver/wrench)
Jaws of life, activate to switch between a cutting head and prying head, can also open powered doors like a xeno. Cutting head cuts your head off if you suicide with them. I wanted to make the prying head gib your head but i couldn't figure it out.
Reworked how construction handles sounds and added a new "usesound" var to obj/items. This is useful if you want to add another tool or item that makes a send when it's being used. Also useful if you want to replace a sound for an item or if you have an item with a choice of sounds (like if you have two versions of a sound sound you want to play)
CE now gets a unique white tool belt, exactly the same as a regular tool belt, just a re-skin.
CE also spawns with the new power tools and an experimental welder, CE will be the ONLY one to spawn with these tools, might make him a more valuable target for traitors. I figured this would be acceptable considering most heads are not antag enabled (i think)
Also i added a welding tool sound for reasons... figured might as well add some more sounds while i was reworking 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
SAY GOODBYE EMAG USERS! THE AGE OF THE MULTITOOL IS UPON US!
In Short: Removes Emag Function [aka Requiring a multitool], and has a lower chance to successfully hack [from 40% to 33%]
It doesn't make sense that something that has no place for an ID can be swiped with an overglorified ID. Git gud and use the multitool. Now when someone puts secure items in the secure safe, people won't laugh at them [i mean they probably still will, but it's ok].
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.
