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.

Sign up for GitHub

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

Jump to bottom

Фикс заказы #89

Merged
merged 6 commits into from
Sep 8, 2024
Merged

Фикс заказы #89

merged 6 commits into from
Sep 8, 2024

Conversation

MegaDaimond
Copy link
Contributor

No description provided.

@Lost-Paradise-Bot
Copy link
Contributor

В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР.

@Lost-Paradise-Bot Lost-Paradise-Bot added Статус: Конфликт Ожидает починки. Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Изменения: YML Изменяет какие-либо файлы .yml labels Sep 8, 2024
@Lost-Paradise-Bot Lost-Paradise-Bot removed the Статус: Конфликт Ожидает починки. label Sep 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

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

Resources/Textures/Clothing/Neck/Cloaks/ace.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/aro.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/bi.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/enby.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/gay.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/les.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/pan.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Clothing/Neck/Cloaks/trans.rsi

State Old New Status
equipped-NECK Modified
icon Modified

Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi

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

Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi

State Old New Status
equipped-NECK Modified

Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi

State Old New Status
equipped-MASK Modified

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi

State Old New Status
equipped-FEET Modified
icon Modified

Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi

State Old New Status
omnilaser Modified
ion Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi

State Old New Status
moth_antenna Removed
moth_markings Removed
moth_wings Removed
stan Removed

Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi

State Old New Status
mag-unshaded-12 Removed
mag-unshaded-20 Removed
mag-unshaded-32 Removed
mag-unshaded-8 Removed

Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi

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

Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi

State Old New Status
equipped-MASK Added
icon Added

Edit: diff updated after bc020c4

@Evgencheg Evgencheg merged commit 23618d0 into Lost-Paradise-Project:master Sep 8, 2024
6 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Изменения: YML Изменяет какие-либо файлы .yml Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MegaDaimond @Lost-Paradise-Bot @Evgencheg