Death Squad Update #1887

EstKemran · 2024-09-18T14:37:43Z

Описание PR

Оружие

Цепной меч
Пульсовая винтовка
Пульсовый дробовик
SP-91-RC

Снаряжение

Скафандр Командира
Скафандр Специалиста
Изменить стандартный скафандр ЭС
Магнитные ботинки
Боевые перчатки ЭС
Омни-визор
~~Боевой гипоспрей~~

Эскадрон смерти

Раса ЭС
КПК / Должности командира и специалиста
Спавнеры

Разное

Божественный медипен
Турель
~~Частота / Гарнитура~~
Шкафчики командитра и специалиста
~~Новые звуки~~
Локализация

Медиа

Проверки

PR полностью завершён и мне не нужна помощь чтобы его закончить.
Я ознакомился с наставлением по работе с репозиторием и следовал им при создании PR'а.
Я внимательно просмотрел все свои изменения и багов в них не нашёл.
Я запускал локальный сервер со своими изменениями и всё протестировал.
Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Kemran

tweak: Обновлён Эскадрон Смерти.

github-actions · 2024-09-18T14:38:24Z

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

Resources/Textures/SS220/Clothing/Hands/Gloves/dq_gloves.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET			Added
off-inhand-left			Added
off-inhand-right			Added
on-equipped-HELMET			Added
on-inhand-left			Added
on-inhand-right			Added

Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_helmet_commander.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET			Added
off-inhand-left			Added
off-inhand-right			Added
on-equipped-HELMET			Added
on-inhand-left			Added
on-inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_alpha_hardsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/dq_hardsuit_commander.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Shoes/Boots/dq_magboots.rsi

State	Old	New	Status
equipped-FEET			Added
icon-on			Added
icon			Added
inhand-left			Added
inhand-right			Added
on-equipped-FEET			Added
on-inhand-left			Added
on-inhand-right			Added

Resources/Textures/SS220/Interface/Misc/job_icons.rsi

State	Old	New	Status
deathsquad			Added
deathsquadalpha			Added
deathsquadleader			Added

Resources/Textures/SS220/Objects/Specific/Medical/medipen.rsi

State	Old	New	Status
holypen			Added
holypen_empty			Added
medipen-inhand-left			Added
medipen-inhand-right			Added

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/sp-91.rsi

State	Old	New	Status
base			Added
mag-1			Added
mag-2			Added

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

State	Old	New	Status
greenlaser			Added

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

State	Old	New	Status
base			Added
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
heal-mag-unshaded-1			Added
heal-mag-unshaded-2			Added
heal-mag-unshaded-3			Added
heal-mag-unshaded-4			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added
wielded-inhand-left			Added
wielded-inhand-right			Added

Resources/Textures/SS220/Objects/Weapons/Guns/sp-91.rsi

State	Old	New	Status
base			Added
bolt-open			Added
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-0			Added

Resources/Textures/SS220/Objects/Weapons/Melee/chainsword.rsi

State	Old	New	Status
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Structures/Storage/closet.rsi

State	Old	New	Status
deathsquadcommander_door			Added
deathsquadspecialist_door			Added

Edit: diff updated after 0611651

github-actions · 2024-09-19T13:49:01Z

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

github-actions · 2024-09-21T15:11:03Z

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

github-actions · 2024-09-25T12:57:40Z

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

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

…fic/medical/hypospray.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

…n_cards.yml Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

…ns/gun/battery.ftl Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…ry/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…dsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…ypospray.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…smgs.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…ry/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

…dsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

stalengd · 2024-10-20T20:41:45Z

Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl

@@ -0,0 +1,6 @@
+ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled }
+    .desc = { ent-ClothingBackpackDeathSquadFilled.desc }
+    .suffix = Рюкзак оперативника ЭС, Эскадрон Смерти, Death Squad, ЭС, DQ


Тут и у остальных предметов действительно нужно так много суффиксов? "Рюкзак оперативника ЭС" это чуть ли не название предмета, и 4 суффикса про то что это эскадрон смерти, одного не хватит?

"Рюкзак оперативника ЭС" это чуть ли не название предмета

В названии нет принадлежности к роли. Сокращу

Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml

stalengd · 2024-10-21T18:28:01Z

Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml

+  #todo
+  # - type: Clothing
+  #   sprite: SS220/Objects/Weapons/Melee/chainsword.rsi
+  #   quickEquip: false
+  #   slots:
+  #   - Back
+  #   - suitStorage


Какой ещё туду?

Его переделать надо, но если я отложу пр до его переработки, пр снова начнёт гнить

stalengd · 2024-10-21T18:29:41Z

Resources/Textures/SS220/Clothing/Head/Hardsuits/dq_alpha_helmet.rsi/meta.json

+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by discord:IAmRasputin#5242",


Ссылку на источник может если где-то опубликовано?

Co-authored-by: Stalen <33173619+stalengd@users.noreply.github.com>

…ion-14 into death-squad

stalengd

Ещё не все суффиксы

stalengd · 2024-10-24T21:05:32Z

Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl

@@ -0,0 +1,3 @@
+ent-EmergencyMedipenDQ = божественный медипен
+    .suffix = Эскадрон Смерти, Death Squad, ЭС, DQ


stalengd · 2024-10-24T21:05:39Z

Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl

@@ -0,0 +1,10 @@
+ent-WeaponPulseRifle2 = пульсовая винтовака
+    .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ


stalengd · 2024-10-24T21:05:45Z

Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl

+    .suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ
+    .desc = Энергетическая винтовка тяжелого типа, способна аннигилировать любые структуры.
+ent-WeaponPulseShotgun = пульсовый дробовик
+    .suffix = Дробовик, Эскадрон Смерти, Death Squad, ЭС, DQ


EstKemran · 2024-11-04T16:57:39Z

Осталась одна проблема. ID карта дедов не открывает их ящик по доступу CentralCommandDeathSquad (Доступ запрещён). Потыкал, повтыкал, не понял в чём проблема

EstKemran · 2024-11-10T15:19:40Z

@stalengd

EstKemran added 7 commits September 17, 2024 23:05

hardsuit

96b48dc

chainsword

0641beb

pulserufle

33c93b9

holyshit

bc5f9c8

omni-hud

c43f7c8

magboots

6c848e2

sp-91

619665c

EstKemran changed the title ~~Death squad~~ Death Squad Update Sep 18, 2024

EstKemran added 6 commits September 18, 2024 23:36

buff-pulserifles

45b812e

gloves-dq

faa91ff

turrets

6fa4e42

Merge remote-tracking branch 'upstream/master' into death-squad

0bac968

deathsquad-humanoid

4bd5d61

id&pda&jobs

d2b91a5

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 19, 2024

Merge branch 'master' into death-squad

f60a060

github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 19, 2024

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 21, 2024

Merge branch 'master' into death-squad

918e466

github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 21, 2024

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 25, 2024

EstKemran and others added 2 commits September 27, 2024 14:30

Merge remote-tracking branch 'upstream/master' into death-squad

13f7147

Merge branch 'master' into death-squad

f61af5c

EstKemran and others added 13 commits October 21, 2024 20:08

Update Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl

5a7d65d

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Update Resources/Locale/ru-RU/ss220/job/job-name.ftl

5c265d5

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/speci…

21c348e

…fic/medical/hypospray.ftl Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Objects/Misc/identificatio…

2771cc0

…n_cards.yml Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Update Resources/Prototypes/SS220/StatusIcons/centcom.yml

9c27d9e

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapo…

fac9c42

…ns/gun/battery.ftl Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapo…

0e7b671

…ns/gun/battery.ftl Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Batte…

5521883

…ry/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/har…

035b370

…dsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/h…

61333d7

…ypospray.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/…

545eaeb

…smgs.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Batte…

848a8ff

…ry/battery_guns.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/har…

df31bd0

…dsuits.yml Co-authored-by: Svarshik <96281939+lexaSvarshik@users.noreply.github.com>

stalengd self-assigned this Oct 21, 2024

stalengd requested changes Oct 21, 2024

View reviewed changes

Update Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml

0a5f18e

Co-authored-by: Stalen <33173619+stalengd@users.noreply.github.com>

stalengd added the Need to add Wiki220 Требуется добавить на Wiki/поставить задачу Wikiделам вместе с мёрджем. label Oct 21, 2024

EstKemran added 2 commits October 21, 2024 21:40

reviev-update

77d4a71

Merge branch 'death-squad' of https://github.com/EstKemran/space-stat…

42d8d17

…ion-14 into death-squad

stalengd requested changes Oct 24, 2024

View reviewed changes

EstKemran added 4 commits November 4, 2024 17:32

Merge remote-tracking branch 'upstream/master' into death-squad

4c6f655

fix

7cb7720

fix

f0e5d6b

update

f8a2697

EstKemran requested a review from stalengd November 4, 2024 16:56

fix

0611651

stalengd approved these changes Nov 10, 2024

View reviewed changes

stalengd merged commit 74581a0 into SerbiaStrong-220:master Nov 10, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Death Squad Update #1887

Death Squad Update #1887

EstKemran commented Sep 18, 2024 •

edited

Loading

github-actions bot commented Sep 18, 2024 •

edited

Loading

github-actions bot commented Sep 19, 2024

github-actions bot commented Sep 21, 2024

github-actions bot commented Sep 25, 2024

stalengd Oct 20, 2024

EstKemran Oct 21, 2024

stalengd Oct 21, 2024

EstKemran Oct 21, 2024

stalengd Oct 21, 2024

stalengd left a comment

stalengd Oct 24, 2024

stalengd Oct 24, 2024

stalengd Oct 24, 2024

EstKemran commented Nov 4, 2024 •

edited

Loading

EstKemran commented Nov 10, 2024

		@@ -0,0 +1,3 @@
		ent-EmergencyMedipenDQ = божественный медипен
		.suffix = Эскадрон Смерти, Death Squad, ЭС, DQ

		@@ -0,0 +1,10 @@
		ent-WeaponPulseRifle2 = пульсовая винтовака
		.suffix = Винтовка, Эскадрон Смерти, Death Squad, ЭС, DQ

Death Squad Update #1887

Death Squad Update #1887

Conversation

EstKemran commented Sep 18, 2024 • edited Loading

Описание PR

Оружие

Снаряжение

Эскадрон смерти

Разное

github-actions bot commented Sep 18, 2024 • edited Loading

github-actions bot commented Sep 19, 2024

github-actions bot commented Sep 21, 2024

github-actions bot commented Sep 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stalengd left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EstKemran commented Nov 4, 2024 • edited Loading

EstKemran commented Nov 10, 2024

EstKemran commented Sep 18, 2024 •

edited

Loading

github-actions bot commented Sep 18, 2024 •

edited

Loading

EstKemran commented Nov 4, 2024 •

edited

Loading