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

Sprites again #2

Merged
merged 39 commits into from
Jan 12, 2025
Merged

Conversation

Inorien
Copy link

@Inorien Inorien commented Jan 11, 2025

Description

un-TG the shit as much as i can bear for the third time

also mostly fix the weird broken table thing from the playtest while at it
also some hardsuits

How it was tested

insufficiently
the testing is trivial and left as an exercise to the player (i am not checking thousands of sprites myself)

Changelog

🆑

  • add: /vg/station13 sprites

Copy link

github-actions bot commented Jan 11, 2025

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

Resources/Textures/Clothing/Head/Hats/hoshat.rsi

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

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Objects/Devices/forensic_scanner.rsi

State Old New Status
forensicnew Modified

Resources/Textures/Objects/Economy/cash.rsi

State Old New Status
cash Modified
cash_10 Modified
cash_100 Modified
cash_1000 Modified
cash_500 Modified

Resources/Textures/Objects/Fun/pai.rsi

State Old New Status
icon-pai-off Modified
pai-base Modified
pai-off-overlay Modified
pai-on-overlay Modified
pai-searching-overlay Modified
syndicate-icon-pai-off Modified
syndicate-pai-off-overlay Modified
syndicate-pai-on-overlay Modified
syndicate-pai-searching-overlay Modified

Resources/Textures/Objects/Materials/ore.rsi

State Old New Status
bananium Modified
diamond Modified
gold Modified
iron Modified
plasma Modified
uranium Modified
bananium-inhand-left Added
bananium-inhand-right Added
coal-inhand-left Added
coal-inhand-right Added
diamond-inhand-left Added
diamond-inhand-right Added
gold-inhand-left Added
gold-inhand-right Added
iron-inhand-left Added
iron-inhand-right Added
plasma-inhand-left Added
plasma-inhand-right Added
salt-inhand-left Added
salt-inhand-right Added
silver-inhand-left Added
silver-inhand-right Added
spacequartz-inhand-left Added
spacequartz-inhand-right Added
uranium-inhand-left Added
uranium-inhand-right Added

Resources/Textures/Objects/Misc/bedsheets.rsi

State Old New Status
sheetNT Modified
sheetUSA Modified
sheetblack Modified
sheetblue Modified
sheetbrigmedic Modified
sheetbrown Modified
sheetcaptain Modified
sheetce Modified
sheetcentcom Modified
sheetclown Modified
sheetcmo Modified
sheetcult Modified
sheetgreen Modified
sheetgrey Modified
sheethop Modified
sheethos Modified
sheetian Modified
sheetmedical Modified
sheetmime Modified
sheetorange Modified
sheetpurple Modified
sheetqm Modified
sheetrainbow Modified
sheetrd Modified
sheetred Modified
sheetsyndie Modified
sheetwhite Modified
sheetwiz Modified
sheetyellow Modified

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_bin0 Modified
paper_bin1 Modified
paper_stamp-lawyer Modified
paper_stamp-psychologist Modified
folder-stamp-inverse Added
paper_stamp-greytide Added
syndicate_card Added

Resources/Textures/Objects/Misc/fire_extinguisher.rsi

State Old New Status
fire_extinguisher_closed Modified
fire_extinguisher_open Modified

Resources/Textures/Objects/Misc/stamps.rsi

State Old New Status
stamp-cap Modified
stamp-ce Modified
stamp-centcom Modified
stamp-chaplain Modified
stamp-clown Modified
stamp-cmo Modified
stamp-deny Modified
stamp-detective Modified
stamp-hop Modified
stamp-hos Modified
stamp-mime Modified
stamp-ok Modified
stamp-qm Modified
stamp-rd Modified
stamp-syndicate Modified
stamp-warden Modified
stamp-greytide Added
stamp-lawyer Added
stamp-psychologist Added

Resources/Textures/Objects/Misc/stock_parts.rsi

State Old New Status
adv_capacitor Modified
adv_scan_module Modified
adv_scan_module_static Modified
advanced_matter_bin Modified
bluespace_matter_bin Modified
capacitor Modified
femto_mani Modified
high_micro_laser Modified
matter_bin Modified
micro_laser Modified
micro_mani Modified
nano_mani Modified
pico_mani Modified
quadratic_capacitor Modified
quadultra_micro_laser Modified
scan_module Modified
scan_module_static Modified
super_capacitor Modified
super_matter_bin Modified
super_scan_module Modified
triphasic_scan_module Modified
ultra_high_micro_laser Modified

Resources/Textures/Objects/Power/power_cells.rsi

State Old New Status
antique Modified
high Modified
hyper Modified
medium Modified
microreactor Modified
o1 Modified
o2 Modified
small Modified

Resources/Textures/Objects/Power/powersink.rsi

State Old New Status
powersink Modified

Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi

State Old New Status
icon Modified
working 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
lid_beaker Modified

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

State Old New Status
beakerbluespace Modified
inhand-left Added
inhand-right Added

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
lid_beakerlarge Modified

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

State Old New Status
syringe1 Modified
syringe2 Modified
syringe_base0 Modified
syringe_base1 Modified
syringe_base2 Modified
syringe_base3 Modified
syringe_base4 Modified
syringeproj Modified
minisyringe1 Added
minisyringe2 Added
minisyringe3 Added

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

State Old New Status
inhand-left Modified
inhand-right Modified
vial-1-1 Modified
vial-1-2 Modified
vial-1-3 Modified
vial-1-4 Modified
vial-1-5 Modified
vial-1-6 Modified
vial-1 Modified
vial Modified

Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi

State Old New Status
cleaner Modified
cleaner_large Modified
mopbucket Modified
mopbucket_water-1 Modified
mopbucket_water-2 Modified
mopbucket_water-3 Modified
mopbucket_carpplush Added
mopbucket_shark_blue Added
mopbucket_shark_grey Added
mopbucket_shark_pink Added

Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi

State Old New Status
emagged Modified
icon Modified

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

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

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

State Old New Status
analyzer Modified
icon Modified

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

State Old New Status
bloodpack-blue Modified
bloodpack-empty Modified
bloodpack-liquid-1 Modified
bloodpack-liquid-2 Modified
bloodpack-liquid-3 Modified
bloodpack-liquid-4 Modified
bloodpack-liquid-5 Modified
bloodpack Modified

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

State Old New Status
icon Modified

Resources/Textures/Objects/Storage/boxes.rsi

State Old New Status
beaker Modified
bodybags Modified
bottle Modified
box Modified
box_hug Modified
box_id Modified
box_of_doom Modified
box_of_doom_big Modified
box_olive Modified
box_science Modified
box_security Modified
boxwide Modified
candle Modified
circuit Modified
clown Modified
darts Modified
disk Modified
emergencytank Modified
encryptokey 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
omegacart Modified
pda Modified
pillbox Modified
sechud Modified
shellbeanbag Modified
shellflare Modified
shellflash Modified
shellincendiary Modified
shelllethal Modified
shellpractice Modified
shellslug Modified
agrichemkit Added
envelope Added
nitrogentank Added

Resources/Textures/Objects/Devices/camera_bug.rsi

State Old New Status
camera_bug Added

Edit: diff updated after 7f880d2

@Inorien
Copy link
Author

Inorien commented Jan 11, 2025

this should be fine to merge whenever
there is still some work left to do but i'm just restoring what i see as i trawl through the Resources dir, can always raise another PR

@Eneocho Eneocho added Bug / Fix This is either a bug or a fix for a bug. Port Stolen/Ported from another codebase. Sprites Pretty colors. and removed Changes: Sprite Changes: YML labels Jan 11, 2025
@spess-empyrean spess-empyrean merged commit 90e9e6a into vgstation-coders:master Jan 12, 2025
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug / Fix This is either a bug or a fix for a bug. Port Stolen/Ported from another codebase. Sprites Pretty colors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants