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

Service Borger Upri- Kitchen Upgrades #74938

Merged
merged 39 commits into from May 3, 2023

Conversation

Dawnseer
Copy link
Contributor

@Dawnseer Dawnseer commented Apr 23, 2023

About The Pull Request

I decided that Service Borgs had been left in the dust for too long, and that since they're named 'Service' cyborgs and not 'Bar' cyborgs I'd give them upgrades to let them assist in the kitchen. To do this I've made 4 upgrades.

First up, rolling table dock, to provide mobile service. Nothing worse than offering someone a drink in a hallway and having to drag them to the nearest table or having to drop it on the floor. That's poor service.
Secondly there's a condiment synthesizer, which can produce solid condiments like flour, cornmeal, salt, coco powder, etc.
Thirdly a kitchen toolset, a knife that can switch to a rolling pin. The blade dulls when not used for cooking.
Fourthly, A service apparatus, which can pick up food, oven trays, soup pots, plates, bowls and paper.

The upgrades are locked behind a new techweb node, Cyborg Upgrades: Service.
This node is locked behind the same nodes as the janitorial cyborg upgrade node.

And outside the upgrades, I've also given the cyborg a rag so it can finally clean it's glasses and tables. I've also given it a money bag, to store the profits. This gives cyborgs an opportunity to save up for getting on the deluxe shuttle. Or giving people a new target to hold up and shake down for their hard earned money. Please don't law 2 them into giving you their lunch money. Or do.
I've also enabled the RSF to print a few more things. Plates, bowls, plastic cutlery and paper cups.
I've also enabled borgs to open and close the oven. Alas, they still can't pick up food or the oven trays from the oven, since the oven is sticky in a manner.

I've also added a little bit more to the borgshaker, and moved sugar from the borgshaker to the condiment synthesizer.

And not only the borgshaker, but the emagged shaker too. The emagged shaker has been given blood and carpotoxin. And you may ask 'Why those two ingredients?' Both can be used like fernet, both for nice things, and harmful things, staying in line with fernet. Blood can be used to mix drinks or be used for food, or for disease, since the borg or anyone with access to milk and water can easily produce virus food. Meanwhile carpotoxin is well, a rather weak toxin but can also be used to make imitation carpmeat. This'l give more reason to also consider the borg for emagging, or giving illegal tech, instead of just speedlining for the nearest engineering borg or medical borg.
image

The Condiment Synthesizer uses the same UI as the medical hypo, due to it's ingredient list being low in comparison to the shaker
image

I've been trying to figure out how to get an item to allow the borg to open the cooking menu when used inhand/inmodule. But I can't figure that one out, sadly. Nor how to let the Service Apparatus pick up trays from the oven.
So for now, service borgs will have to settle for simply assisting in the kitchen.

Why It's Good For The Game

Allows Service Cyborgs the tools to help in the kitchen, and elsewhere too.

Changelog

🆑
add: Damp rag and Money bag to service borg
add: Service borg upgrades, with accompanying tech web node
add: Sprites for kitchen toolset, and service apparatus
balance: The RSF can print a few more things, paper cups, seaweed sheets, plates, bowls, plastic cutlery and standard decks of cards.
balance: Sugar moved from borgshaker to condiment synthesizer. Berry juice, cherry jelly and vinegar added to borgshaker. balance: Both shaker and synthesizer can also be adjusted to give 1 unit at time, so it goes 5, 10, 20 then 1, and back around.
balance: Adds blood and Carpotoxin to the emagged borgshaker.
fix: Money bag was missing a description, it now has one.
/:cl:

Yeah okay next time I am going to make a commit for every change instead of making one big change this is hard to organize
@Dawnseer Dawnseer requested a review from Fikou as a code owner April 23, 2023 12:42
@tgstation-server tgstation-server added Balance Changes to functionality that modifies how effective certain methods are at powergaming Feature Exposes new bugs in interesting ways Fix Rewrites a bug so it appears in different circumstances labels Apr 23, 2023
@Jezzared
Copy link

Borg rag! Long live the Borg rag!

Finally, i can clean the glasses after the meatbags contaminate them.

@AtomTheProphet
Copy link
Contributor

AtomTheProphet commented Apr 23, 2023

Wooo! I love it! This is exactly what we need.

@datorangebottle
Copy link

Are they able to pick stuff up off of / put stuff down on the griddles/ovens?
For some reason I remember this not being a thing in the past.

@Dawnseer
Copy link
Contributor Author

Dawnseer commented Apr 23, 2023

Are they able to pick stuff up off of / put stuff down on the griddles/ovens? For some reason I remember this not being a thing in the past.

No, I made an apparatus that could pick up oven trays and put them in the oven, but getting the oven to release the tray from it's cruel grip was beyond me. So for now the apparatus is hidden in my project folder, same as my attempt at making an item open up the cooking menu.

Same for griddle. Putting stuff on it is easy enough. It's getting stuff back from it that annoys.

@GoldenAlpharex
Copy link
Contributor

Just letting you know, for the knife/rolling pin stuff, downstream we just made a "power tool" cyborg version of that, which would probably be a better alternative here as it's just two slots instead of one. It also had sprites for both endings, now whether or not you'd like to keep that one or not would be entirely up to you.

If you're interested, take a look at the code for it. The sprites are here.

@Dawnseer
Copy link
Contributor Author

Just letting you know, for the knife/rolling pin stuff, downstream we just made a "power tool" cyborg version of that, which would probably be a better alternative here as it's just two slots instead of one. It also had sprites for both endings, now whether or not you'd like to keep that one or not would be entirely up to you.

If you're interested, take a look at the code for it. The sprites are here.

Gonna have a gander at that after I get home from work tomorrow, then ask the maintainers what they think of the sprites. For now putting it on draft so I can also try to have another crack at making an item that lets the borg open the cooking part of the crafting menu

@Dawnseer Dawnseer marked this pull request as draft April 23, 2023 21:40
@Wallemations
Copy link
Contributor

How does the rolling table dock work? Does it print a table or is it just for picking up and putting down a table?

@Dawnseer
Copy link
Contributor Author

How does the rolling table dock work? Does it print a table or is it just for picking up and putting down a table?

The rolling table dock is for picking up and putting down rolling tables. It comes pre-equipped with a rolling table.
It can only be put down on turfs with no dense objects or living things, and can only be picked up if there's no living things on the table.

Added the suggested knife/rolling pin power tool, but made some alterations such as it not being faster, and still keeping the whole 'no stabby' part, while also making the rolling pin sound blunt
@tgstation-server tgstation-server added the Sprites A bikeshed full of soulless bikes. label Apr 24, 2023
@Dawnseer
Copy link
Contributor Author

Alright, went with the suggested knife/rolling pin tool, made some alterations, and also added the service apparatus, a tool for picking up food and oven trays. Still can't get the service borg to be able to craft. So I'll leave that to some more experienced coder. Undtil then, service borgs will have to settle for simply assisting in the kitchen.

Gave the service apparatus it's own sprite, allowed borgs to open and close the oven. Still can't pick trays up from the oven. But you can place food in it, and cook it, and open the oven when it's done. Just not retrieve it yourself.
@Dawnseer Dawnseer marked this pull request as ready for review April 24, 2023 19:06
@Dawnseer Dawnseer marked this pull request as ready for review April 30, 2023 15:45
@Dawnseer
Copy link
Contributor Author

Alright, took a couple of minutes, but got through the list. There is one thing I haven't changed yet and that is the RSF list, due to the listed reason in the comment at that part, so get back to me on that please if that's okay or if you'd really prefer it to be alphabetized

Removing the drill use sound, it's silly to hear a drill when you're using a knife.
Copy link
Member

@dragomagol dragomagol left a comment

Choose a reason for hiding this comment

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

Love it

Just explaining above the code why it's not alphabetical, but rather sorted by category due to how it shows in player facing ui
Enabled the borgshaker and condiment synthesizer to be able to pour 1 unit at a time, and made the service apparatus able to also hold plates, bowls, and soup pots.
Adjusted so the first page of the RSF is the cups, bowl, plate and cutlery, while the second page is the misc stuff. Also added seaweed sheets to it.
How many minutes are you gonna give me? Anyway, adds blood and carpotoxin to the emagged borgshaker.
Copy link
Member

@san7890 san7890 left a comment

Choose a reason for hiding this comment

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

do this and we're solid

code/game/objects/items/rcd/RSF.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/items/hypo.dm Outdated Show resolved Hide resolved
code/game/objects/items/robot/items/storage.dm Outdated Show resolved Hide resolved
@Dawnseer Dawnseer requested a review from san7890 May 2, 2023 15:40
@san7890 san7890 merged commit 61a034b into tgstation:master May 3, 2023
18 checks passed
comfyorange added a commit that referenced this pull request May 3, 2023
github-actions bot added a commit that referenced this pull request May 3, 2023
Jolly-66 pushed a commit to TaleStation/TaleStation that referenced this pull request May 3, 2023
Original PR: tgstation/tgstation#74938
-----
## About The Pull Request
I decided that Service Borgs had been left in the dust for too long, and
that since they're named 'Service' cyborgs and not 'Bar' cyborgs I'd
give them upgrades to let them assist in the kitchen. To do this I've
made 4 upgrades.

