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

Directional Animated Vendors #400

Merged
merged 26 commits into from
Jun 25, 2024
Merged

Directional Animated Vendors #400

merged 26 commits into from
Jun 25, 2024

Conversation

VMSolidus
Copy link
Member

Description

This PR adds in new sprites for vending machines, imported from Baystation12. These sprites are notably different from /tg/station sprites in that they include directional facings, and aren't just mono direction. This allows mappers to have more variety in how they can arrange rooms. But more importantly, it's also something that is desperately wanted by #395 so that hostile vending machines actually face people that they're trying to attack.

ShareX_YQkAjaj4s8

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 11, 2024 •
edited
Loading

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

Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi

State Old New Status
(mdr)grapejuice Added
absinthebottle Added
alco-blue Added
alco-green Added
alco-red Added
alcoholfreebeer Added
alebottle Added
alecan Added
art_bru Added
badminka Added
baijiu Added
barflask Added
beastenergy Added
beer Added
beercan Added
bigteacup Added
bigteacup100 Added
blackstrap Added
bottleofnothing Added
broken Added
broken_bottle Added
bronze_cup Added
cachaca Added
ccola Added
champagne Added
coffee Added
cognacbottle Added
cola-blue Added
cola-brown Added
cola-green Added
cola-orange Added
cola-pink Added
cola-pork Added
cola-purple Added
cola-red Added
cola-yellow Added
cola Added
colabottle Added
coolant Added
cream Added
detflask Added
dnb Added
dr_gibb Added
energy_drink Added
fitness-cup_black Added
fitness-cup_blue Added
fitness-cup_red Added
flask Added
flavorpak Added
ginbottle Added
gingerbeer Added
golden_cup Added
goldschlagerbottle Added
grenadinebottle Added
hellshenbeer Added
herbal Added
holyflask Added
hrukhzaextract Added
ice_tea_can Added
ionbru Added
jar Added
jar_metroid Added
jar_what Added
kahluabottle Added
lager Added
lemon-lime Added
lemonjuice Added
limejuice Added
lithiumflask Added
lunabrandy Added
maplesyrup Added
milk Added
nothing Added
ocola Added
oil Added
orangejuice Added
patronbottle Added
pitcher Added
pitcher100 Added
pitcher15 Added
pitcher30 Added
pitcher50 Added
pitcher70 Added
pitcher85 Added
placeholder Added
premiumvodka Added
premiumwine Added
prosecco Added
purple_can Added
pwinebottle Added
rag Added
rag_lit Added
rag_small Added
rag_small_lit Added
rakia Added
ramen Added
rumbottle Added
sake Added
shaker Added
shinyflask Added
silver_cup Added
sodawater Added
soju Added
soymilk Added
space-up Added
space-up_bottle Added
space_mountain_wind Added
space_mountain_wind_bottle Added
starkist Added
syndi_cola Added
syndi_cola_x Added
tadmorwine Added
teapot Added
tequillabottle Added
thirteen_loko Added
thoom Added
tomatojuice Added
tonic Added
vacuumflask Added
vcola Added
vermouthbottle Added
vodkabottle Added
water Added
water_cup Added
water_cup_e Added
waterbottle Added
whiskeybottle Added
whiskeybottle2 Added
whiskeybottle3 Added
winebottle Added

Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Food/bay_food.rsi

State Old New Status
0box-donut1 Added
0box-donut_chaos Added
1box-donut1 Added
1box-donut_chaos Added
2box-donut1 Added
2box-donut_chaos Added
3box-donut1 Added
3box-donut_chaos Added
4box-donut1 Added
4box-donut_chaos Added
4no_raisins Added
5box-donut1 Added
5box-donut_chaos Added
6box-donut1 Added
6box-donut_chaos Added
aesirsalad Added
aghrassh-cake Added
amanita_pie Added
amanitajelly Added
ancient_burger Added
ancient_fries Added
ancient_hburger Added
ancient_hotdog Added
ancient_pizza Added
ancient_taco Added
applecake Added
applecakeslice Added
applepie Added
bacon Added
badrecipe Added
baguette Added
bananabread Added
bananabreadslice Added
barbecue Added
bearmeat Added
beetsoup Added
berryclafoutis Added
bigbiteburger Added
birdmeat Added
birdsteak Added
birthdaycake Added
birthdaycakeslice Added
biscotti Added
bisque Added
boiledrice Added
boiledslimecore Added
brainburger Added
braincake Added
braincakeslice Added
bread Added
breadslice Added
bunbun Added
candiedapple Added
candy Added
candy_corn Added
carrotcake Added
carrotcake_slice Added
carrotfries Added
cereal_box Added
chawanmushi Added
chazuke Added
cheeseburger Added
cheesecake Added
cheesecake_slice Added
cheesewedge-blue Added
cheesewedge-fresh Added
cheesewedge Added
cheesewheel-blue Added
cheesewheel-fresh Added
cheesewheel Added
cheesie_honkers Added
cheesyfries Added
cherrypie Added
chilied-eggs Added
chips Added
chocobanana Added
chocolatebar Added
chocolatecake Added
chocolatecake_slice Added
chocolateegg Added
clam-chowder Added
clownburger Added
clownstears Added
coldchili Added
coldsauce Added
cookie Added
corpsecube Added
crab-cakes Added
crab-dinner Added
crab-rangoon Added
cracker Added
crackerbag Added
crackerbag0 Added
crackerbag1 Added
crackerbag2 Added
crackerbag3 Added
crackerbag4 Added
crackerbag5 Added
crackerbag6 Added
crayonmre Added
crayonmre1 Added
creamcheesebread Added
creamcheesebreadslice Added

Edit: diff updated after f67c965

@DangerRevolution
Copy link
Contributor

image
Does this include the soundfile for the vendor?

@VMSolidus
Copy link
Member Author

image Does this include the soundfile for the vendor?

This doesn't! Ooh that sounds like fun.

@VMSolidus VMSolidus changed the title Vendors Directional Animated Vendors May 11, 2024
@DangerRevolution DangerRevolution added Priority: 2-High Needs to be resolved as soon as possible Holy Shit Size: 2-Large For large issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature labels May 11, 2024
@VMSolidus
Copy link
Member Author

Why is there a bunch of random sprite of drinks and food? Is this related to the PR at all?
(Checked files in github i hope its not this fucking it up)

Yea the original PR I cherrypicked this from included them by request from ODJ, who had intended to use them to add new items to vendors. They're the entirety of the roster of food related items from Baystation12. Some of them are actually used by the new vending machines included in this PR.

Quick question then, is this PR ready for Review?

No, not really. I need to finish polishing stuff with it first.

@VMSolidus VMSolidus marked this pull request as draft May 12, 2024 04:50
@Peptide90
Copy link
Contributor

Why is there a bunch of random sprite of drinks and food? Is this related to the PR at all?

(Checked files in github i hope its not this fucking it up)

The ODJ requests were fitness stuff and barber stuff which has been on my list forever. The fitness stuff has animations and stuff too but not implemented. Needs to be on use.

All the food sprites iirc have entities as I implemented all them for myself to make the vendors complete e.g. solsnacks/ mars vend / kawaii vend thing nipon tan.

There’s however lots of unused sprites for the smart fridges etc which were 32x64 as well as all the storage visuals for a lot of the fridges, intend to do them at a later date.

@VMSolidus VMSolidus marked this pull request as ready for review May 30, 2024 22:23
@VMSolidus VMSolidus removed Status: Needs Cleanup Someone has to clean this before merging Status: Do Not Merge Do not merge labels May 30, 2024
@DEATHB4DEFEAT
Copy link
Member

I was about to review this on the web but holy shit

image

I'll review this tomorrow maybe in VSCode so it doen't lag eternally and so I can mass "view" pngs.

@DEATHB4DEFEAT
Copy link
Member

Damn, I was going to add the Holy Shit label but DR beat me to it.

DangerRevolution
DangerRevolution suggested changes Jun 8, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

is every vendor resprited here? Donut vend, boardgame vend & solaris coffee vend seems to be the same.

@VMSolidus
Copy link
Member Author

is every vendor resprited here? Donut vend, boardgame vend & solaris coffee vend seems to be the same.

No. And why did you request changes for this question? I don't have the ability to make said resprites for the vendors that don't have resprites.

@VMSolidus
Copy link
Member Author

image

FUCK, ALRIGHT. I'M YEETING THAT STUPID PROTOTYPE DURING MY NEXT CODE SESSION.

@DangerRevolution
Copy link
Contributor

is every vendor resprited here? Donut vend, boardgame vend & solaris coffee vend seems to be the same.

No. And why did you request changes for this question? I don't have the ability to make said resprites for the vendors that don't have resprites.

draw them :)

@VMSolidus
Copy link
Member Author

is every vendor resprited here? Donut vend, boardgame vend & solaris coffee vend seems to be the same.

No. And why did you request changes for this question? I don't have the ability to make said resprites for the vendors that don't have resprites.

draw them :)

No. I'll just close this PR and we get nothing. Please don't require me to make sprites. I'm not that kind of artist.

@Aidenkrz Aidenkrz mentioned this pull request Jun 18, 2024
Merged
1 task
DangerRevolution
DangerRevolution approved these changes Jun 22, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

This needs an issue opened with all the unsprited vendors

Peptide90
Peptide90 approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@Peptide90 Peptide90 left a comment

Choose a reason for hiding this comment

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

Approving because anything additional to this can be a different PR. It's been merged for months on DS since I added them so lets get it merged proper.

@VMSolidus VMSolidus merged commit 53b5b3a into Simple-Station:master Jun 25, 2024
13 checks passed
@VMSolidus VMSolidus mentioned this pull request Aug 1, 2024
Merged
VMSolidus added a commit that referenced this pull request Aug 4, 2024
@VMSolidus
Add 4 Missing Vendors To Vendor Spawners (#639)
f6a5a2f 
# Description

#400 added 4 new
vendors that were never implemented in the game's spawners, so they
never actually appeared ingame. This PR adds them to random vendor
spawners, so that they'll show up on stations.

# Changelog

:cl:
- add: SweatMAX, "hot foods", Mars Mart, and Nippon-tan vendors have all
been added to vendor spawners.
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Aug 16, 2024
@whateverusername0 @Aidenkrz @VMSolidus
more ling fixes (Simple-Station#400)
e3d45bd 
* ling gamemode

* more shit

* gaming

* Update game_presets.yml

* Update secret_weights.yml

* gaming 2

* shittery

* fart

* fart 2

* gorbing

* balance stasis again

* fart

* goobing

* chat is this real?

* real.

* g

* fucking chemical regen i fucking hate it i hate you i hate everythi

* fart

* fart 2

* Add _timing

* fart 3

* fart 5

* fart 6: electrical boogaloo

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Peptide90 Peptide90 Peptide90 approved these changes

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

Assignees

@VMSolidus VMSolidus

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Holy Shit Priority: 2-High Needs to be resolved as soon as possible Size: 2-Large For large issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@VMSolidus @DangerRevolution @FoxxoTrystan @Peptide90 @DEATHB4DEFEAT @Pspritechologist