Commit Graph

120 Commits

Author SHA1 Message Date
RumiTiger f5b8b5fbdc
Sprites for drinks without sprite (attempt 2) (#27227)
* A beer can and a wine can

* fix wrong file locations


---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:43:45 +10:00
NotSoDana f5aa5f1f22
Several new bartender tools (#27406)
* added bar specs

* specs in boozeomat

* added jigger in bartender guide

* fixed ice bucket

* cdn

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 14:40:07 +10:00
Flareguy 7b94e244b3
Ports a fuckton of vox clothing from Paradise and /vg/station (#27021)
* adds a bunch of vox clothing sprites

* bird up

* bee mask

* fix test fails. i hope. this better be the only damn one

* fix "eqipped"

* A.

* outerclohting

* ???

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-18 16:43:42 +10:00
metalgearsloth dc19964d84
Fix standart -> standard and dressfilled test fail (#26942)
Fix standart -> standard
2024-04-14 13:07:14 +10:00
BriBrooo 356c2799cf
fixed cigarette sprites (#26801) 2024-04-07 23:08:33 -04:00
PursuitInAshes 8adfa19181
Add sake bottle (#26776) 2024-04-06 13:16:47 -07:00
Firewatch ea3e98e120
Bartender "Essentials" (#25367)
* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst
2024-04-01 17:41:14 +11:00
Pieter-Jan Briers 89db4409a4
Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
potato1234_x e2741498b8
Add fill levels to bowls (#25639)
* fills

* contrast
2024-02-29 16:41:14 -05:00
Tayrtahn 29cdb9cf4e
Add fill level sprites for all the drinks (#25319)
* Fill levels for cuba libre

* Absinthe glass

* Acid Spit

* Ale glass

* Devil's kiss

* Doctor's delight (ugghh)

* Blue Curacao and Emerald Liquor glasses

* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass

* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb

* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian

* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass

* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic

* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee

* Long Island Iced Tea, Manly Dorf, Margarita, Mead

* Merge beer steins

* More merging

* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron

* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter

* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne

* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island

* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special

* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float

* Removed rogue pixel in Manhattan fill sprite.
2024-02-20 23:17:56 -07:00
Sybil 64cecdde84
add icons for drinks in Solar's (#25301)
* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace
2024-02-19 10:40:43 -05:00
Tayrtahn 41cf3e5599
Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
2024-02-04 12:13:47 -08:00
deltanedas 604748534e
Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-03 19:12:56 +11:00
Tayrtahn 765ea789cc
Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-03 12:55:02 +11:00
SlamBamActionman e36844de47
Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly
2024-02-02 09:27:52 +11:00
RumiTiger b80b6c04b2
A beer can and a wine can (#24365)
* A beer can and a wine can

* fix wrong file locations

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Update drinks_cans.yml

* A beer can and a wine can

* Update drinks_cans.yml

* A beer can and a wine can

* replace sprites

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Update meta.json

* Update meta.json

* Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 17:41:23 +11:00
Tayrtahn cebb20d535
Add fill level visuals for water bottle in-hand sprites (#24708)
Fill level visuals for water bottle inhands
2024-01-29 16:19:55 -07:00
Hanz 8fc9650b6e
Bartender limited reagents fixup (#24598)
Fixed up bartending after the limited reagents update
2024-01-27 09:49:26 -08:00
Nim 6a0c800492
Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat
2024-01-20 18:38:10 -05:00
themias 6931848f1d
Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite
2024-01-18 16:55:05 -05:00
TurboTrackerss14 c32d19cf5c
Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering
2024-01-17 01:46:33 -07:00
cool dolphin a34ee7c300
Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
2024-01-08 19:24:32 -07:00
Ubaser 172fcaf2d4
Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
Velcroboy ff75b1be56
Salami does melee dmg (#23041)
* Add melee dmg to salami

* Bump up dmg to 6, 1 more than a punch

* Add in-hand and wielded sprites, and adjust swing angle

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-27 19:59:14 -07:00
Velcroboy a4ed13af4a
Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 15:51:39 -07:00
themias e7de7fa075
Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
IProduceWidgets b279f5c910
Jar now fills (#22384)
* Jar

* jar rsi
2023-12-12 00:54:15 -07:00
Nim 460bfdc73c
Space cobra 1.1 (#20298)
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
2023-12-06 20:25:57 -05:00
DoubleRiceEddiedd 33fb768791
New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-11-30 16:44:23 -05:00
Ubaser de601208ea
Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-11-28 00:09:55 -07:00
Velcroboy 808555ade6
Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
phunnyguy c92b99f6ba
Tortilla dough, Taco shells, and Tacos (#20797)
LGTM!
2023-10-18 14:03:23 -07:00
deltanedas 6af7c90b73
make tinned foods use openable (#19884)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-06 17:35:32 -07:00
deltanedas 0d22d2d1f2
rouny meat and steak (#20526)
* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-28 00:07:08 -04:00
Арт 0c9c68027a
Added corn in butter (#19448)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-20 19:51:08 +10:00
Velcroboy 1de23dc4d0
Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
potato1234_x 149e58d30a
revamp getmore inventory (#19372) 2023-08-23 17:49:25 -04:00
Tollhouse 8dedabbb8f
Dan's Soaked Smokes (#19150)
* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list.

* Forgot a png

* Smokes work just need sprite work and random

* First pass on random cigs

* Cigarettes are named now just randomization left

* Finished on my end.

* Whoops

* Nutrient is not availiable for smokes I guess?

* Testing fixes

* Dunno found this on the filledbookshelf might work here?

* I dont know what Im doing wrong but I think this might work.

* Trying with orgroups in the pack YAML

* It seems to not like the food chems. Commented them out.

* THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume.

* I have a sneaky suspicion its the size of the container and pool of fill items.

* Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent.

* Apparently non whole number size is a no go.

* Cartons were to small and added maxamount on cigarettes.

* Amount: 0 caused odd errors. removed and changed maxamount to 2.

* Reworked randomization system to try and use weightedRandom instead of prob in storageFill

* Wrong weightedRandom

* Rework of a rework. Good on my end. Simplified the randomization to bare minimum.

* Added gas station dick pill vibe to all the names.
2023-08-15 18:27:18 -06:00
Interrobang01 3457729ba4
Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
SpaceCat fc4c964e61
adds champagne (#18344)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-07-28 17:54:36 +02:00
OctoRocket 0d2bf9d23c
[Add] Adds HoS Flask (#18268)
* [Add] Adds HoS fask

* Added flask base
2023-07-27 13:41:33 -06:00
potato1234_x ee8407f8c3
nukie drink more like, uh, cringe (#18349) 2023-07-26 20:17:22 -06:00
deathride58 a32fbb37ce
Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) 2023-07-11 21:00:30 -06:00
Jessetriesagain 9a12aade93
Simple Tweak to Ale Sprite to look more like a type of Ale (#17757)
Co-authored-by: Jessepretendstocode <j14527998@gmail.com>
2023-07-03 15:34:26 -06:00
Slava0135 9c976d517e
Add space lube tube (#17387) 2023-06-27 22:48:06 -04:00
lzk 335ee13caf
Taco! (#17635) 2023-06-26 13:05:07 +10:00
SonicHDC 7c609c913e
Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Slava0135 e554958be6
Add space glue tube (#16600) 2023-05-20 12:42:38 +10:00
Jackal298 ed05998f4c
Changeling Sting Sprites Update (#16620)
I updated the sprites for the changeling sting
2023-05-19 14:11:25 -06:00
deltanedas 22088f693b
manly dorf is now like oily oaf (#16349) 2023-05-13 08:14:56 -04:00