First up, rolling table dock, to provide mobile service. Nothing worse
than offering someone a drink in a hallway and having to drag them to
the nearest table or having to drop it on the floor. That's poor
service.
Secondly there's a condiment synthesizer, which can produce solid
condiments like flour, cornmeal, salt, coco powder, etc.
Thirdly a kitchen toolset, a knife that can switch to a rolling pin. The
blade dulls when not used for cooking.
Fourthly, A service apparatus, which can pick up food, oven trays, soup
pots, plates, bowls and paper.

The upgrades are locked behind a new techweb node, Cyborg Upgrades:
Service.
This node is locked behind the same nodes as the janitorial cyborg
upgrade node.

And outside the upgrades, I've also given the cyborg a rag so it can
finally clean it's glasses and tables. I've also given it a money bag,
to store the profits. This gives cyborgs an opportunity to save up for
getting on the deluxe shuttle. Or giving people a new target to hold up
and shake down for their hard earned money. Please don't law 2 them into
giving you their lunch money. Or do.
I've also enabled the RSF to print a few more things. Plates, bowls,
plastic cutlery and paper cups.
I've also enabled borgs to open and close the oven. Alas, they still
can't pick up food or the oven trays from the oven, since the oven is
sticky in a manner.

I've also added a little bit more to the borgshaker, and moved sugar
from the borgshaker to the condiment synthesizer.

And not only the borgshaker, but the emagged shaker too. The emagged
shaker has been given blood and carpotoxin. And you may ask 'Why those
two ingredients?' Both can be used like fernet, both for nice things,
and harmful things, staying in line with fernet. Blood can be used to
mix drinks or be used for food, or for disease, since the borg or anyone
with access to milk and water can easily produce virus food. Meanwhile
carpotoxin is well, a rather weak toxin but can also be used to make
imitation carpmeat. This'l give more reason to also consider the borg
for emagging, or giving illegal tech, instead of just speedlining for
the nearest engineering borg or medical borg.

![image](https://user-images.githubusercontent.com/126404225/233840472-7665196c-1052-4e29-9749-6c2b99e5fa9e.png)

The Condiment Synthesizer uses the same UI as the medical hypo, due to
it's ingredient list being low in comparison to the shaker

![image](https://user-images.githubusercontent.com/126404225/235359571-48157d24-f3c8-448f-bb05-6f8842526aae.png)

I've been trying to figure out how to get an item to allow the borg to
open the cooking menu when used inhand/inmodule. But I can't figure that
one out, sadly. Nor how to let the Service Apparatus pick up trays from
the oven.
So for now, service borgs will have to settle for simply assisting in
the kitchen.

## Why It's Good For The Game
Allows Service Cyborgs the tools to help in the kitchen, and elsewhere
too.
## Changelog
:cl:
add: Damp rag and Money bag to service borg
add: Service borg upgrades, with accompanying tech web node
add: Sprites for kitchen toolset, and service apparatus
balance: The RSF can print a few more things, paper cups, seaweed
sheets, plates, bowls, plastic cutlery and standard decks of cards.
balance: Sugar moved from borgshaker to condiment synthesizer. Berry
juice, cherry jelly and vinegar added to borgshaker. balance: Both
shaker and synthesizer can also be adjusted to give 1 unit at time, so
it goes 5, 10, 20 then 1, and back around.
balance: Adds blood and Carpotoxin to the emagged borgshaker.
fix: Money bag was missing a description, it now has one.
/:cl:

---------

Co-authored-by: Dawnseer <126404225+Dawnseer@users.noreply.github.com>
@zombiegums
Copy link

This is really cool! I played around with it, and noticed that borgs are unable to do things like remove meat slabs from the griddle even though they can put them on there. Same thing with putting stuff in the fryer - they can't be taken out.

@Dawnseer
Copy link
Contributor Author

This is really cool! I played around with it, and noticed that borgs are unable to do things like remove meat slabs from the griddle even though they can put them on there. Same thing with putting stuff in the fryer - they can't be taken out.

Indeed, which is why i got a code bounty out for that since I couldn't solve it myself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Changes to functionality that modifies how effective certain methods are at powergaming Feature Exposes new bugs in interesting ways Fix Rewrites a bug so it appears in different circumstances Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet