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

Seniors again #1306

Closed spo9k closed 2 days ago

spo9k commented 2 weeks ago

Описание PR

Инструктора

Медиа

Проверки

Изменения :cl: spo9k

github-actions[bot] commented 2 weeks ago

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

Resources/Textures/Interface/Misc/job_icons.rsi

| State | Old | New | Status | --- | --- | --- | --- | | SeniorService | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorService.png) | Added

Resources/Textures/Objects/Devices/pda.rsi

| State | Old | New | Status | --- | --- | --- | --- | | pda-seniorservice | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorservice.png) | Added

Resources/Textures/Objects/Misc/id_cards.rsi

| State | Old | New | Status | --- | --- | --- | --- | | idseniorservice | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorservice.png) | Added

Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET-dog | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/equipped-HELMET-dog.png) | Added | equipped-HELMET-hamster | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/equipped-HELMET-hamster.png) | Added | equipped-HELMET-vox | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/equipped-HELMET-vox.png) | Added | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Head/Hats/seniorsercap.rsi/inhand-right.png) | Added

Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi/equipped-INNERCLOTHING-monkey.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/senior_service.rsi/inhand-right.png) | Added

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi/equipped-INNERCLOTHING-monkey.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/spo9k/space-station-14/bd6cab2dfc79f291425c1f9c59b922300b938906/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/senior_service.rsi/inhand-right.png) | Added

Edit: diff updated after bd6cab2dfc79f291425c1f9c59b922300b938906

TheArturZh commented 2 weeks ago

Карты в CRLF, нужно исправить image

Surani1 commented 2 weeks ago

Error Message: There is no spawnpoints for SeniorEngineer, SeniorPhysician, SeniorResearcher, SeniorOfficer on Frankenstein. Assert.That(jobs, Is.Empty)

@UrPrice ему нужно спавнпоинты поставить. Шо думаешь?

Kirus59 commented 2 weeks ago

Судя по изменениям в файлах карт он уже их поставил

UrPrice commented 2 weeks ago

Error Message: There is no spawnpoints for SeniorEngineer, SeniorPhysician, SeniorResearcher, SeniorOfficer on Frankenstein. Assert.That(jobs, Is.Empty)

@UrPrice ему нужно спавнпоинты поставить. Шо думаешь?

Пусть уберет изменения карт и не будут падать феилы о картах. Я это указал изначально.

UrPrice commented 2 weeks ago

В PR не должно быть изменений карт.

spo9k commented 2 weeks ago

Именно в самих картах убрать? Точки спавна? Или убрать еще в ss220/maps еще их роли?

spo9k commented 2 weeks ago

@DexlerXD Надо займеджить, чтоб я или мапперы, поставили спавнпоинты. Как объяснили тут.

UrPrice commented 2 weeks ago

Именно в самих картах убрать? Точки спавна? Или убрать еще в ss220/maps еще их роли?

просто оставь ямлы карты неизмененными. Выйдут патчи карт с апстримом, появятся спавны у сеньоров. Пока, так как в прототипе будут - будут летать с терминала.

spo9k commented 1 week ago

Именно в самих картах убрать? Точки спавна? Или убрать еще в ss220/maps еще их роли?

просто оставь ямлы карты неизмененными. Выйдут патчи карт с апстримом, появятся спавны у сеньоров. Пока, так как в прототипе будут - будут летать с терминала.

окей тогда в yml карт оставлю.

spo9k commented 1 week ago

Крч в yml, серавно пишет ошибку, то что точек спавна нет, так что лучше там после апстрима все добавить.

UrPrice commented 1 week ago

Крч в yml, серавно пишет ошибку, то что точек спавна нет, так что лучше там после апстрима все добавить.

Хорошо

spo9k commented 1 week ago

Ну пометки сделал то что наше изменения вне наших файлах, playtimetracker перенёс.

spo9k commented 2 days ago

Что еще надо? @DexlerXD

DexlerXD commented 2 days ago

@spo9k забей на пинги, у меня гитхаб чут-чут ебнулся

spo9k commented 2 days ago

Понял не пингую

DexlerXD commented 2 days ago

image и на будущее: это пишется так [x]