Commit Graph

105 Commits

Author SHA1 Message Date
Tayrtahn
1cf4508ca7 Add fill level visuals for water bottle in-hand sprites (#24708)
Fill level visuals for water bottle inhands

(cherry picked from commit cebb20d5355ec613d575df20d3a10fae974a2be0)
2024-02-08 11:56:59 +01:00
Hanz
be60ec7f59 Bartender limited reagents fixup (#24598)
Fixed up bartending after the limited reagents update

(cherry picked from commit 8fc9650b6e2cd9dbfb1fd05d731c2fad3e0b8165)
2024-01-28 00:33:59 +01:00
Nim
cd2f967ae2 Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat

(cherry picked from commit 6a0c8004923769a3cb5db88c4fb602c9def12abd)
2024-01-27 23:35:54 +01:00
themias
043f6205d8 Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite

(cherry picked from commit 6931848f1d875b22a1529e0868bff72f5dde663d)
2024-01-26 23:05:34 +01:00
TurboTrackerss14
37c32f5776 Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering

(cherry picked from commit c32d19cf5ca49bf583054a72eb229f93dfc5b303)
2024-01-26 23:01:01 +01:00
cool dolphin
81fa7c6443 Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills

(cherry picked from commit a34ee7c300414a9a28b583d12b293a5e010e9deb)
2024-01-26 22:15:01 +01:00
Ubaser
5a76c4f135 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>
(cherry picked from commit 172fcaf2d42db4cda25ce7a40df493692a8e4e98)
2024-01-26 22:03:21 +01:00
Velcroboy
c59e514bb9 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>
(cherry picked from commit ff75b1be56e0e4e4c24dc9c07bbe9fa067fe21f4)
2024-01-22 18:44:56 +01:00
Velcroboy
a549bc52c5 Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-22 22:56:56 +01:00
themias
9af07eb9c4 Add fill layers to Hot Cocoa drink (#22419) 2023-12-16 20:10:20 +01:00
IProduceWidgets
aa11a2bbc4 Jar now fills (#22384)
* Jar

* jar rsi
2023-12-16 20:00:18 +01:00
Nim
6c7fd94193 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-16 19:27:09 +01:00
Fluffiest Floofers
f9df410cff Vulpkanin mask and helmet custom sprites (#517)
* First batch buuuuuuuuuuh

So much stuff to redo

* gasmasks

* other important masks

* the rest of the one from that PR

* ert

* the smokeables

* changed smokeables sprite position

ye they looked goofy

* Remove paramed one

Doesn't fit anymore

* remove duplicate inventory comp

---------

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
2023-12-06 09:16:14 +01:00
DoubleRiceEddiedd
ba4c12618e New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-12-02 20:33:26 +01:00
Ubaser
bc4135c5ba Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-12-02 20:25:43 +01:00
Velcroboy
611c248571 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 22:23:30 +01:00
phunnyguy
e5573f44c6 Tortilla dough, Taco shells, and Tacos (#20797)
LGTM!
2023-10-20 15:30:21 +02:00
deltanedas
0d9b6a768e make tinned foods use openable (#19884)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-08 19:58:54 +02:00
Debug
fd2cc8570d Sync master up to 1/10 (#74)
* Automatic changelog update

* Make NPC names proper nouns & fix some genders (#20534)

* Proper names & genders

* Uppercase proper names

* Make Smile female

* fix bingus wrinkly head (#20531)

* rouny meat and steak (#20526)

* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311)

* Explosive wet floor sign & janitorial suicide vest

* fix attributions

* Remove name & desc from explosive wet floor sign

* Make wet floor sign chameleonable

* Automatic changelog update

* Minor slippery stuff (#20535)

* Update submodule to 162.2.0 (#20570)

* Predicted armor (#20560)

* clean up some lines in smile the slime prototype (#20552)

* Revert "Use full file path for temp replays (#19002)" (#20545)

* Add EyesGlasses into ClothesMate (#20523)

* Automatic changelog update

* Fix Punpun crew monitor sensor (#20484)

* Automatic changelog update

* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Make arcades hackable again (#20555)

* Automatic changelog update

* Health alert tweaks (#20557)

* Automatic changelog update

* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564)

* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent

* Nukeops todo and cleanup

* Remove Active field

* Add EndedGameRuleComponent

* bartender suit (#20521)

* give me a drink bartender

* guh

* aARG

* Necropolis and mine walls (#20578)

* Automatic changelog update

* archaic accent tweaks (#20567)

* Automatic changelog update

* Add confirmation to kick and respawn in the admin player actions panel (#20542)

* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540)

* Change .editorconfig to keep existing attribute arrangement (#20538)

* Automatic changelog update

* Catch replay start and end errors on round restarts (#20565)

* Update trivial components to use auto comp states (#20539)

* Fix role unbans not applying in real time (#20547)

* Disable AHelp buttons when no player is selected, update button styling (#20568)

* Automatic changelog update

* Added a toggle fullscreen button (default F11) (#20272)

* Added a toggle fullscreen button (default F11)

* Removed un-needed comments

* Review Requested Changes

* Fixed Acidental Spacing Change

* bwoink, removed extraneous code

* nothing, litterally

* Automatic changelog update

* Fix not networking markings (#20588)

* Automatic changelog update

* Update RobustToolbox to v162.2.1 (#20590)

* Automatic changelog update

* Glorfcode (force say on damage/stun/crit) (#20562)

* Automatic changelog update

* Fix AHelp progressively showing more AHelp panels (#20591)

* Automatic changelog update

* caninsert entitystorage tweaks (#20589)

* Automatic changelog update

* Fix mapping actions crashing on load (#20592)

* Fix loading a map with a ThirstComponent crashing the game (#20594)

* Fix electrocution displaying real name of disguised players (#20603)

* Organ fixes (#20488)

* Automatic changelog update

* Kettle medical rework (#20435)

* Initial try at medical rework for kettle

* Re-add decal decorations to Kettle's medical

* Add more lockers to kettle's med

* Actually upload kettle's map, not its proto

* Automatic changelog update

* Added blocked visuals to volumetric pump (#20610)

* Automatic changelog update

* Move TimedDespawn to engine (#20515)

* Update submodule to 163.0.0 (#20616)

* Remove v0.1 version number from local main menu screen (#20617)

* Remove cloneData parameter from AutoNetworkedField (#20596)

* Update submodule to 164.0.0 (#20618)

* fix cognizine ghost role (#20632)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* Move ID layer one pixel to correct alignment (#20630)

* Update nukie hardsuit descriptions (#20529)

* Make holofans destructable (#20445)

* Automatic changelog update

* bowl is open (#20453)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Add TestPair.WaitCommand() (#20615)

* Rename ThreatPrototype and mark fields as required (#20611)

* Adjust hard bomb shape (#20608)

* dragon refactor, objectives and use GenericAntag (#20201)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* Added generic empty liquids tank (#20563)

* Move view variables verb to the top of the list with no category and localize it (#20546)

* saltern update (#20325)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fix followers leaking (#20643)

* Add Winter Boots (#20622)

* add

* fix prototype

* Add QM mantle (#20621)

* add

* fix prototype

* Automatic changelog update

* Slime mobs breathe nitrogen and resprite their organs (#20577)

* Slimes breathe nitrogen and resprite their organs

* ups

* mmm

* Automatic changelog update

* Fix the new lizard horn's consistency + issue (#20620)

* fix

* add

* Revert "add"

This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.

* Add RandomHumanoidAppearance component to for space ninjas (#20605)

* Automatic changelog update

* Space cat breathes space (#20550)

* Space cat breathes space

Made Space Cat lungs ROBUST

* Made Space Cat's lungs ROBUST 2.0

* Automatic changelog update

* Wide anomaly locator (#20581)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* add textures

* fix encoding

* fix 2

* Automatic changelog update

* Fixed Telescopic Shield Lighting (#20650)

* Fixed Telescopic Shield Lighting Bug fix #20199

* no need for these at all

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Add a special hardsuit for nukie medic (#20471)

* Automatic changelog update

* Carry over other mutations when doing species mutation (#20551)

* Automatic changelog update

* Add Spanish accent to poncho and sombrero (#20377)

---------

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com>
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com>
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
2023-10-03 14:15:46 -05:00
Арт
1063c3b8d3 Added corn in butter (#19448)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02: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
Velcroboy
74c1a17888 Removes duplicate fortune cookie (#16304)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-05-11 00:20:27 +10:00
deltanedas
21166406d8 condiment rework (#16247)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-10 21:36:47 +10:00
potato1234_x
c2a5ca96e8 TG Station Burgers (#15217)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:43:09 +10:00
potato1234_x
aded6efc0a TG Station Bread (#15234)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:41:32 +10:00
lapatison
1a466388c1 [Frozen] Soups tweaks (#15110)
Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:36:33 +10:00
Floofi
982ab015f3 The Martinez drink from cyberpunk 2077 (#15421)
* added 'The Martinez' drink made with 1 ice, 1 lemon juice, 2 vodka, and 2 cola
---------
2023-05-03 18:23:43 -04:00
iller_saver
369bdcc3d1 New smokable: Vape! (#13072) 2023-05-02 00:34:11 +10:00
potato1234_x
24e6088dd7 Salt & Pepper Shakers (#15808) 2023-04-29 18:42:44 +10:00
keronshb
0f7e7da450 Ratvarian Language and CogChamp (#15639) 2023-04-29 18:34:19 +10:00
Puro
4443850de3 [Drink] Robust nukie drink (#15051)
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end
2023-04-03 00:42:37 -06:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703)
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
2023-03-24 02:54:47 -06:00
adamsong
980c3ef799 Improved solution container visuals (#13791) 2023-03-23 14:49:42 +11:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04:00
Moony
cc0c516e02 Improves bartending with some tweaks. (#14169)
* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-02-18 19:00:31 -06:00