Adds more ordeal meat

vlggms · Jan 18, 2025 · f20f991 · f20f991
1 parent 8a1fb60
commit f20f991
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 31 deletions.
diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm
@@ -939,6 +939,39 @@
 /obj/item/food/meat/slab/crimson/MakeGrillable()
 	AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/crimson, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE)
 
+/obj/item/food/meat/slab/buggy
+	name = "buggy meat"
+	desc = "A chunk of horrible and unpalatable mutated meat and chitin. Some bits are still moving..."
+	icon_state = "buggymeat"
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4)
+	tastes = list("tender meat" = 1, "gristle" = 1)
+	foodtypes = MEAT | RAW | GROSS
+
+/obj/item/food/meat/slab/buggy/MakeGrillable()
+	AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/meatproduct, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) // too lazy to add a new sprite
+
+/obj/item/food/meat/slab/corroded
+	name = "corroded meat"
+	desc = "Human meat, with other stuff mixed in. Hardly has any resemblance to the original anymore."
+	icon_state = "xenomeat" // Placeholder
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4)
+	tastes = list("tough meat" = 1)
+	foodtypes = MEAT | RAW | GROSS
+
+/obj/item/food/meat/slab/corroded/MakeGrillable()
+	AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/meatproduct, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) // too lazy to add a new sprite
+
+/obj/item/food/meat/slab/sinnew
+	name = "sinnew"
+	desc = "Eyeballs, veins, and offal that came from something no longer resembling a human."
+	icon_state = "sinnew"
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 1)
+	tastes = list("blood" = 1, "tough meat" = 1)
+	foodtypes = MEAT | RAW | GROSS
+
+/obj/item/food/meat/slab/sinnew/MakeGrillable()
+	AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/meatproduct, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) // too lazy to add a new sprite
+
 ////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
 
 /obj/item/food/meat/steak

diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm
@@ -17,8 +17,8 @@
 	attack_sound = 'sound/effects/ordeals/brown/rock_attack.ogg'
 	death_sound = 'sound/effects/ordeals/brown/rock_dead.ogg'
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 2, BLACK_DAMAGE = 1, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/golem = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/golem = 1)
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 	ranged = TRUE
 	move_to_delay = 8
 	var/dash_cooldown_time = 15 SECONDS //will dash at people if they get out of range but not too often
@@ -101,8 +101,8 @@
 	attack_sound = 'sound/effects/ordeals/brown/flower_attack.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 2, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1)
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 	stat_attack = DEAD
 
 /mob/living/simple_animal/hostile/ordeal/sin_gluttony/AttackingTarget(atom/attacked_target)
@@ -157,8 +157,8 @@
 	attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg'
 	death_sound = 'sound/effects/ordeals/brown/flea_dead.ogg'
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 2, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/slime = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/slime = 1)
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 	is_flying_animal = TRUE
 	ranged = TRUE
 	ranged_cooldown_time = 5 SECONDS // Fires a laser dealing 10 white damage
@@ -186,6 +186,7 @@
 	set waitfor = FALSE
 	changeNext_move(SSnpcpool.wait / rapid_melee) //Prevents attack spam
 	animate(src, transform = matrix()*1.4, time = 16)
+	addtimer(CALLBACK(src, PROC_REF(AnimateBack)), 16)
 	can_act = FALSE
 	SLEEP_CHECK_DEATH(16)
 	var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(get_turf(src), src)
@@ -201,10 +202,13 @@
 			L.deal_damage(damage_dealt, melee_damage_type)
 		for(var/obj/vehicle/sealed/mecha/V in T)
 			V.take_damage(damage_dealt, melee_damage_type)
-	animate(src, transform = matrix(), time = 0)
 	SLEEP_CHECK_DEATH(8)
 	can_act = TRUE
 
+/mob/living/simple_animal/hostile/ordeal/sin_gloom/proc/AnimateBack()
+	animate(src, transform = matrix(), time = 0)
+	return TRUE
+
 /mob/living/simple_animal/hostile/ordeal/sin_pride
 	name = "Peccatulum Superbiae"
 	desc = "Those spikes look sharp!"
@@ -226,8 +230,8 @@
 	attack_sound = 'sound/weapons/ego/sword1.ogg'
 	death_sound = 'sound/effects/ordeals/brown/dead_generic.ogg'
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 2, BLACK_DAMAGE = 1, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/rawcrab = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/rawcrab = 1)
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 	ranged = TRUE
 	var/charging = FALSE
 	var/dash_num = 25
@@ -349,8 +353,8 @@
 	attack_sound = 'sound/effects/ordeals/brown/cromer_slam.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 2, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/lizard = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/lizard = 1)
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 
 /mob/living/simple_animal/hostile/ordeal/sin_lust/Initialize()
 	. = ..()
@@ -392,8 +396,8 @@
 	attack_sound = 'sound/effects/ordeals/brown/tentacle_attack.ogg'
 	death_sound = 'sound/effects/ordeals/brown/dead_generic.ogg'
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 2, BLACK_DAMAGE = 1, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/carpmeat/icantbeliveitsnotcarp = 1)
-	guaranteed_butcher_results = list(/obj/item/food/carpmeat/icantbeliveitsnotcarp = 1) //should make its own kind of meat when I get around to it
+	butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/sinnew = 1)
 
 /mob/living/simple_animal/hostile/ordeal/sin_wrath/AttackingTarget(atom/attacked_target)
 	. = ..()

diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dawn.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dawn.dm
@@ -19,8 +19,8 @@
 	attack_sound = 'sound/abnormalities/ebonyqueen/attack.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1)
