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

Synthflesh and Predalien Butchering of Synthetics Revamp #3910

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Synthflesh and Predalien Butchering of Synthetics Revamp #3910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d9e69d
You can no longer butcher Synths as Predalien
Ben10083 Jul 16, 2023
d358acf
Merge branch 'master' into Joe_Meat
Ben10083 Jul 16, 2023
bfbdc27
Redo of plan, synthflesh and working joe meat
Ben10083 Jul 16, 2023
509a9dd
Synthmeat
Ben10083 Jul 17, 2023
dd4eaff
Use synthmeat
Ben10083 Jul 17, 2023
8b1a4fd
Description
Ben10083 Jul 17, 2023
ab12a91
SYNTHMEAT SPRITE?!?!??!?!?!
Ben10083 Jul 17, 2023
f8c27be
tasty
Ben10083 Jul 17, 2023
60ea242
sytiflesh -> synthmeat. Description updated as per Lore Councilor Kag…
Ben10083 Jul 17, 2023
42e3cd2
Merge branch 'master' into Joe_Meat
Ben10083 Jul 22, 2023
7c39ed3
Apply suggestions from code review
harryob Jul 24, 2023
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
2 changes: 1 addition & 1 deletion code/datums/recipe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@
/datum/recipe/syntikabob
items = list(
/obj/item/stack/rods,
/obj/item/reagent_container/food/snacks/meat/syntiflesh,
/obj/item/reagent_container/food/snacks/meat/synthmeat,
)
result = /obj/item/reagent_container/food/snacks/monkeykabob

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/food/fish_snacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
var/gut_icon_state = null
var/gut_time = 3
var/initial_desc = ""
var/list/guttable_atoms = list(/obj/item/reagent_container/food/snacks/meat, /obj/item/reagent_container/food/snacks/meat/syntiflesh)//placeholders, for now
var/list/guttable_atoms = list(/obj/item/reagent_container/food/snacks/meat, /obj/item/reagent_container/food/snacks/meat/synthmeat)//placeholders, for now
var/base_gut_meat = /obj/item/reagent_container/food/snacks/meat
//slice_path = null//
//slices_num
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 @@ -24,10 +24,20 @@
else
..()

/obj/item/reagent_container/food/snacks/meat/syntiflesh
/obj/item/reagent_container/food/snacks/meat/synthmeat
name = "synthetic meat"
desc = "A synthetic slab of flesh."

/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh //meat made from synthetics. Slightly toxic
name = "synthetic flesh"
desc = "A slab of artificial, inorganic 'flesh' that resembles human meat. Probably came from a synth."
icon_state = "synthmeat"
filling_color = "#ffffff"

/obj/item/reagent_container/food/snacks/meat/synthmeat/synthetic/Initialize()
. = ..()
reagents.add_reagent("pacid", 1.5)

/obj/item/reagent_container/food/snacks/meat/human
name = "human meat"
desc = "A slab of flesh for cannibals."
Expand Down
12 changes: 9 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,18 @@ Your health meter will not regenerate normally, so kill and die for the hive!</s
to_chat(xeno, SPAN_XENONOTICE("You decide not to butcher [victim]"))
return TRUE

if(ishuman(victim))
if(ishuman(victim) && !isworkingjoe(victim)) //No joe meat, can still gib it though
var/mob/living/carbon/human/human_victim = victim

var/flesh_type = /obj/item/reagent_container/food/snacks/meat
var/flesh = "meat"
if(issynth(human_victim))
flesh_type = /obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh
flesh = "synthetic flesh"
for(var/i in 1 to 3)
harryob marked this conversation as resolved.
Show resolved Hide resolved
var/obj/item/reagent_container/food/snacks/meat/h_meat = new(human_victim.loc)
h_meat.name = "[human_victim.name] meat"
var/obj/item/reagent_container/food/snacks/meat/new_meat = new flesh_type(human_victim.loc)
new_meat.name = "[human_victim.name] [flesh]"


else if (isxeno(victim))
var/mob/living/carbon/xenomorph/xeno_victim = victim
Expand Down
10 changes: 5 additions & 5 deletions code/modules/reagents/chemistry_reactions/food_drink.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,16 @@
new /obj/item/reagent_container/food/snacks/sliceable/cheesewheel/immature(location)


/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
/datum/chemical_reaction/synthmeat
name = "synthmeat"
id = "synthmeat"
result = null
required_reagents = list("blood" = 5, "clonexadone" = 1)
result_amount = 1

/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/reagent_container/food/snacks/meat/syntiflesh(location)
new /obj/item/reagent_container/food/snacks/meat/synthmeat(location)


/datum/chemical_reaction/hot_ramen
Expand Down
Binary file modified icons/obj/items/food.dmi
View file
Open in desktop
Binary file not shown.
Loading