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.

Sign up for GitHub

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

Jump to bottom

Food processor can be used to remove carpotoxin and acidic blood with master domestic skill #5577

Merged
merged 12 commits into from
Feb 21, 2024
Merged

Food processor can be used to remove carpotoxin and acidic blood with master domestic skill #5577

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ae463c
Carp and xenomeat processing
LaylaMcC Jan 28, 2024
1068df8
Carpotoxin amount changes
LaylaMcC Jan 28, 2024
2648a56
Acidic blood amount changes
LaylaMcC Jan 28, 2024
02a129b
Modified process proc and two recipes
LaylaMcC Jan 28, 2024
465c2da
Corrected recipes to use new types
LaylaMcC Jan 28, 2024
38c2d08
Added processed carp meat
LaylaMcC Jan 28, 2024
c741afe
Added processed xenomeat
LaylaMcC Jan 28, 2024
4cf5738
Removed accidental qdel duplication
LaylaMcC Jan 30, 2024
c244889
Merge branch 'master' into processor-changes
LaylaMcC Feb 10, 2024
913886f
Removed unnecessary variable overwrites and partially implemented can…
LaylaMcC Feb 20, 2024
a8ff820
Added can_use to food processor_process/proc
LaylaMcC Feb 20, 2024
09ffdde
Removed unnecessary variable overwrite
LaylaMcC Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion code/game/machinery/kitchen/processor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,32 @@

/datum/food_processor_process/process(loc, what)
if (src.output && loc)
new src.output(loc)
var/obj/item/reagent_container/food/snacks/created_food = new src.output(loc)
var/obj/item/reagent_container/food/snacks/original_food = what
if(original_food.made_from_player)
created_food.made_from_player = original_food.made_from_player
created_food.name = (created_food.made_from_player + created_food.name)
if (what)
qdel(what)

if (what)
qdel(what)
LaylaMcC marked this conversation as resolved.
Show resolved Hide resolved

/* objs */

/datum/food_processor_process/xenomeat
input = /obj/item/reagent_container/food/snacks/meat/xenomeat
output = /obj/item/reagent_container/food/snacks/meat/xenomeat/processed

/datum/food_processor_process/meat
input = /obj/item/reagent_container/food/snacks/meat
output = /obj/item/reagent_container/food/snacks/rawmeatball


/datum/food_processor_process/carpmeat
input = /obj/item/reagent_container/food/snacks/carpmeat
output = /obj/item/reagent_container/food/snacks/carpmeat/processed

/datum/food_processor_process/potato
input = /obj/item/reagent_container/food/snacks/grown/potato
output = /obj/item/reagent_container/food/snacks/rawsticks
Expand Down Expand Up @@ -88,6 +105,9 @@
if (!P)
to_chat(user, SPAN_DANGER("That probably won't blend."))
return 1
if ((istype(P,/datum/food_processor_process/xenomeat) || istype(P,/datum/food_processor_process/carpmeat)) && !skillcheck(user, SKILL_DOMESTIC, SKILL_DOMESTIC_MASTER))
to_chat(user, SPAN_DANGER("You aren't trained to remove dangerous substances from food"))
return 1
user.visible_message("[user] put [what] into [src].", \
LaylaMcC marked this conversation as resolved.
Show resolved Hide resolved
"You put [what] into [src].")
user.drop_held_item()
Expand Down
20 changes: 11 additions & 9 deletions code/game/objects/items/reagent_containers/food/snacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,19 @@
/obj/item/reagent_container/food/snacks/carpmeat/Initialize()
. = ..()
reagents.add_reagent("fish", 3)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("carpotoxin", 6)
src.bitesize = 6

/obj/item/reagent_container/food/snacks/carpmeat/processed
name = "processed carp fillet"
desc = "A fillet of spess carp meat. This one has been processed to remove carpotoxin."
icon_state = "fishfillet"
filling_color = "#FFDEFE"

/obj/item/reagent_container/food/snacks/carpmeat/processed/Initialize()
LaylaMcC marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
reagents.remove_reagent("carpotoxin", 6)

/obj/item/reagent_container/food/snacks/fishfingers
name = "Fish Fingers"
desc = "A finger of fish."
Expand All @@ -653,7 +663,6 @@
/obj/item/reagent_container/food/snacks/fishfingers/Initialize()
. = ..()
reagents.add_reagent("fish", 4)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3

/obj/item/reagent_container/food/snacks/hugemushroomslice
Expand Down Expand Up @@ -802,7 +811,6 @@
. = ..()
reagents.add_reagent("bread", 3)
reagents.add_reagent("fish", 3)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3

/obj/item/reagent_container/food/snacks/tofuburger
Expand Down Expand Up @@ -850,7 +858,6 @@
. = ..()
reagents.add_reagent("bread", 3)
reagents.add_reagent("meatprotein", 3)
reagents.add_reagent("xenoblood", 3)
bitesize = 3

/obj/item/reagent_container/food/snacks/clownburger
Expand Down Expand Up @@ -1070,7 +1077,6 @@
. = ..()
reagents.add_reagent("bread", 4)
reagents.add_reagent("meatprotein", 2)
reagents.add_reagent("xenoblood", 4)
bitesize = 2

/obj/item/reagent_container/food/snacks/wingfangchu
Expand All @@ -1084,7 +1090,6 @@
. = ..()
reagents.add_reagent("soysauce", 4)
reagents.add_reagent("meatprotein", 4)
reagents.add_reagent("xenoblood", 4)
bitesize = 2

/obj/item/reagent_container/food/snacks/human/kabob
Expand Down Expand Up @@ -1133,7 +1138,6 @@
/obj/item/reagent_container/food/snacks/cubancarp/Initialize()
. = ..()
reagents.add_reagent("fish", 6)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("hotsauce", 3)
bitesize = 3

Expand Down Expand Up @@ -1690,7 +1694,6 @@
/obj/item/reagent_container/food/snacks/fishandchips/Initialize()
. = ..()
reagents.add_reagent("fish", 6)
reagents.add_reagent("carpotoxin", 3)
bitesize = 3

/obj/item/reagent_container/food/snacks/sandwich
Expand Down Expand Up @@ -2172,7 +2175,6 @@
reagents.add_reagent("bread", 10)
reagents.add_reagent("meatprotein", 10)
reagents.add_reagent("cheese", 10)
reagents.add_reagent("xenoblood", 10)
bitesize = 2

/obj/item/reagent_container/food/snacks/xenomeatbreadslice
Expand Down
12 changes: 11 additions & 1 deletion code/game/objects/items/reagent_containers/food/snacks/meat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,19 @@

/obj/item/reagent_container/food/snacks/meat/xenomeat/Initialize()
. = ..()
reagents.add_reagent("xenoblood", 3)
reagents.add_reagent("xenoblood", 6)
src.bitesize = 6

/obj/item/reagent_container/food/snacks/meat/xenomeat/processed
name = "meat"
Copy link
Member

Choose a reason for hiding this comment

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

Just to check: did you want to change the name of this to "processed meat" like on the carp fillet, or have only the description be different?

Copy link
Contributor Author

@LaylaMcC LaylaMcC Feb 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I wasn't sure of an elegant way to have it called processed NAME meat (e.g. processed Queen meat) so opted to just have it as NAME meat, which is handled in process (which, as an added bonus, will keep a person's name if they get turned into meatballs). To my ears, "NAME processed meat" feels off but happy to take that approach if it'd be better.

Copy link
Member

Choose a reason for hiding this comment

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

Hm.. It could be done by refactoring how the made_from_player variable is handled, but that might be out of the scope of the PR.
Either way, this works fine as it is now IMO. 👍

desc = "A slab of acrid smelling meat. This one has been processed to remove acid."
icon_state = "xenomeat"
filling_color = "#43DE18"

/obj/item/reagent_container/food/snacks/meat/xenomeat/processed/Initialize()
LaylaMcC marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
reagents.remove_reagent("xenoblood", 6)

//fishable atoms meat
// todo: rewrite this into a procgen'ed item when gutting fish? May be incompatible with recipe code if done that way and not hardcoded.
/obj/item/reagent_container/food/snacks/meat/fish
Expand Down
Loading