Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

тотальное обновление спрайтов #129

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Jul 12, 2024

Описание PR

Медиа

Проверки

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

Изменения

🆑

  • tweak: Изменены многие спрайты.

@github-actions github-actions bot added the Changes: Sprites Изменение спрайтов label Jul 12, 2024
Copy link
Contributor

github-actions bot commented Jul 12, 2024

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

Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi

State Old New Status
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi

State Old New Status
closed Modified
open Modified
trash Modified

Resources/Textures/Objects/Materials/Sheets/glass.rsi

State Old New Status
glass Modified
glass_2 Modified
glass_3 Modified
pglass Modified
pglass_2 Modified
pglass_3 Modified
plastitaniumglass Modified
plastitaniumglass_2 Modified
plastitaniumglass_3 Modified
rglass Modified
rglass_2 Modified
rglass_3 Modified
rpglass Modified
rpglass_2 Modified
rpglass_3 Modified
ruglass Modified
ruglass_2 Modified
ruglass_3 Modified
titaniumglass Modified
titaniumglass_2 Modified
titaniumglass_3 Modified
uglass Modified
uglass_2 Modified
uglass_3 Modified

Resources/Textures/Objects/Materials/Sheets/metal.rsi

State Old New Status
brass Modified
brass_2 Modified
brass_3 Modified
plasteel Modified
plasteel_2 Modified
plasteel_3 Modified
plastitanium Modified
plastitanium_2 Modified
plastitanium_3 Modified
steel Modified
steel_2 Modified
steel_3 Modified
titanium Modified
titanium_2 Modified
titanium_3 Modified

Resources/Textures/Objects/Materials/Sheets/other.rsi

State Old New Status
plasma Modified
plasma_2 Modified
plasma_3 Modified
plastic Modified
plastic_2 Modified
plastic_3 Modified
uranium Modified
uranium_2 Modified
uranium_3 Modified

Resources/Textures/Objects/Materials/ingots.rsi

State Old New Status
alpha Modified
alpha_2 Modified
alpha_3 Modified
gold Modified
gold_2 Modified
gold_3 Modified
silver Modified
silver_2 Modified
silver_3 Modified

Resources/Textures/Objects/Materials/ore.rsi

State Old New Status
bananium Modified
gold Modified
iron Modified
plasma Modified
uranium Modified

Resources/Textures/Objects/Misc/Lights/lights.rsi

State Old New Status
floodlight Modified
floodlight_broken Modified
floodlight_burned Modified
floodlight_on Modified

Resources/Textures/Objects/Misc/fire_extinguisher.rsi

State Old New Status
fire_extinguisher_closed Modified
fire_extinguisher_open Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Power/light_bulb.rsi

State Old New Status
broken Modified
burned Modified
normal Modified

Resources/Textures/Objects/Power/light_tube.rsi

State Old New Status
broken Modified
burned Modified
normal Modified

Resources/Textures/Objects/Specific/Chemistry/beaker.rsi

State Old New Status
beaker Modified
beaker1 Modified
beaker2 Modified
beaker3 Modified
beaker4 Modified
beaker5 Modified
beaker6 Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi

State Old New Status
beakerbluespace Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi

State Old New Status
beakerlarge Modified
beakerlarge1 Modified
beakerlarge2 Modified
beakerlarge3 Modified
beakerlarge4 Modified
beakerlarge5 Modified
beakerlarge6 Modified

Resources/Textures/Objects/Specific/Chemistry/pills.rsi

State Old New Status
pill Modified
pill1 Modified
pill10 Modified
pill11 Modified
pill12 Modified
pill13 Modified
pill14 Modified
pill15 Modified
pill16 Modified
pill17 Modified
pill18 Modified
pill19 Modified
pill2 Modified
pill20 Modified
pill21 Modified
pill3 Modified
pill4 Modified
pill5 Modified
pill6 Modified
pill7 Modified
pill8 Modified
pill9 Modified

Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi

State Old New Status
pill_canister Modified

Resources/Textures/Objects/Specific/Mech/mecha.rsi

State Old New Status
clarke Modified
darkgygax-broken Modified
darkgygax-open Modified
darkgygax Modified
deathripley-broken Modified
deathripley-open Modified
deathripley Modified
durand-broken Modified
durand-open Modified
durand Modified
firefighter-open Modified
firefighter Modified
gygax-broken Modified
gygax-open Modified
gygax Modified
marauder-broken Modified
marauder-open Modified
marauder Modified
mauler-broken Modified
mauler-open Modified
mauler Modified
odysseus-broken Modified
odysseus-open Modified
odysseus Modified
phazon-broken Modified
phazon-open Modified
phazon Modified
ripley-broken Modified
ripley-empty Modified
ripley-open Modified
ripley Modified
ripleymkii-broken Modified
ripleymkii-open Modified
ripleymkii Modified
seraph-broken Modified
seraph-open Modified
seraph Modified
paddy-broken Added
paddy-open Added
paddy Added

Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi

State Old New Status
advkit Modified
blackkit Modified
brutekit Modified
burnkit Modified
firstaid Modified
o2kit Modified
purplekit Modified
radkit Modified
toxinkit Modified

Resources/Textures/Objects/Tools/drill.rsi

State Old New Status
drill_bolt Modified
drill_screw Modified

Resources/Textures/Objects/Tools/jaws_of_life.rsi

State Old New Status
jaws_cutter Modified
jaws_pry Modified
syn_jaws_pry Modified

Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi

State Old New Status
base Modified
broken Modified
burned Modified
empty Modified
glow Modified

Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi

State Old New Status
base Modified
broken Modified
burned Modified
empty Modified
glow Modified

Edit: diff updated after f52a2fa

@1Stepka1
Copy link
Collaborator

Был бы тут Арсений он был ругался
Но тут я
И я буду ругаться
Зачем пытаться сократить мету? Особенно когда ссылки в прошлой мете не указывали конкретно на TG Station. Там где https://github.com/tgstation/tgstation изначально указано пойдет такое сокращение с прикреплением ссылки на репозиторий который в рамках этой меты называется TG Station, в других случаях нет. Насчет урезания ссылок на конкретные изменения тоже сомнительно, но лучше их оставить будет
изображение

@Ratyyy
Copy link
Collaborator Author

Ratyyy commented Jul 12, 2024

Был бы тут Арсений он был ругался Но тут я И я буду ругаться Зачем пытаться сократить мету? Особенно когда ссылки в прошлой мете не указывали конкретно на TG Station. Там где https://github.com/tgstation/tgstation изначально указано пойдет такое сокращение с прикреплением ссылки на репозиторий который в рамках этой меты называется TG Station, в других случаях нет. Насчет урезания ссылок на конкретные изменения тоже сомнительно, но лучше их оставить будет изображение

хорошо, сейчас буду чинить

@Ratyyy Ratyyy enabled auto-merge July 13, 2024 06:41
Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Jul 13, 2024
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Jul 13, 2024
@1Stepka1
Copy link
Collaborator

Уже выглядит сносно, неплохо

@Ratyyy
Copy link
Collaborator Author

Ratyyy commented Jul 13, 2024

Уже выглядит сносно, неплохо

так.. значит, можно апрув ревью?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Изменение спрайтов Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants