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

Cabinetification #34293

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

Conversation

ps3moira
Copy link
Contributor

@ps3moira ps3moira commented Jan 8, 2025

About the PR

Resprited most items meant to be three-dimensional to be in cabinet perspective (cabinetification) instead of 3/4ths. Credit to @Flareguy for the initial box resprite and help

Why / Balance

To create consistency with objects that are supposed to be three-dimensional with a consistent perspective. I removed the olive box sprite because it was only used for the MRE and doesn't have any use outside that so just made it use the regular box. I removed the ID box because no one uses it and uses the PDA box instead.

Media

image

Changelog
🆑

  • tweak: Changed 3D item sprites to cabinet perspective

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/XS Denotes a PR that changes 0-9 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 8, 2025
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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

Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi

State Old New Status
banana-box Modified
berry-box Modified
box Modified
carp-box Modified
dink-box Modified
pizza-box Modified
spicy-box Modified
stonk-box Modified
teriyaki-box Modified

Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi

State Old New Status
box-open Modified
box Modified
box1 Modified
box2 Modified
box3 Modified
box4 Modified
box5 Modified
box6 Modified
pink-box1 Modified
pink-box2 Modified
pink-box3 Modified
pink-box4 Modified
pink-box5 Modified
pink-box6 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/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi

State Old New Status
cig1 Modified
cig2 Modified
cig3 Modified
cig4 Modified
cig5 Modified
cig6 Modified

Resources/Textures/Objects/Decoration/present.rsi

State Old New Status
present Modified

Resources/Textures/Objects/Devices/flatpack.rsi

State Old New Status
ame-part Modified
base Modified
containment-field-generator Modified
emitter Modified
fax-machine Modified
grounding-rod Modified
icon-default Modified
overlay Modified
radiation-collector Modified
singularity-generator Modified
solar-assembly-part Modified
tesla-coil Modified
tesla-generator Modified

Resources/Textures/Objects/Materials/Scrap/generic.rsi

State Old New Status
junk-medkit-1 Modified
junk-medkit-2 Modified

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

State Old New Status
advkit Modified
blackkit Modified
brutekit Modified
burnkit Modified
firstaid Modified
o2kit Modified
radkit Modified
toxinkit Modified
purplekit-inhand-left Removed
purplekit-inhand-right Removed
purplekit Removed

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

State Old New Status
icon Modified

Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi

State Old New Status
icon Modified

Resources/Textures/Objects/Storage/Happyhonk/clown.rsi

State Old New Status
box Modified
box-open Removed

Resources/Textures/Objects/Storage/Happyhonk/cluwne.rsi

State Old New Status
box Modified
box-open Removed

Resources/Textures/Objects/Storage/Happyhonk/mime.rsi

State Old New Status
box Modified
box-open Removed

Resources/Textures/Objects/Storage/Happyhonk/nukie.rsi

State Old New Status
box Modified
box-open Removed

Resources/Textures/Objects/Storage/boxes.rsi

State Old New Status
agrichemkit Modified
beaker Modified
bodybags Modified
bottle Modified
box Modified
box_hug Modified
box_of_doom Modified
box_of_doom_big Modified
box_science Modified
box_security Modified
boxwide Modified
boxwidetoy Modified
candle Modified
circuit Modified
clown Modified
darts Modified
disk Modified
emergencytank Modified
encryptokey Modified
envelope Modified
evidence_markers Modified
extendedtank Modified
flare Modified
flashbang Modified
forensic Modified
france Modified
glasses Modified
handcuff Modified
headset Modified
heart Modified
holo Modified
implant Modified
inflatable Modified
internals Modified
latex Modified
light Modified
lightmixed Modified
lighttube Modified
magazine Modified
meson Modified
mousetraps Modified
nitrile Modified
nitrogentank Modified
omegacart Modified
pda Modified
pillbox Modified
sechud Modified
shelltoy Modified
solution_trays Modified
sterile Modified
swab Modified
syringe Modified
throwing_knives Modified
trashbag Modified
vials Modified
writing Modified
writing_of_doom Modified
ziptie Modified
box_id Removed
box_olive Removed
shellbeanbag Removed
shellflare Removed
shellflash Removed
shellincendiary Removed
shelllethal Removed
shellpractice Removed
shellslug Removed
shelltranquilizer Removed
shelluranium Removed