+	butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1, /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	speed = 1 //slow as balls
 	move_to_delay = 20
 	ranged = TRUE
@@ -55,5 +55,5 @@
 	attack_verb_continuous = "stabs"
 	attack_verb_simple = "stab"
 	damage_coeff = list(RED_DAMAGE = 0.9, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.7, PALE_DAMAGE = 2)
-	butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1)
+	butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1, /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm
@@ -19,8 +19,8 @@
 	attack_sound = 'sound/abnormalities/thunderbird/tbird_peck.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.5, PALE_DAMAGE = 0.7)
-	butcher_results = list(/obj/item/food/meat/slab/robot = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human = 1)
+	butcher_results = list(/obj/item/food/meat/slab/robot = 1, /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	move_to_delay = 3
 	var/pulse_cooldown
 	var/pulse_cooldown_time = 4 SECONDS
@@ -164,8 +164,8 @@
 	attack_sound = 'sound/abnormalities/thunderbird/tbird_zombieattack.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 0.5, BLACK_DAMAGE = 1, PALE_DAMAGE = 0.7)
-	butcher_results = list(/obj/item/food/meat/slab/chicken = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human = 1)
+	butcher_results = list(/obj/item/food/meat/slab/chicken = 1, /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	move_to_delay = 3
 	ranged = TRUE
 	projectiletype = /obj/projectile/thunder_tomahawk
@@ -244,8 +244,8 @@
 	attack_sound = 'sound/abnormalities/thunderbird/tbird_peck.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 0.5, BLACK_DAMAGE = 1, PALE_DAMAGE = 1)
-	butcher_results = list(/obj/item/food/meat/slab/robot = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human = 1)
+	butcher_results = list(/obj/item/food/meat/slab/robot = 1, /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	move_to_delay = 4
 	speak = list("Kilo India Lima Lima", "Delta India Echo", "Golf Echo Tango Oscar Uniform Tango", "Oscar Mike", "Charlie Mike")
 	speak_emote = list("emits", "groans")

diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/midnight.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/midnight.dm
@@ -11,8 +11,8 @@
 	health = 4000
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 0.2, WHITE_DAMAGE = 0.2, BLACK_DAMAGE = 0.2, PALE_DAMAGE = 0.2)
-	butcher_results = list(/obj/item/food/meat/slab/chicken = 1, /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/chicken = 1)
+	butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	/// Range of the damage
 	var/symphony_range = 20
 	/// Amount of white damage every tick

diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm
@@ -18,7 +18,7 @@
 	attack_sound = 'sound/weapons/fixer/generic/blade3.ogg'
 	death_sound = 'sound/effects/limbus_death.ogg'
 	damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 0.5, BLACK_DAMAGE = 1.5, PALE_DAMAGE = 1)
-	butcher_results = list(/obj/item/food/meat/slab/chicken = 1, /obj/item/food/meat/slab/human = 1)
+	butcher_results = list(/obj/item/food/meat/slab/chicken = 1, /obj/item/food/meat/slab/corroded = 1)
 	guaranteed_butcher_results = list(/obj/item/food/meat/slab/chicken = 1)
 	speed = 3
 	move_to_delay = 3
@@ -265,8 +265,8 @@
 	attack_verb_continuous = "stabs"
 	attack_verb_simple = "stab"
 	damage_coeff = list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 1.5, PALE_DAMAGE = 2)
-	butcher_results = list( /obj/item/food/meat/slab/human = 1)
-	guaranteed_butcher_results = list(/obj/item/food/meat/slab/human = 1)
+	butcher_results = list( /obj/item/food/meat/slab/corroded = 1)
+	guaranteed_butcher_results = list(/obj/item/food/meat/slab/corroded = 1)
 	var/vengeful = FALSE
 	var/current_target = null
 	var/finishing = FALSE

diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/steel.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/steel.dm
@@ -24,7 +24,7 @@
 	possible_a_intents = list(INTENT_HELP, INTENT_HARM)
 	//similar to a human
 	damage_coeff = list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 1, PALE_DAMAGE = 1)
-	butcher_results = list(/obj/item/food/meat/slab/human = 2, /obj/item/food/meat/slab/human/mutant/moth = 1)
+	butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/food/meat/slab/buggy = 2)
 	silk_results = list(/obj/item/stack/sheet/silk/steel_simple = 1)
 
 /mob/living/simple_animal/hostile/ordeal/steel_dawn/Initialize()
@@ -66,7 +66,7 @@
 	attack_verb_continuous = "slashes"
 	attack_verb_simple = "slash"
 	death_sound = 'sound/voice/mook_death.ogg'
-	butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/food/meat/slab/human/mutant/moth = 2)
+	butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/food/meat/slab/buggy = 2)
 	silk_results = list(/obj/item/stack/sheet/silk/steel_simple = 2, /obj/item/stack/sheet/silk/steel_advanced = 1)
 
 /mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/MeleeAction()
@@ -224,7 +224,7 @@
 	footstep_type = FOOTSTEP_MOB_SHOE
 	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_HARM)
 	death_sound = 'sound/voice/hiss5.ogg'
-	butcher_results = list(/obj/item/food/meat/slab/human = 2, /obj/item/food/meat/slab/human/mutant/moth = 1)
+	butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/food/meat/slab/buggy = 2)
 	silk_results = list(/obj/item/stack/sheet/silk/steel_simple = 4, /obj/item/stack/sheet/silk/steel_advanced = 2, /obj/item/stack/sheet/silk/steel_elegant = 1)
 	//Last command issued
 	var/last_command = 0

diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi