Service Borger Upri- Kitchen Upgrades (#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
🆑
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.
/🆑
This commit is contained in:
Dawnseer
2023-05-02 18:59:53 -06:00
committed by GitHub
parent b685b0beb0
commit 61a034bcd9
17 changed files with 444 additions and 26 deletions
@@ -160,6 +160,31 @@
update_baking_audio()
return TRUE
/obj/machinery/oven/attack_robot(mob/user, modifiers)
. = ..()
open = !open
if(open)
playsound(src, 'sound/machines/oven/oven_open.ogg', 75, TRUE)
set_smoke_state(OVEN_SMOKE_STATE_NONE)
to_chat(user, span_notice("You open [src]."))
end_processing()
if(used_tray)
used_tray.vis_flags &= ~VIS_HIDE
else
playsound(src, 'sound/machines/oven/oven_close.ogg', 75, TRUE)
to_chat(user, span_notice("You close [src]."))
if(used_tray)
begin_processing()
used_tray.vis_flags |= VIS_HIDE
// yeah yeah i figure you don't need connect loc for just baking trays
for(var/obj/item/baked_item in used_tray.contents)
SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PLACED_IN, src, user)
update_appearance()
update_baking_audio()
return TRUE
/obj/machinery/oven/proc/update_baking_audio()
if(!oven_loop)
return
+1
View File
@@ -2,6 +2,7 @@
/obj/item/storage/bag/money
name = "money bag"
desc = "A bag for storing your profits."
icon_state = "moneybag"
worn_icon_state = "moneybag"
force = 10
@@ -780,24 +780,26 @@
name = "Service"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/reagent_containers/borghypo/borgshaker,
/obj/item/borg/apparatus/beaker/service,
/obj/item/reagent_containers/cup/beaker/large, //I know a shaker is more appropiate but this is for ease of identification
/obj/item/reagent_containers/condiment/enzyme,
/obj/item/reagent_containers/dropper,
/obj/item/rsf,
/obj/item/storage/bag/tray,
/obj/item/pen,
/obj/item/toy/crayon/spraycan/borg,
/obj/item/extinguisher/mini,
/obj/item/hand_labeler/borg,
/obj/item/razor,
/obj/item/rsf,
/obj/item/instrument/guitar,
/obj/item/instrument/piano_synth,
/obj/item/reagent_containers/dropper,
/obj/item/lighter,
/obj/item/storage/bag/tray,
/obj/item/reagent_containers/borghypo/borgshaker,
/obj/item/borg/lollipop,
/obj/item/stack/pipe_cleaner_coil/cyborg,
/obj/item/borg/apparatus/beaker/service,
/obj/item/chisel,
/obj/item/reagent_containers/cup/rag,
/obj/item/storage/bag/money,
)
radio_channels = list(RADIO_CHANNEL_SERVICE)
emag_modules = list(
@@ -1148,6 +1148,50 @@
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR
)
/datum/design/borg_upgrade_rolling_table
name = "Rolling Table Dock"
id = "borg_upgrade_rolling_table"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/rolling_table
materials = list(/datum/material/iron = 20000, /datum/material/titanium = 750) //steeper price than a regular rolling table, with some added titanium to make up for the relative rarity of regular rolling tables
construction_time = 4 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE
)
/datum/design/borg_upgrade_condiment_synthesizer
name = "Condiment Synthesizer"
id = "borg_upgrade_condiment_synthesizer"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/condiment_synthesizer
materials = list(/datum/material/iron = 15000, /datum/material/glass = 12000, /datum/material/plasma = 6000, /datum/material/uranium = 6000) //a bit cheaper than an expanded hypo for medical borg,
construction_time = 4 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE
)
/datum/design/borg_upgrade_silicon_knife
name = "Kitchen toolset"
id = "borg_upgrade_silicon_knife"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/silicon_knife
materials = list(/datum/material/iron = 15000, /datum/material/gold = 1000, /datum/material/silver = 1000,)
construction_time = 4 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE
)
/datum/design/borg_upgrade_service_apparatus
name = "Service apparatus"
id = "borg_upgrade_service_apparatus"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/service_apparatus
materials = list(/datum/material/iron = 5000)
construction_time = 4 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE
)
/datum/design/borg_upgrade_expand
name = "Expand Module"
id = "borg_upgrade_expand"
@@ -943,6 +943,19 @@
. = ..()
if(!CONFIG_GET(flag/disable_secborg))
design_ids += "borg_upgrade_disablercooler"
/datum/techweb_node/cyborg_upg_serv
id = "cyborg_upg_serv"
display_name = "Cyborg Upgrades: Service"
description = "Service upgrades for cyborgs."
prereq_ids = list("adv_robotics")
design_ids = list(
"borg_upgrade_rolling_table",
"borg_upgrade_condiment_synthesizer",
"borg_upgrade_silicon_knife",
"borg_upgrade_service_apparatus",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
/datum/techweb_node/cyborg_upg_engiminer
id = "cyborg_upg_engiminer"