]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f2cd4a) | patch
Pipebombs and IED rework (#25705)
authorMr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Thu, 14 Mar 2024 04:27:08 +0000 (00:27 -0400)
committerGitHub <noreply@github.com>
Thu, 14 Mar 2024 04:27:08 +0000 (15:27 +1100)
commit3cb1c585c53f694f5ceb9720057bb765673970ec
tree58fbb4ec46d73a75b9d1f8433c935d615b03118etree | snapshot
parent2f2cd4aab70703717541e5db3f46ae4831b4129dcommit | diff
Pipebombs and IED rework (#25705)

* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
20 files changed:
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs diff | blob | history
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs diff | blob | history
Content.Shared/Explosion/ExplosionPrototype.cs diff | blob | history
Resources/Locale/en-US/materials/materials.ftl diff | blob | history
Resources/Prototypes/Entities/Objects/Materials/materials.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml [moved from Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml with 83% similarity] diff | blob | history
Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml [new file with mode: 0644] blob
Resources/Prototypes/Reagents/Materials/materials.yml diff | blob | history
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml [moved from Resources/Prototypes/Recipes/Crafting/Graphs/improvised/ied.yml with 90% similarity] diff | blob | history
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml [new file with mode: 0644] blob
Resources/Prototypes/Recipes/Crafting/improvised.yml diff | blob | history
Resources/Prototypes/Recipes/Reactions/fun.yml diff | blob | history
Resources/Prototypes/Stacks/Materials/materials.yml diff | blob | history
Resources/Prototypes/explosion.yml diff | blob | history
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/base.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/primed.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi/wires.png [new file with mode: 0644] blob
Resources/migration.yml diff | blob | history
Форк Space Station 14 с переводами на русский