Resources/Textures/Objects/Storage/boxicons.rsi

State Old New Status
beaker Modified
bodybags Modified
box Modified
box_of_doom Modified
circuit Modified
disk_kit Modified
donk_kit Modified
flashbang Modified
glasses Modified
handcuff Modified
implant Modified
latex Modified
light Modified
lightmixed Modified
lighttube Modified
meson Modified
mousetraps Modified
pda Modified
pillbox Modified
sechud Modified
solution_trays Modified
sterile Modified
syringe Modified
throwing_knives Modified
tracks Modified
vials Modified
ziptie Modified

Resources/Textures/Objects/Storage/medalcase.rsi

State Old New Status
closed Modified
open Modified

Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi

State Old New Status
icon Modified
icon-open Removed

Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi

State Old New Status
folded Modified

Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi

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

Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi

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

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
base-b Removed
magb-1 Removed
magb-2 Removed
magb-3 Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
base-10x24 Removed
base-b Removed
mag10-1 Removed
mag10-2 Removed
mag10-3 Removed
magb-1 Removed
magb-2 Removed

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

State Old New Status
closed Removed
open Removed
icon Added

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

State Old New Status
closed Removed
open Removed
icon Added

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

State Old New Status
closed Removed
open Removed
icon Added

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

State Old New Status
closed Removed
open Removed
icon Added

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

State Old New Status
closed Removed
open Removed
icon Added

Resources/Textures/Objects/Storage/donkpocket.rsi

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

Edit: diff updated after 3a0e74d

@Emisse
Copy link
Contributor

Emisse commented Jan 8, 2025

art approval

@lzk228
Copy link
Contributor

lzk228 commented Jan 8, 2025

wait, aren't we against cabinet and for 3/4?

@Emisse
Copy link
Contributor

Emisse commented Jan 8, 2025

cabinet for items

@lzk228
Copy link
Contributor

lzk228 commented Jan 8, 2025

got it

@ps3moira
Copy link
Contributor Author

ps3moira commented Jan 8, 2025

wait, aren't we against cabinet and for 3/4?

Structures for the most part will stay 3/4ths. Items and interactable will be cabinety :trollface:

@beck-thompson beck-thompson added P3: Standard Priority: Default priority for repository items. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. A: Art Area: Art with no implications for other areas. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. labels Jan 8, 2025
@github-actions github-actions bot added size/S Denotes a PR that changes 10-99 lines. and removed size/XS Denotes a PR that changes 0-9 lines. labels Jan 9, 2025
@DieselMohawk
Copy link
Contributor

I'm not a big fan of the toolbox sprites or cigarette box sprites.

The cigarette box sprites are also surrounded by a solid color outline which doesn't match the segment it is around. Such as a red, blue, or green outline around a white segment.

@ps3moira
Copy link
Contributor Author

I'm not a big fan of the toolbox sprites or cigarette box sprites.

The cigarette box sprites are also surrounded by a solid color outline which doesn't match the segment it is around. Such as a red, blue, or green outline around a white segment.

cigarette's will be tweaked later probably when I'm done with the ammo boxes

@github-actions github-actions bot added size/M Denotes a PR that changes 100-999 lines. and removed size/S Denotes a PR that changes 10-99 lines. labels Jan 20, 2025
@ps3moira ps3moira marked this pull request as ready for review January 27, 2025 04:15
@ps3moira ps3moira marked this pull request as draft January 27, 2025 05:55
@ps3moira ps3moira marked this pull request as ready for review January 28, 2025 01:35
@ps3moira ps3moira marked this pull request as draft January 29, 2025 06:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Art Area: Art with no implications for other areas. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. size/M Denotes a PR that changes 100-999 lines. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants