[MIRROR] [MDB IGNORE] Service Borger Upri- Kitchen Upgrades (#5611)

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>

code/__DEFINES/exosuit_fab.dm

@@ -8,6 +8,8 @@
 #define BORG_MODEL_MEDICAL (1<<3)
 /// Module is compatible with Engineering Cyborg model
 #define BORG_MODEL_ENGINEERING (1<<4)
+/// Module is compatible with Service Cyborg model
+#define BORG_MODEL_SERVICE (1<<5)
 
 /// Module is compatible with Ripley Exosuit models
 #define EXOSUIT_MODULE_RIPLEY (1<<0)

code/__DEFINES/research/research_categories.dm

@@ -159,6 +159,7 @@
 #define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR "/Janitorial Cyborgs"
 #define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SECURITY "/Security Cyborgs"
 #define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING "/Mining Cyborgs"
+#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE "/Service Cyborgs"
 
 #define RND_CATEGORY_MODSUITS "/MOD Suits"
 #define RND_SUBCATEGORY_MODUITS_CHASSIS "/Chassis"

code/__DEFINES/tools.dm

@@ -17,7 +17,7 @@
 #define TOOL_BONESET "bonesetter"
 #define TOOL_KNIFE "knife"
 #define TOOL_BLOODFILTER "bloodfilter"
-#define TOOL_ROLLINGPIN "rollingpin"
+#define TOOL_ROLLINGPIN "rolling pin"
 /// Can be used to scrape rust off an any atom; which will result in the Rust Component being qdel'd
 #define TOOL_RUSTSCRAPER "rustscraper"
 

code/game/objects/items/kitchen.dm

@@ -102,6 +102,44 @@
 	. = ..()
 	AddElement(/datum/element/easily_fragmented, PLASTIC_BREAK_PROBABILITY)
 
+/obj/item/knife/kitchen/silicon
+	name = "Kitchen Toolset"
+	icon_state = "sili_knife"	
+	desc = "A breakthrough in synthetic engineering, this tool is a knife programmed to dull when not used for cooking purposes, and can exchange the blade for a rolling pin"
+	force = 0
+	throwforce = 0
+	sharpness = SHARP_EDGED
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	attack_verb_continuous = list("prods", "whiffs", "scratches", "pokes")
+	attack_verb_simple = list("prod", "whiff", "scratch", "poke")
+	tool_behaviour = TOOL_KNIFE
+
+/obj/item/knife/kitchen/silicon/examine()
+	. = ..()
+	. += " It's fitted with a [tool_behaviour] head."
+
+/obj/item/knife/kitchen/silicon/attack_self(mob/user)
+	playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE)
+	if(tool_behaviour != TOOL_ROLLINGPIN)
+		tool_behaviour = TOOL_ROLLINGPIN
+		to_chat(user, span_notice("You attach the rolling pin bit to the [src]."))
+		icon_state = "sili_rolling_pin"
+		force = 8
+		sharpness = NONE
+		hitsound = SFX_SWING_HIT
+		attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
+		attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
+
+	else
+		tool_behaviour = TOOL_KNIFE
+		to_chat(user, span_notice("You attach the knife bit to the [src]."))
+		icon_state = "sili_knife"
+		force = 0
+		sharpness = SHARP_EDGED
+		hitsound = 'sound/weapons/bladeslice.ogg'
+		attack_verb_continuous = list("prods", "whiffs", "scratches", "pokes")
+		attack_verb_simple = list("prod", "whiff", "scratch", "poke")
+
 /obj/item/kitchen/rollingpin
 	name = "rolling pin"
 	desc = "Used to knock out the Bartender."

code/game/objects/items/rcd/RSF.dm

@@ -31,12 +31,22 @@ RSF
 	var/dispense_cost = 0
 	w_class = WEIGHT_CLASS_NORMAL
 	///An associated list of atoms and charge costs. This can contain a separate list, as long as it's associated item is an object
-	var/list/cost_by_item = list(/obj/item/reagent_containers/cup/glass/drinkingglass = 20,
-								/obj/item/paper = 10,
-								/obj/item/storage/dice = 200,
-								/obj/item/pen = 50,
-								/obj/item/clothing/mask/cigarette = 10,
-								)
+	///The RSF item list below shows in the player facing ui in this order, this is why it isn't in alphabetical order, but instead sorted by category
+	var/list/cost_by_item = list(
+		/obj/item/reagent_containers/cup/glass/drinkingglass = 20,
+		/obj/item/reagent_containers/cup/glass/sillycup = 10,
+		/obj/item/plate = 70,
+		/obj/item/reagent_containers/cup/bowl = 70,
+		/obj/item/kitchen/fork/plastic = 30,
+		/obj/item/knife/plastic = 30,
+		/obj/item/kitchen/spoon/plastic = 30,
+		/obj/item/food/seaweedsheet = 30,
+		/obj/item/storage/dice = 200,
+		/obj/item/toy/cards/deck = 200,
+		/obj/item/paper = 10,
+		/obj/item/pen = 50,
+		/obj/item/clothing/mask/cigarette = 10,
+	)
 	///An associated list of fuel and it's value
 	var/list/matter_by_item = list(/obj/item/rcd_ammo = 10,)
 	///A list of surfaces that we are allowed to place things on.

code/game/objects/items/robot/items/hypo.dm

@@ -52,27 +52,43 @@
 		/datum/reagent/medicine/syndicate_nanites\
 	)
 #define BASE_SERVICE_REAGENTS list(/datum/reagent/consumable/applejuice, /datum/reagent/consumable/banana,\
-		/datum/reagent/consumable/coffee, /datum/reagent/consumable/cream, /datum/reagent/consumable/dr_gibb,\
-		/datum/reagent/consumable/grenadine, /datum/reagent/consumable/ice, /datum/reagent/consumable/lemonjuice,\
-		/datum/reagent/consumable/lemon_lime, /datum/reagent/consumable/limejuice, /datum/reagent/consumable/menthol,\
-		/datum/reagent/consumable/milk, /datum/reagent/consumable/nothing, /datum/reagent/consumable/orangejuice,\
-		/datum/reagent/consumable/peachjuice, /datum/reagent/consumable/pineapplejuice,\
-		/datum/reagent/consumable/pwr_game, /datum/reagent/consumable/shamblers, /datum/reagent/consumable/sodawater,\
-		/datum/reagent/consumable/sol_dry, /datum/reagent/consumable/soymilk, /datum/reagent/consumable/space_cola,\
-		/datum/reagent/consumable/spacemountainwind, /datum/reagent/consumable/space_up, /datum/reagent/consumable/sugar,\
+		/datum/reagent/consumable/berryjuice, /datum/reagent/consumable/cherryjelly, /datum/reagent/consumable/coffee,\
+		/datum/reagent/consumable/cream, /datum/reagent/consumable/dr_gibb, /datum/reagent/consumable/grenadine,\
+		/datum/reagent/consumable/ice, /datum/reagent/consumable/lemon_lime, /datum/reagent/consumable/limejuice,\
+		/datum/reagent/consumable/lemonjuice, /datum/reagent/consumable/menthol, /datum/reagent/consumable/nothing,\
+		/datum/reagent/consumable/milk, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/peachjuice,\
+		/datum/reagent/consumable/pineapplejuice, /datum/reagent/consumable/pwr_game, /datum/reagent/consumable/shamblers,\
+		/datum/reagent/consumable/sodawater, /datum/reagent/consumable/sol_dry, /datum/reagent/consumable/soymilk,\
+		/datum/reagent/consumable/space_cola, /datum/reagent/consumable/spacemountainwind, /datum/reagent/consumable/space_up,\
 		/datum/reagent/consumable/tea, /datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/tonic,\
-		/datum/reagent/water,\
+		/datum/reagent/consumable/vinegar, /datum/reagent/water,\
 		/datum/reagent/consumable/ethanol/ale, /datum/reagent/consumable/ethanol/applejack, /datum/reagent/consumable/ethanol/beer,\
 		/datum/reagent/consumable/ethanol/champagne, /datum/reagent/consumable/ethanol/cognac, /datum/reagent/consumable/ethanol/creme_de_coconut,\
 		/datum/reagent/consumable/ethanol/creme_de_cacao, /datum/reagent/consumable/ethanol/creme_de_menthe, /datum/reagent/consumable/ethanol/gin,\
 		/datum/reagent/consumable/ethanol/kahlua, /datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/sake,\
 		/datum/reagent/consumable/ethanol/tequila, /datum/reagent/consumable/ethanol/triple_sec, /datum/reagent/consumable/ethanol/vermouth,\
 		/datum/reagent/consumable/ethanol/vodka, /datum/reagent/consumable/ethanol/whiskey, /datum/reagent/consumable/ethanol/wine\
 	)
+#define EXPANDED_SERVICE_REAGENTS list(\
+	/datum/reagent/consumable/blackpepper,\
+	/datum/reagent/consumable/coco,\
+	/datum/reagent/consumable/cornmeal,\
+	/datum/reagent/consumable/cornoil,\
+	/datum/reagent/consumable/corn_starch,\
+	/datum/reagent/consumable/eggwhite,\
+	/datum/reagent/consumable/eggyolk,\
+	/datum/reagent/consumable/flour,\
+	/datum/reagent/consumable/rice,\
+	/datum/reagent/consumable/sugar,\
+	/datum/reagent/consumable/salt,\
+	/datum/reagent/consumable/vanilla,\
+)
 #define HACKED_SERVICE_REAGENTS list(\
+		/datum/reagent/blood,\
+		/datum/reagent/toxin/carpotoxin,\
 		/datum/reagent/toxin/fakebeer,\
-		/datum/reagent/consumable/ethanol/fernet\
-	)
+		/datum/reagent/consumable/ethanol/fernet,\
+)
 
 ///Borg Hypospray
 /obj/item/reagent_containers/borghypo
@@ -215,7 +231,6 @@
 		if(reagent.name == action)
 			selected_reagent = reagent
 			. = TRUE
-
 			var/mob/living/silicon/robot/cyborg = loc
 			if(istype(loc, /obj/item/robot_model))
 				var/obj/item/robot_model/container_model = loc
@@ -304,12 +319,13 @@
 	desc = "An advanced drink synthesizer and mixer."
 	icon = 'icons/obj/drinks/bottles.dmi'
 	icon_state = "shaker"
-	possible_transfer_amounts = list(5,10,20)
+	possible_transfer_amounts = list(5,10,20,1)
 	// Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
 	charge_cost = 20
 	recharge_time = 3
 	dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP //Water stays wet, ice stays ice
 	default_reagent_types = BASE_SERVICE_REAGENTS
+	expanded_reagent_types = EXPANDED_SERVICE_REAGENTS
 
 /obj/item/reagent_containers/borghypo/borgshaker/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
@@ -320,7 +336,6 @@
 /obj/item/reagent_containers/borghypo/borgshaker/ui_data(mob/user)
 	var/list/drink_reagents = list()
 	var/list/alcohol_reagents = list()
-
 	for(var/datum/reagent/reagent in stored_reagents.reagent_list)
 		// Split the reagents into alcoholic/non-alcoholic
 		if(istype(reagent, /datum/reagent/consumable/ethanol))
@@ -370,6 +385,70 @@
 		shaker.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
 		balloon_alert(user, "[amount_per_transfer_from_this] unit\s poured")
 	return .
+
+/obj/item/reagent_containers/borghypo/condiment_synthesizer // Solids! Condiments! The borger uprising!
+	name = "Condiment Synthesizer"
+	desc = "An advanced condiment synthesizer"
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "flour"
+	possible_transfer_amounts = list(5,10,20,1)
+	// Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
+	charge_cost = 40 //Costs double the power of the borgshaker due to synthesizing solids
+	recharge_time = 6 //Double the recharge time too, for the same reason.
+	dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP 
+	default_reagent_types = EXPANDED_SERVICE_REAGENTS
+
+/obj/item/reagent_containers/borghypo/condiment_synthesizer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "BorgHypo", name)
+		ui.open()
+
+/obj/item/reagent_containers/borghypo/condiment_synthesizer/ui_data(mob/user)
+	var/list/condiments = list()
+	for(var/datum/reagent/reagent in stored_reagents.reagent_list)
+		if(reagent)
+			condiments.Add(list(list(
+				"name" = reagent.name,
+				"volume" = round(reagent.volume, 0.01) - 1,
+				"description" = reagent.description,
+			))) // list in a list because Byond merges the first list...
+
+	var/data = list()
+	data["theme"] = tgui_theme
+	data["minVolume"] = amount_per_transfer_from_this
+	data["maxVolume"] = max_volume_per_reagent
+	data["reagents"] = condiments
+	data["selectedReagent"] = selected_reagent?.name
+	return data
+
+/obj/item/reagent_containers/borghypo/condiment_synthesizer/attack(mob/M, mob/user)
+	return 
+
+/obj/item/reagent_containers/borghypo/condiment_synthesizer/afterattack(obj/target, mob/user, proximity)
+	. = ..()
+	if(!proximity)
+		return .
+	if(!selected_reagent)
+		balloon_alert(user, "no reagent selected!")
+		return .
+	. |= AFTERATTACK_PROCESSED_ITEM
+	if(!target.is_refillable())
+		return .
+	if(!stored_reagents.has_reagent(selected_reagent.type, amount_per_transfer_from_this))
+		balloon_alert(user, "not enough [selected_reagent.name]!")
+		return .
+	if(target.reagents.total_volume >= target.reagents.maximum_volume)
+		balloon_alert(user, "[target] is full!")
+		return .
+	// This is the in-between where we're storing the reagent we're going to pour into the container
+	// because we cannot specify a singular reagent to transfer in trans_to
+	var/datum/reagents/shaker = new()
+	stored_reagents.remove_reagent(selected_reagent.type, amount_per_transfer_from_this)
+	shaker.add_reagent(selected_reagent.type, amount_per_transfer_from_this, reagtemp = dispensed_temperature, no_react = TRUE)
+	shaker.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
+	balloon_alert(user, "[amount_per_transfer_from_this] unit\s poured")
+
 
 /obj/item/reagent_containers/borghypo/borgshaker/hacked
 	name = "cyborg shaker"
@@ -389,4 +468,5 @@
 #undef HACKED_CLOWN_REAGENTS
 #undef BASE_SYNDICATE_REAGENTS
 #undef BASE_SERVICE_REAGENTS
+#undef EXPANDED_SERVICE_REAGENTS
 #undef HACKED_SERVICE_REAGENTS

code/game/objects/items/robot/items/storage.dm

@@ -300,3 +300,40 @@
 	if(istype(atom, /obj/item/ai_module) && !stored) //If an admin wants a borg to upload laws, who am I to stop them? Otherwise, we can hint that it fails
 		to_chat(user, span_warning("This circuit board doesn't seem to have standard robot apparatus pin holes. You're unable to pick it up."))
 	return ..()
+
+/obj/item/borg/apparatus/service
+	name = "Service apparatus"
+	desc = "A special apparatus for carrying food, bowls, plates, oven trays, soup pots and paper."
+	icon_state = "borg_service_apparatus"
+	storable = list(
+		/obj/item/food,
+		/obj/item/paper,
+		/obj/item/plate,
+		/obj/item/plate/oven_tray,
+		/obj/item/reagent_containers/cup/bowl,
+		/obj/item/reagent_containers/cup/soup_pot,
+	)
+
+/obj/item/borg/apparatus/service/Initialize(mapload)
+	update_appearance()
+	return ..()
+
+/obj/item/borg/apparatus/service/update_overlays()
+	. = ..()
+	var/mutable_appearance/arm = mutable_appearance(icon, "borg_hardware_apparatus_arm1")
+	if(stored)
+		stored.pixel_x = -3
+		stored.pixel_y = 0
+		if((!istype(stored, /obj/item/plate/oven_tray)) || (!istype(stored, /obj/item/food)))
+			arm.icon_state = "borg_hardware_apparatus_arm2"
+		var/mutable_appearance/stored_copy = new /mutable_appearance(stored)
+		stored_copy.layer = FLOAT_LAYER
+		stored_copy.plane = FLOAT_PLANE
+		. += stored_copy
+	. += arm
+
+/obj/item/borg/apparatus/service/examine()
+	. = ..()
+	if(stored)
+		. += "The apparatus currently has [stored] secured."
+	. += span_notice("<i>Alt-click</i> will drop the currently secured item.")