Adds the RSF Executive Service Upgrade for cyborgs (#27371)

* Adds the Executive RSF cyborg upgrade.

First commit for the Executive RSF with basic functionality.

* Add cheese knife

Adds a cheese knife along with the RSF upgrade to cut the cheese.

* Executive RSF Upgrade functionality.

Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.

* Nerf cyborg cheeses

Nerfs cyborg cheeses to be worse than chef food.

* Resprites Smoked Cheese

* Fixes power cost calculation

* Cleanup

* Standardize tech and Materials cost

* Adds caviar trash

Adds an empty caviar can.

* Edam and flavor

Add Edam

Adjusts flavors to compete with cheese reagent

* Undo sprinkled donut

Undid changes to RSF donut

* Fix RSF icon missed pixel

* Boolean fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* Resprites basic cheese

Resprites basic cheese at the request of @DGamerL

* Update new cheese sprite

Adds wax to the new cheese.

* Delete unused cheese icon

Deletes a prototype cheese icon.

* Readds normal cigarettes to the executive RSF

Adds normal cigarettes back to the RSF at Fordoxia's request.

* Turns caviar from red to black

Rebrands caviar into the fancier, black variety

* Deconflict

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
This commit is contained in:
ExusA
2024-12-06 14:03:58 +00:00
committed by GitHub
co-authored by 1080pCat
parent ab0627b264
commit 584e6b26d5
12 changed files with 175 additions and 30 deletions
@@ -54,6 +54,68 @@
filling_color = "#FFF700"
tastes = list("cheese" = 1)
/obj/item/food/sliceable/cheesewheel/smoked
name = "smoked cheese wheel"
desc = "A wheel of fancy imported-style smoked cheese."
icon_state = "cheesewheel-smoked"
slice_path = /obj/item/food/cheesewedge/smoked
slices_num = 4
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15)
tastes = list("cheese" = 1, "smoke" = 2)
/obj/item/food/cheesewedge/smoked
name = "smoked cheese wedge"
desc = "A wedge of fancy smoked cheese."
icon_state = "cheesewedge-smoked"
tastes = list("cheese" = 1, "smoke" = 2)
/obj/item/food/sliceable/cheesewheel/edam
name = "edam cheese wheel"
desc = "A wheel of mild edam cheese."
icon_state = "cheesewheel-edam"
slice_path = /obj/item/food/cheesewedge/edam
slices_num = 4
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15)
tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2)
/obj/item/food/cheesewedge/edam
name = "edam cheese wedge"
desc = "A wedge of mild edam cheese. It's said to have a nutty flavor."
icon_state = "cheesewedge-edam"
tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2)
/obj/item/food/sliceable/cheesewheel/blue
name = "blue cheese wheel"
desc = "A wheel of pungent blue cheese. It's an acquired taste..."
icon_state = "cheesewheel-blue"
slice_path = /obj/item/food/cheesewedge/blue
slices_num = 5
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 10)
tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1)
/obj/item/food/cheesewedge/blue
name = "blue cheese wedge"
desc = "A wedge of pungent blue cheese. The flavor is... intense."
icon_state = "cheesewedge-blue"
bitesize = 2
tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1)
/obj/item/food/sliceable/cheesewheel/camembert
name = "camembert cheese wheel"
desc = "A miniature wheel of gooey camembert. Yum..."
icon_state = "cheesewheel-camembert"
slice_path = /obj/item/food/cheesewedge/camembert
slices_num = 2
list_reagents = list("nutriment" = 1, "vitamin" = 2, "cheese" = 6)
tastes = list("mild cheese" = 3, "gooeyness" = 1)
/obj/item/food/cheesewedge/camembert
name = "camembert cheese slice"
desc = "A piece of camembert. It's soft and gooey."
icon_state = "cheesewedge-camembert"
bitesize = 2
tastes = list("mild cheese" = 3, "gooeyness" = 1)
/obj/item/food/cheesewedge/checkpass(passflag)
if((passflag & PASSDOOR) && ismouse(pulledby))
return TRUE
@@ -368,3 +368,13 @@
list_reagents = list("nutriment" = 2)
tastes = list("grilled eel" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/caviar
name = "\improper Three-Star caviar"
desc = "A small, pretentious looking can of fish eggs."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "caviar"
bitesize = 1
trash = /obj/item/trash/caviar
list_reagents = list("protein" = 5)
tastes = list("fish" = 2, "high society" = 1)
@@ -1303,6 +1303,16 @@
construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_rsf_executive
name = "Cyborg Upgrade (Executive Service Upgrade)"
id = "borg_upgrade_RSF_executive"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/rsf_executive
req_tech = list("materials" = 2, "biotech" = 3)
materials = list(MAT_METAL = 10000, MAT_GLASS = 6000, MAT_GOLD = 2000)
construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
//Misc
/datum/design/mecha_tracking
name = "Exosuit Tracking Beacon"