Rxup / space-station-14

🚀 Билд русскоязычного сервера Space Station 14
GNU Affero General Public License v3.0
47 stars 143 forks source link

[Port] Energy shield #845

Closed nomad0260 closed 3 weeks ago

nomad0260 commented 3 weeks ago

Описание PR

Энергетические щиты, которые не дают попадать снарядам по пользователю, использую батарейки как блок-питания(rimworld reference) пользователь щита не может сам использовать дальнобойное оружие

Портированная система с одного пра Space Wizards https://github.com/space-wizards/space-station-14/pull/23948 Актуальная версия взята с https://github.com/fospas/Space-Cats-14/commit/0c5bdc278311108d0d9d709e3f78d76358732b75#diff-02b95f18edae478b20407a11aff8b9a7419ab6aabc653b713dc7ab55704d06b2

Медиа

Тип PR

Изменения

github-actions[bot] commented 3 weeks ago

RSI Diff Bot; head commit 23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9 merging into bf4446d6ebab490dd22ce0000b920542e7d129be This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Backmen/Effects/EnergyDome/energydome_big.rsi

| State | Old | New | Status | --- | --- | --- | --- | | big | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Effects/EnergyDome/energydome_big.rsi/big.png) | Added

Resources/Textures/Backmen/Effects/EnergyDome/energydome_directed.rsi

| State | Old | New | Status | --- | --- | --- | --- | | small | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Effects/EnergyDome/energydome_directed.rsi/small.png) | Added

Resources/Textures/Backmen/Effects/EnergyDome/energydome_medium.rsi

| State | Old | New | Status | --- | --- | --- | --- | | medium | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Effects/EnergyDome/energydome_medium.rsi/medium.png) | Added

Resources/Textures/Backmen/Effects/EnergyDome/energydome_slowdown_big.rsi

| State | Old | New | Status | --- | --- | --- | --- | | big | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Effects/EnergyDome/energydome_slowdown_big.rsi/big.png) | Added

Resources/Textures/Backmen/Effects/EnergyDome/energydome_small.rsi

| State | Old | New | Status | --- | --- | --- | --- | | small | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Effects/EnergyDome/energydome_small.rsi/small.png) | Added

Resources/Textures/Backmen/Objects/Tools/EnergyDome/reinhardt.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/reinhardt.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/reinhardt.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/reinhardt.rsi/inhand-right.png) | Added

Resources/Textures/Backmen/Objects/Tools/EnergyDome/syndie.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-BELT | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/syndie.rsi/equipped-BELT.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/syndie.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/syndie.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/nomad0260/space-station-14-/23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9/Resources/Textures/Backmen/Objects/Tools/EnergyDome/syndie.rsi/inhand-right.png) | Added

Edit: diff updated after 23c2ef7cda9ec5194b4b733c0ddd6392f9f5a8d9

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

nomad0260 commented 3 weeks ago

усе, нету мердж конфликта как убрать эту плашку?

Roudenn commented 3 weeks ago

Не спиздили а адаптировали