SerbiaStrong-220 / space-station-14

A multiplayer game about paranoia and chaos on a space station. Remake of the cult-classic Space Station 13.
https://spacestation14.io
Other
50 stars 136 forks source link

Fract War Update V0.6.1 #1298

Closed Kirus59 closed 2 weeks ago

Kirus59 commented 2 weeks ago

Описание PR

Обновлены шаттлы к ивенту. Добавлено новое основное оружие для СССП и НТ. Добавлены дымовые гранаты на шаттлы фракций.

Проверки

Изменения

no cl, no fun

github-actions[bot] commented 2 weeks ago

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

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ert_magblaster.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ert_magblaster.rsi/base.png) | Added | o1 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ert_magblaster.rsi/o1.png) | Added | o2 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ert_magblaster.rsi/o2.png) | Added

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ussp_magppsh.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ussp_magppsh.rsi/base.png) | Added | mag-1 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ussp_magppsh.rsi/mag-1.png) | Added

Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi

| State | Old | New | Status | --- | --- | --- | --- | | impact_laser_red | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/impact_laser_red.png) | Added | redlaser | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/Projectiles/redprojectile.rsi/redlaser.png) | Added

Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base-unshaded | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/base-unshaded.png) | Added | base | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/base.png) | Added | equipped-BACKPACK | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/equipped-BACKPACK.png) | Added | equipped-SUITSTORAGE | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/equipped-SUITSTORAGE.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/inhand-right.png) | Added | mag-0 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-0.png) | Added | mag-1 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-1.png) | Added | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-3.png) | Added | mag-4 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-4.png) | Added | mag-5 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-5.png) | Added | mag-unshaded-0 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-0.png) | Added | mag-unshaded-1 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-1.png) | Added | mag-unshaded-2 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-2.png) | Added | mag-unshaded-3 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-3.png) | Added | mag-unshaded-4 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-4.png) | Added | mag-unshaded-5 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/mag-unshaded-5.png) | Added | wielded-inhand-left | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/wielded-inhand-left.png) | Added | wielded-inhand-right | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ert_blaster.rsi/wielded-inhand-right.png) | Added

Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/base.png) | Added | bolt-open | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/bolt-open.png) | Added | equipped-BACKPACK | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/equipped-BACKPACK.png) | Added | equipped-SUITSTORAGE | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/equipped-SUITSTORAGE.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/inhand-right.png) | Added | mag-0 | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/mag-0.png) | Added | wielded-inhand-left | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/wielded-inhand-left.png) | Added | wielded-inhand-right | ![]() | ![](https://raw.githubusercontent.com/Kirus59/space-station-14/b6e164090c4b9a24acb503c0691fbb6f5d784ccf/Resources/Textures/SS220/Objects/Weapons/Guns/ussp_ppsh.rsi/wielded-inhand-right.png) | Added

Edit: diff updated after b6e164090c4b9a24acb503c0691fbb6f5d784ccf

Kirus59 commented 2 weeks ago

@DexlerXD мёёёёёёёёрж!