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

Празатово пришествие. #1018

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

Conversation

Filokini
Copy link
Contributor

@Filokini Filokini commented Jan 27, 2025

Описание PR

Респрайт празатовский
Изменены в основном одежды, некоторое кол-во вещей и всякого, смотрите картинки.

Медиа

Ченжлог

🆑 Filo

Copy link
Contributor

github-actions bot commented Jan 27, 2025

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

Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified

Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi

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

Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified

Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/ADT/Clothing/Head/Hats/grey_flat_cap.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi

State Old New Status
equipped-NECK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi

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

Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/grey_suit.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/old_brown_shirt.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/ADT/Markers/jobs.rsi

State Old New Status
pathologist Modified

Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
brezel Modified
brezel_chocolate Modified
brezel_poppy Modified
brezel_salt Modified
brezel_vanilla Modified

Resources/Textures/ADT/Objects/Devices/pda.rsi

State Old New Status
pda-pathologist Modified

Resources/Textures/ADT/Objects/Tools/Lighters/dvzippo.rsi

State Old New Status
closed Modified
open Modified

Resources/Textures/ADT/Objects/Tools/Lighters/execzippo.rsi

State Old New Status
closed Modified
open Modified

Resources/Textures/ADT/Objects/Tools/Lighters/zippo.rsi

State Old New Status
closed Modified
open Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Explosives/40mm_grenade.rsi

State Old New Status
base-spent Modified
emp Modified
flash Modified
he Modified
heat Modified
smoke Modified
stinger Modified
stun Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/inspector.rsi

State Old New Status
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/mateba.rsi

State Old New Status
bolt-open Modified
equipped-BELT Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi

State Old New Status
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/python.rsi

State Old New Status
bolt-open Modified
icon Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
bolt-open Modified
equipped-BACKPACK Modified
equipped-SUITSTORAGE Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/sawn.rsi

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

Resources/Textures/ADT/Personalization/flippolighter_johan.rsi

State Old New Status
lighter_flame Modified
zippo_icon_base Modified
zippo_open Modified

Resources/Textures/ADT/Personalization/flippolighter_schrodinger.rsi

State Old New Status
zippo_icon_base Modified
zippo_open Modified

Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Clothing/Back/Backpacks/captain.rsi

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

Resources/Textures/Clothing/Back/Backpacks/genetics.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified

Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi

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

Resources/Textures/Clothing/Back/Duffels/captain.rsi

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

Resources/Textures/Clothing/Back/Duffels/cargo.rsi

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

Resources/Textures/Clothing/Back/Duffels/chemistry.rsi

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

Resources/Textures/Clothing/Back/Duffels/clown.rsi

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

Resources/Textures/Clothing/Back/Duffels/duffel.rsi

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

Resources/Textures/Clothing/Back/Duffels/engineering.rsi

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

Resources/Textures/Clothing/Back/Duffels/genetics.rsi

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

Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi

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

Resources/Textures/Clothing/Back/Duffels/medical.rsi

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

Resources/Textures/Clothing/Back/Duffels/mime.rsi

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

Resources/Textures/Clothing/Back/Duffels/salvage.rsi

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

Resources/Textures/Clothing/Back/Duffels/science.rsi

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

Resources/Textures/Clothing/Back/Duffels/security.rsi

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

Resources/Textures/Clothing/Back/Duffels/syndicate.rsi

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

Resources/Textures/Clothing/Back/Duffels/virology.rsi

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

Resources/Textures/Clothing/Back/Satchels/captain.rsi

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

Resources/Textures/Clothing/Back/Satchels/genetics.rsi

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

Resources/Textures/Clothing/Back/Satchels/leather.rsi

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

Resources/Textures/Clothing/Back/Satchels/virology.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified

Resources/Textures/Clothing/Belt/belt_overlay.rsi

State Old New Status
crowbar Modified
crowbar_red Modified
kitchenknife Modified
plantbgone Modified
screwdriver Modified
screwdriver_head Modified
screwdriver_nuke Modified

Resources/Textures/Clothing/Belt/waistbag_leather.rsi

State Old New Status
equipped-BELT Modified
icon Modified

Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi

State Old New Status
equipped-HAND Modified

Resources/Textures/ADT/Objects/Misc/pens.rsi

State Old New Status
ADTpen_CE Removed
ADTpen_QM Removed
ADTpen_RD Removed
ADTpen_cmo Removed
ADTpen_hos Removed
pen_ce Added
pen_cmo Added
pen_gorlax Added
pen_hos Added
pen_qm Added
pen_rd Added

Resources/Textures/ADT/Clothing/Head/Hats/beret_ce.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/prisoner.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/prisoner.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added

Edit: diff updated after 52d4ab2

@KashRas2
Copy link
Collaborator

Пиздец блять

Copy link
Contributor

@Unlumy Unlumy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я не представляю, какое нужно железо, что бы ревьювить это в гите. Проще проверить в игре на наличие эрророк игроками. И хотфиксить если надо, но всё до чего хватило моей психики - работает нормально.

Copy link
Contributor

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

@github-actions github-actions bot added size/M and removed size/L labels Feb 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: No C# Changes: Sprites Изменение спрайтов size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants