Gibber'd and Butchered IPCs now Drop Robot Meat Instead of Human Meat (#30672)

* meat * Update meat.dm * Update code/modules/food_and_drinks/kitchen_machinery/gibber.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-08-27 05:57:24 +01:00 · 2025-10-23 10:36:59 +00:00
parent e9a3b4424d
commit b9c7a7c5e8
23 changed files with 43 additions and 18 deletions
@@ -89,7 +89,10 @@
 	var/clothing_flags = 0 // Underwear and socks.
 	var/exotic_blood
 	var/own_species_blood = FALSE // Can it only use blood from it's species?
+	/// Type of skin produced when butchered.
 	var/skinned_type
+	/// Type of meat produced in the gibber/meating. Distinct from `butcher_results`.
+	var/meat_type = /obj/item/food/meat
 	var/no_equip	// bitflags of slots the race can't equip stuff to
 	var/nojumpsuit = 0	// this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
 	var/can_craft = TRUE // Can this mob using crafting or not?
@@ -5,6 +5,7 @@
 	language = "Abductor Mindlink"
 	default_language = "Abductor Mindlink"
 	eyes = "blank_eyes"
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart,
 		"liver" =    /obj/item/organ/internal/liver,
@@ -26,7 +26,6 @@
 	bodyflags = SHAVED
 	dietflags = DIET_HERB		//Diona regenerate nutrition in light and water, no diet necessary, but if they must, they eat other plants *scream
 	taste_sensitivity = TASTE_SENSITIVITY_DULL
-	skinned_type = /obj/item/stack/sheet/wood

 	blood_color = "#004400"
 	flesh_color = "#907E4A"
@@ -34,6 +33,8 @@

 	reagent_tag = PROCESS_ORG

+	skinned_type = /obj/item/stack/sheet/wood
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"liver" =   /obj/item/organ/internal/liver/diona,
 		"lungs" =   /obj/item/organ/internal/lungs/diona,
@@ -52,6 +52,7 @@
 	blood_color = "#a3d4eb"
 	butt_sprite = "drask"

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =      				/obj/item/organ/internal/heart/drask,
 		"lungs" =     				/obj/item/organ/internal/lungs/drask,
@@ -23,12 +23,13 @@

 	blood_color = "#515573"
 	flesh_color = "#137E8F"
-	skinned_type = /obj/item/stack/sheet/metal

 	blacklisted = TRUE // To prevent golem subtypes from overwhelming the odds when random species changes, only the Random Golem type can be chosen
 	dangerous_existence = TRUE

 	vision_organ = null
+	skinned_type = /obj/item/stack/sheet/metal
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/golem,
 		"adamantine_resonator" = /obj/item/organ/internal/adamantine_resonator
@@ -19,6 +19,7 @@
 		4 = "Grey Red"
 	)

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/grey,
 		"lungs" =    /obj/item/organ/internal/lungs/grey,
@@ -5,6 +5,7 @@
 	language = "Sol Common"
 	species_traits = list(LIPS)
 	skinned_type = /obj/item/stack/sheet/animalhide/human
+	meat_type = /obj/item/food/meat/human
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
 	bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
 	dietflags = DIET_OMNI
@@ -3,6 +3,7 @@
 	name_plural = "Kidan"
 	icobase = 'icons/mob/human_races/r_kidan.dmi'
 	language = "Chittin"
+	meat_type = /obj/item/food/meat/human

 	blurb = "The Kidan are ant-like beings possessing a hardened exoskeleton and strict adherence to social castes. \
 	They originate from the planet Aurum — a barren bombarded world that suffered after the war with the Solar-Central Compact, having lost decisively after the Battle of Argos.<br/><br/> \
@@ -27,6 +28,7 @@
 	default_headacc = "Normal Antennae"
 	butt_sprite = "kidan"

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/kidan,
 		"lungs" =    /obj/item/organ/internal/lungs/kidan,
@@ -12,7 +12,6 @@
 	language = "Trinary"
 	remains_type = /obj/effect/decal/remains/robot
 	inherent_factions = list("slime")
-	skinned_type = /obj/item/stack/sheet/metal // Let's grind up IPCs for station resources!

 	eyes = "blank_eyes"
 	tox_mod = 0
@@ -44,6 +43,8 @@

 	hunger_icon = 'icons/mob/screen_hunger_machine.dmi'

+	skinned_type = /obj/item/stack/sheet/metal // Let's grind up IPCs for station resources!
+	meat_type = /obj/item/food/meat/human/robot
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/mmi_holder/posibrain,
 		"cell" = /obj/item/organ/internal/cell,
@@ -39,6 +39,7 @@
 		4 = "Purple"
 	)

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/nian,
 		"lungs" =    /obj/item/organ/internal/lungs/nian,
@@ -14,7 +14,6 @@
 	inherent_traits = list(TRAIT_RADIMMUNE, TRAIT_NOHUNGER, TRAIT_BURN_WOUND_IMMUNE)
 	inherent_biotypes = MOB_HUMANOID | MOB_MINERAL
 	forced_heartattack = TRUE // Plasmamen have no blood, but they should still get heart-attacks
-	skinned_type = /obj/item/stack/sheet/mineral/plasma // We're low on plasma, R&D! *eyes plasmaman co-worker intently*
 	dietflags = DIET_OMNI
 	bodyflags = BALD | SHAVED
 	reagent_tag = PROCESS_ORG
@@ -36,6 +35,8 @@
 		"realizes the existential problem of being made out of plasma!",
 		"shows their true colors, which happens to be the color of plasma!")

+	skinned_type = /obj/item/stack/sheet/mineral/plasma // We're low on plasma, R&D! *eyes plasmaman co-worker intently*
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/plasmaman,
 		"lungs" =    /obj/item/organ/internal/lungs/plasmaman,
@@ -10,6 +10,7 @@

 	blood_color = "#CCCCCC"
 	flesh_color = "#AAAAAA"
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain,
 		"eyes" = /obj/item/organ/internal/eyes/night_vision/nightmare //8 darksight.
@@ -29,6 +29,7 @@
 		"is twisting their skull off!")

 	vision_organ = null
+	meat_type = /obj/item/food/meat/human // They've always done this.
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/golem,
 	) //Has default darksight of 2.
@@ -26,6 +26,7 @@
 	reagent_tag = PROCESS_ORG
 	butt_sprite = "skrell"

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/skrell,
 		"lungs" =    /obj/item/organ/internal/lungs/skrell,
@@ -49,6 +49,7 @@
 	//Has default darksight of 2.

 	vision_organ = null
+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/slime
 		)
@@ -4,7 +4,6 @@
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	language = "Siik'tajr"
 	tail = "tajtail"
-	skinned_type = /obj/item/stack/sheet/fur
 	unarmed_type = /datum/unarmed_attack/claws

 	blurb = "Tajaran hail from the mineral-rich arctic moon of Ahdomai. \
@@ -33,6 +32,8 @@
 	base_color = "#424242"
 	butt_sprite = "tajaran"

+	meat_type = /obj/item/food/meat/human
+	skinned_type = /obj/item/stack/sheet/fur
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/tajaran,
 		"lungs" =    /obj/item/organ/internal/lungs/tajaran,
@@ -5,7 +5,6 @@
 	icobase = 'icons/mob/human_races/r_lizard.dmi'
 	language = "Sinta'unathi"
 	tail = "sogtail"
-	skinned_type = /obj/item/stack/sheet/animalhide/lizard
 	unarmed_type = /datum/unarmed_attack/claws
 	primitive_form = /datum/species/monkey/unathi

@@ -38,6 +37,8 @@
 	female_scream_sound = 'sound/effects/unathiscream.ogg'
 	butt_sprite = "unathi"

+	meat_type = /obj/item/food/meat/human
+	skinned_type = /obj/item/stack/sheet/animalhide/lizard
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/unathi,
 		"lungs" =    /obj/item/organ/internal/lungs/unathi,
@@ -53,6 +53,7 @@
 		8 = "Nebula"
 		)

+	meat_type = /obj/item/food/meat/human
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/vox,
 		"lungs" =    /obj/item/organ/internal/lungs/vox,
@@ -5,7 +5,6 @@
 	language = "Canilunzt"
 	primitive_form = /datum/species/monkey/vulpkanin
 	tail = "vulptail"
-	skinned_type = /obj/item/stack/sheet/fur
 	unarmed_type = /datum/unarmed_attack/claws

 	blurb = "Vulpkanin are bipedal canid-like beings from the Vazzend binary system, having been forced from their homeworld by a cataclysmic event and scattered throughout the Orion Sector. \
@@ -27,6 +26,8 @@

 	scream_verb = "yelps"

+	meat_type = /obj/item/food/meat/human
+	skinned_type = /obj/item/stack/sheet/fur
 	has_organ = list(
 		"heart" =    /obj/item/organ/internal/heart/vulpkanin,
 		"lungs" =    /obj/item/organ/internal/lungs/vulpkanin,