Unique Animal Hitzones (#10125)

2026-07-17 10:57:19 +01:00 · 2020-10-02 16:38:54 +02:00
parent 91303ff64d
commit ea5c5d2dda
50 changed files with 74 additions and 4 deletions
@@ -4,6 +4,7 @@
 	desc = "A small, quivering sluglike creature."
 	speak_emote = list("chirrups")
 	emote_hear = list("chirrups")
+	organ_names = list("head", "rear segment", "central segment")
 	response_help  = "pokes"
 	response_disarm = "prods"
 	response_harm   = "stomps on"
@@ -12,6 +12,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 10
 	attacktext = "rammed"
+	organ_names = list("core", "production array", "sensor array")
 	speed = 0
 	environment_smash = TRUE
 	attack_sound = 'sound/weapons/rapidslice.ogg'
@@ -10,6 +10,7 @@
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	attacktext = "violently stabbed"
+	organ_names = list("core", "harvesting array")
 	speed = -1
 	environment_smash = 1
 	see_in_dark = 7
@@ -12,6 +12,7 @@
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	attacktext = "smashed their armored gauntlet into"
+	organ_names = list("core", "right arm", "left arm")
 	mob_size = MOB_LARGE
 	speed = 3
 	environment_smash = 2
@@ -10,6 +10,7 @@
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	attacktext = "slashed"
+	organ_names = list("core", "right arm", "left arm")
 	speed = -1
 	environment_smash = TRUE
 	see_in_dark = 7
@@ -37,7 +37,7 @@
 	icon_dead = "evilcrab_dead"

 	speak_emote = list("chitters","clicks")
-
+	organ_names = list("head", "carapace")

 	health = 200
 	maxHealth = 200
@@ -71,6 +71,7 @@
 	canbrush = TRUE
 	brush = /obj/item/reagent_containers/glass/rag
 	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	organ_names = list("head", "chest", "tail", "left flipper", "right flipper")

 	min_oxy = 0

@@ -88,6 +89,7 @@
 	icon_state = "horror"
 	icon_living = "horror"
 	icon_dead = "horror_dead"
+	organ_names = list("meaty core")

 /mob/living/simple_animal/familiar/horror/Initialize()
 	. = ..()
@@ -95,10 +97,12 @@
 		icon_state = "horror_alt"
 		icon_living = "horror_alt"
 		icon_dead = "horror_alt_dead"
+		organ_names = list("head", "chest", "tail", "leg")
 	else if(prob(25))
 		icon_state = "abomination"
 		icon_living = "abomination"
 		icon_dead = "abomination_dead"
+		organ_names = list("head", "chest", "tail", "leg")

 	speak_emote = list("moans", "groans")

@@ -11,6 +11,7 @@
 	emote_see = list("whistles")
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
 	meat_amount = 2
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	hunger_enabled = FALSE
 	canbrush = TRUE
 	var/eggsleft = 0
@@ -57,6 +58,7 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_amount = 30
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -88,6 +90,7 @@
 	stop_automated_movement_when_pulled = 0
 	mob_size = 12
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")

 	maxHealth = 150
 	health = 150
@@ -126,6 +129,7 @@
 	milk_type = /datum/reagent/drink/milk

 	meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken
+	organ_names = list("head", "chest", "fatty core", "blubberous torso", "thick centre", "left leg", "right leg")
 	butchering_products = list(/obj/item/reagent_containers/food/snacks/spreads/lard = 5)

 	holder_type = /obj/item/holder/schlorrgo
@@ -17,6 +17,7 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	organ_names = list("head", "chest", "tail", "left flipper", "right flipper")
 	response_help = "brushes"
 	response_disarm = "attempts to push"
 	response_harm = "injures"
@@ -18,6 +18,7 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -15,6 +15,7 @@
 	turns_per_move = 10
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/corgi
 	meat_amount = 3
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "bops"
 	response_harm   = "kicks"
@@ -12,6 +12,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/crabmeat
+	organ_names = list("head", "carapace")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "stomps"
@@ -16,6 +16,7 @@
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
 	meat_amount = 6
 	mob_size = 4.5//weight based on Chanthangi goats
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -88,6 +89,7 @@
 	see_in_dark = 6
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
 	meat_amount = 40 //Cows are huge, should be worth a lot of meat
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -132,6 +134,7 @@
 	turns_per_move = 2
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken
 	meat_amount = 1
+	organ_names = list("head", "chest", "left leg", "right leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -16,6 +16,7 @@
 	see_in_dark = 6
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
 	meat_amount = 3
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
@@ -12,6 +12,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	meat_amount = 35
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -10,6 +10,7 @@
 	attacktext = "bitten"
 	melee_damage_lower = 1
 	melee_damage_upper = 2
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help  = "pets"
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
@@ -12,6 +12,7 @@
 	maxHealth = 5
 	health = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/hugemushroomslice
+	organ_names = list("cap", "chest", "left leg", "right leg")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "whacks"
@@ -30,6 +30,7 @@
 	maxHealth = 5
 	health = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/rat
+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "stomps on"
@@ -34,6 +34,7 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 3

+	organ_names = list("head")
 	response_help  = "pets"
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
@@ -9,6 +9,7 @@
 	maxHealth = 15
 	health = 15
 	meat_type = /obj/item/reagent_containers/food/snacks/tomatomeat
+	organ_names = list("head")
 	response_help  = "prods"
 	response_disarm = "pushes aside"
 	response_harm   = "smacks"
@@ -6,6 +6,8 @@
 	icon_dead = "devil_dead"
 	icon_rest = "devil_rest"
 	turns_per_move = 3
+
+	organ_names = list("head", "chest", "right wing", "left wing", "right leg", "left leg")
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
@@ -11,6 +11,7 @@
 	response_harm = "hits"
 	speed = -1
 	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	maxHealth = 100
 	health = 100
 	harm_intent_damage = 5
@@ -9,6 +9,7 @@
 	speak_chance = 0
 	turns_per_move = 3
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
+	organ_names = list("upper bat", "mid bat", "lower bat")
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
@@ -18,6 +18,7 @@
 	see_in_dark = 6
 	meat_type = /obj/item/reagent_containers/food/snacks/bearmeat
 	meat_amount = 5
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "hits"
@@ -11,6 +11,7 @@
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	organ_names = list("head", "chest", "tail", "left flipper", "right flipper")
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
@@ -15,6 +15,7 @@

 	tameable = FALSE

+	organ_names = list("head", "chest", "tail", "leg")
 	response_help  = "pets"
 	response_disarm = "shoves"
 	response_harm   = "harmlessly punches"
@@ -23,6 +23,7 @@

 	mob_size = 17

+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "pets"
 	response_harm = "hits"
 	response_disarm = "pushes"
@@ -33,6 +33,7 @@

 	mob_size = 5

+	organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	response_help = "pets"
 	response_harm = "hits"
 	response_disarm = "pushes"
@@ -34,6 +34,7 @@

 	mob_size = 5

+	organ_names = list("core", "head", "tail")
 	response_help = "pets"
 	response_harm = "hits"
 	response_disarm = "pushes"
@@ -9,6 +9,7 @@
 	maxHealth = 80
 	melee_damage_lower = 25
 	melee_damage_upper = 50
+	organ_names = list("meaty core")
 	attacktext = "chomped"
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = "creature"
@@ -7,6 +7,7 @@
 	icon_dead = "faithless_dead"
 	speak_chance = 0
 	turns_per_move = 5
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "passes through"
 	response_disarm = "shoves"
 	response_harm = "hits"
@@ -17,6 +17,7 @@
 	turns_per_move = 5
 	see_in_dark = 10
 	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+	organ_names = list("thorax", "legs", "head")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "pokes"
@@ -23,6 +23,7 @@
 	attacktext = "slashed"
 	projectilesound = 'sound/weapons/bladeslice.ogg'
 	projectiletype = /obj/item/projectile/bullet/pistol/hivebotspike
+	organ_names = list("head", "core", "side thruster", "bottom thruster")
 	faction = "hivebot"
 	min_oxy = 0
 	max_oxy = 0
@@ -80,6 +81,7 @@
 	health = 100
 	maxHealth = 100
 	icon_state = "hivebotbomber"
+	organ_names = list("head", "core", "bottom thruster")
 	attacktext = "bumped"
 	move_to_delay = 8
 	var/has_exploded = FALSE
@@ -230,6 +232,7 @@
 	wander = 0
 	stop_automated_movement = 1
 	status_flags = 0
+	organ_names = list("head", "core", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
 	faction = "hivebot"
 	ranged = 1
 	rapid = 1
@@ -511,6 +514,7 @@
 	attacktext = "skewered"
 	projectilesound = 'sound/weapons/lasercannonfire.ogg'
 	projectiletype = /obj/item/projectile/beam/hivebot/incendiary/heavy
+	organ_names = list("head", "core", "side thruster", "harvesting array")
 	faction = "hivebot"
 	min_oxy = 0
 	max_oxy = 0
@@ -15,6 +15,7 @@

 	tameable = FALSE

+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help  = "pets"
 	response_disarm = "shoves"
 	response_harm   = "harmlessly punches"
@@ -10,6 +10,7 @@
 	icon_living = "crate"

 	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	organ_names = list("lid", "body")
 	response_help = "touches"
 	response_disarm = "pushes"
 	response_harm = "hits"
@@ -12,6 +12,7 @@
 	turns_per_move = 5
 	speak_chance = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help  = "pets"
 	response_disarm = "shoves"
 	response_harm   = "harmlessly punches"
@@ -11,7 +11,7 @@
 	icon_dead = "morph_dead"
 	speed = 2.5
 	stop_automated_movement = TRUE
-
+	organ_names = list("bulbous node", "meaty core")
 	response_help  = "pets"
 	response_disarm = "shoves"
 	response_harm   = "harmlessly punches"
@@ -11,6 +11,7 @@
 	turns_per_move = 5
 	speak_chance = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+	organ_names = list("head", "rear segment", "central segment")
 	response_help  = "pets"
 	response_disarm = "shoves"
 	response_harm   = "harmlessly punches"
@@ -7,6 +7,7 @@
 	icon_dead = "piratemelee_dead"
 	speak_chance = 0
 	turns_per_move = 5
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "pushes"
 	response_disarm = "shoves"
 	response_harm = "hits"
@@ -11,6 +11,7 @@
 	icon_dead = "republicon_dead"
 	speak_chance = 5
 	turns_per_move = 3
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "pokes"
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"
@@ -9,6 +9,7 @@
 	ranged = 1
 	smart = TRUE
 	turns_per_move = 3
+	organ_names = list("head", "central segment", "tail")
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"
@@ -85,6 +86,7 @@
 	harm_intent_damage = 5
 	ranged = 1
 	smart = TRUE
+	organ_names = list("core", "right fore wheel", "left fore wheel", "right rear wheel", "left rear wheel")
 	melee_damage_lower = 0
 	melee_damage_upper = 0
 	attacktext = "barrels into"
@@ -8,6 +8,7 @@
 	icon_gib = "syndicate_gib"
 	speak_chance = 0
 	turns_per_move = 5
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "pokes"
 	response_disarm = "shoves"
 	response_harm = "hits"
@@ -12,6 +12,7 @@
 	see_in_dark = 10
 	see_invisible = SEE_INVISIBLE_NOLIGHTING
 	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
+	organ_names = list("thorax", "legs", "head")
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "pokes"
@@ -8,6 +8,7 @@
 	icon_gib = "syndicate_gib"
 	speak_chance = 0
 	turns_per_move = 5
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help = "pokes"
 	response_disarm = "shoves"
 	response_harm = "hits"
@@ -9,6 +9,7 @@
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
+	organ_names = list("trunk", "branches", "roots")
 	response_help = "brushes"
 	response_disarm = "pushes"
 	response_harm = "hits"
@@ -44,6 +44,7 @@
 	turns_per_move = 5
 	meat_type = /obj/item/reagent_containers/food/snacks/cracker/

+	organ_names = list("torso", "left wing", "right wing", "head")
 	response_help  = "pets"
 	response_disarm = "gently moves aside"
 	response_harm   = "swats"
@@ -11,6 +11,7 @@
 	universal_speak = 1
 	speak_emote = list("hisses")
 	emote_hear = list("wails","screeches")
+	organ_names = list("chest", "lower body", "left arm", "right arm", "left leg", "right leg", "head")
 	response_help  = "puts their hand through"
 	response_disarm = "flails at"
 	response_harm   = "punches"
@@ -35,6 +35,7 @@
 	var/turns_since_scan = 0

 	//Interaction
+	var/list/organ_names = list("chest")
 	var/response_help   = "tries to help"
 	var/response_disarm = "tries to disarm"
 	var/response_harm   = "hurts"
@@ -10,6 +10,7 @@
 	speak_emote = list("transmits") //not supposed to be used under AI control
 	emote_hear = list("transmits")  //I'm just adding it so it doesn't runtime if controlled by player who speaks

+	organ_names = list("side")
 	response_help  = "touches"
 	response_disarm = "flails at"
 	response_harm   = "punches the"
@@ -185,11 +185,15 @@
 			playsound(target_mob, /decl/sound_category/bulletflyby_sound, 50, 1)
 		return FALSE

+	var/impacted_organ = parse_zone(def_zone)
+	if(istype(target_mob, /mob/living/simple_animal))
+		var/mob/living/simple_animal/SA = target_mob
+		impacted_organ = pick(SA.organ_names)
 	//hit messages
 	if(silenced)
-		to_chat(target_mob, "<span class='danger'>You've been hit in the [parse_zone(def_zone)] by \a [src]!</span>")
+		to_chat(target_mob, "<span class='danger'>You've been hit in the [impacted_organ] by \a [src]!</span>")
 	else
-		target_mob.visible_message("<span class='danger'>\The [target_mob] is hit by \a [src] in the [parse_zone(def_zone)]!</span>", "<span class='danger'><font size=2>You are hit by \a [src] in the [parse_zone(def_zone)]!</font></span>")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+		target_mob.visible_message("<span class='danger'>\The [target_mob] is hit by \a [src] in the [impacted_organ]!</span>", "<span class='danger'><font size=2>You are hit by \a [src] in the [impacted_organ]!</font></span>")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter

 	//admin logs
 	if(!no_attack_log)