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

Респрайт ящиков, шкафчиков и настенных шкафчиков. #866

Merged
merged 13 commits into from
Dec 14, 2024

Conversation

ITamiokiI
Copy link
Contributor

Описание PR

Изменены спрайты всех ящиков и шкафчиков на ТГшные, так же нарисованы свои вариации тем, аналогов в которым в СС13 не было, и добавлены новые вариации из СС13, или для будущих работ/мапперов/ивентов. Так же я слегка поправил доступы у капитана (Убрал доступ ОСЩ, которого у него быть не должно.), и создал категория доступов ЦК.

Почему / Баланс

Ну, мы делаем глобальный респрайт, я сказал что сделаю, вот, сварганил за денёк.
Убрал доступ ОСЩ у Капитана, потому что ОСЩ представитель ЦК, Капитан не должен лазить в его вещах и кабинете, если такой имеется на станции.

Медиа

Все шкафчики.
Content Client_w4vXs5jkhu

Часть шкафчиков (Снова), и немного ящиков.
Content Client_wBM7R7MZ8F

Требования

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

Чейнджлог
🆑 Tamioki

  • tweak: Изменены спрайты всех ящиков, шкафчиков и настенных шкафчиков.
  • add: Добавлены новые версии ящиков и шкафчиков.
  • fix: Из доступов Капитана был убран доступ Офицера Синего Щита.

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Dec 2, 2024
Copy link
Contributor

github-actions bot commented Dec 2, 2024

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

Resources/Textures/ADT/Structures/Storage/Crates/scicrate_secure_ai_plates.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/artifact.rsi

State Old New Status
bounty Modified
captains_paper Modified
invoice Modified
locked Modified
paper Modified
unlocked Modified
welded Modified
artifact_container Removed
artifact_container_door Removed
artifact_container_icon Removed
artifact_container_open Removed
base Added
closed Added
icon Added
open Added

Resources/Textures/Structures/Storage/Crates/cage.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified

Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/command.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/electrical.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/engineering.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/freezer.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/generic.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/hydroponics.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/medical.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/o2.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/plasma.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/plastic.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
welded Modified
sparking Removed

Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/radiation.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/science.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/sec_gear.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/secure.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/surgery.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/syndicate.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/trashcart.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified
sparking Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/weapon.rsi

State Old New Status
base Modified
closed Modified
icon Modified
locked Modified
open Modified
sparking Modified
unlocked Modified
welded Modified

Resources/Textures/Structures/Storage/Crates/web.rsi

State Old New Status
base Modified
closed Modified
icon Modified
open Modified

Resources/Textures/Structures/Storage/closet.rsi

State Old New Status
abductor Modified
abductor_door Modified
abductor_open Modified
alien Modified
alien_door Modified
alien_open Modified
armory Modified
armory_door Modified
atmos Modified
atmos_door Modified
atmos_wardrobe_door Modified
bio_door Modified
bio_jan_door Modified
armory_open Removed
atmos_open Removed
bio Removed
bio_jan Removed
bio_jan_open Removed
bio_open Removed
bio_sec Removed
abductor_locked Added
abductor_unlocked Added
bar_wardrobe_door Added
barber Added
barber_door Added
batterygun Added
bio_coroner_door Added
bio_med_door Added
bio_paramedic_door Added

Resources/Textures/Structures/Storage/Crates/wooden.rsi

State Old New Status
base Added
closed Added
icon Added
open Added

Resources/Textures/Structures/Storage/boxes.rsi

State Old New Status
cardboard_special Added

Resources/Textures/Structures/Storage/cardboard.rsi

State Old New Status
agentbox Added
cardboard Added
cardboard_open Added
cardboard_special Added
metalbox Added
metalbox_open Added

Edit: diff updated after 57842b5

@PyotrIgn
Copy link
Contributor

PyotrIgn commented Dec 2, 2024

Ого, респрайт таки случился!

@Filokini Filokini marked this pull request as draft December 6, 2024 17:18
@Unlumy
Copy link
Contributor

Unlumy commented Dec 14, 2024

@KashRas2 Я пробежался взглядом, насколько я понял всё готово и проблем быть не должно, но лучше пусть кто-то ещё перепроверит, а так... Ну получается ready to merge?

@PyotrIgn PyotrIgn marked this pull request as ready for review December 14, 2024 17:53
@PyotrIgn PyotrIgn merged commit 91c2b01 into AdventureTimeSS14:master Dec 14, 2024
25 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants