From 1fbbc4ff3ab31d94c872b78d736b44eaba1a4ef7 Mon Sep 17 00:00:00 2001 From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com> Date: Sun, 13 Jun 2021 18:52:04 -0400 Subject: [PATCH] Unarmed Damage Affects Simplemobs Again (#12010) --- .../simple_animal/constructs/constructs/artificer.dm | 1 - code/modules/mob/living/simple_animal/friendly/adhomai.dm | 1 - code/modules/mob/living/simple_animal/hostile/adhomai.dm | 1 - code/modules/mob/living/simple_animal/hostile/carp.dm | 3 +-- code/modules/mob/living/simple_animal/hostile/faithless.dm | 1 - .../mob/living/simple_animal/hostile/hivebots/hivebot.dm | 1 - .../simple_animal/hostile/hivebots/hivebot_harvester.dm | 1 - .../mob/living/simple_animal/hostile/phoron_worm.dm | 1 - code/modules/mob/living/simple_animal/hostile/pra.dm | 1 - code/modules/mob/living/simple_animal/simple_animal.dm | 7 +++++-- html/changelogs/Doxxmedearly - simplemob_unarmed.yml | 6 ++++++ 11 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 html/changelogs/Doxxmedearly - simplemob_unarmed.yml diff --git a/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm b/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm index 399cefc5382..9d3277f9e7c 100644 --- a/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm +++ b/code/modules/mob/living/simple_animal/constructs/constructs/artificer.dm @@ -8,7 +8,6 @@ maxHealth = 50 health_prefix = "artificer" response_harm = "viciously beaten" - harm_intent_damage = 5 melee_damage_lower = 10 melee_damage_upper = 10 attacktext = "rammed" diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm index 0ef99964732..cfa6b74b845 100644 --- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm +++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm @@ -95,7 +95,6 @@ maxHealth = 150 health = 150 - harm_intent_damage = 3 melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bitten" diff --git a/code/modules/mob/living/simple_animal/hostile/adhomai.dm b/code/modules/mob/living/simple_animal/hostile/adhomai.dm index e36909ef2f8..af69d6d37e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/adhomai.dm +++ b/code/modules/mob/living/simple_animal/hostile/adhomai.dm @@ -18,7 +18,6 @@ pass_flags = PASSTABLE - harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bitten" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 77ff8dcf479..67002d4f644 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -21,7 +21,7 @@ mob_size = 10 blood_overlay_icon = 'icons/mob/npc/blood_overlay_carp.dmi' - harm_intent_damage = 8 + harm_intent_damage = 4 melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bitten" @@ -136,7 +136,6 @@ mob_size = 15 - harm_intent_damage = 5 melee_damage_lower = 20 melee_damage_upper = 25 diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index 1f445312a30..4a2497ec9bc 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -18,7 +18,6 @@ tameable = FALSE - harm_intent_damage = 10 melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "gripped" diff --git a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm index d73d4a20993..30f55b7a096 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm @@ -7,7 +7,6 @@ blood_overlay_icon = 'icons/mob/npc/blood_overlay_hivebot.dmi' health = 15 maxHealth = 15 - harm_intent_damage = 3 melee_damage_lower = 10 melee_damage_upper = 10 break_stuff_probability = 25 diff --git a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm index b299097b620..2cee2981cb5 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot_harvester.dm @@ -7,7 +7,6 @@ maxHealth = 100 blood_type = COLOR_OIL blood_overlay_icon = 'icons/mob/npc/blood_overlay_hivebot.dmi' - harm_intent_damage = 3 melee_damage_lower = 30 melee_damage_upper = 30 destroy_surroundings = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm index c016b619650..c206ed57566 100644 --- a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm +++ b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm @@ -147,7 +147,6 @@ icon = 'icons/mob/npc/small_phoron_worm.dmi' maxHealth = 80 health = 80 - harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 resist_mod = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/pra.dm b/code/modules/mob/living/simple_animal/hostile/pra.dm index a90dd9c625b..e27319bf1bf 100644 --- a/code/modules/mob/living/simple_animal/hostile/pra.dm +++ b/code/modules/mob/living/simple_animal/hostile/pra.dm @@ -30,7 +30,6 @@ universal_speak = TRUE universal_understand = TRUE - harm_intent_damage = 5 melee_damage_lower = 15 melee_damage_upper = 15 mob_size = 5 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index e687e32881e..b3046ad5b2e 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -55,7 +55,7 @@ var/response_help = "tries to help" var/response_disarm = "tries to disarm" var/response_harm = "hurts" - var/harm_intent_damage = 5 + var/harm_intent_damage = 3 //The maximum amount of damage this mob can take from simple unarmed attacks that don't have damage values, like punches //Temperature effect var/minbodytemp = 250 @@ -502,7 +502,10 @@ simple_harm_attack(user) return attack.show_attack_simple(user, src, pick(organ_names)) - apply_damage(attack.get_unarmed_damage(user), attack.damage_type) + var/actual_damage = attack.get_unarmed_damage(user) //Punch and kick no longer have get_unarmed_damage due to how humanmob combat works. If we have none, we'll apply a small random amount. + if(!actual_damage) + actual_damage = harm_intent_damage ? rand(1, harm_intent_damage) : 0 + apply_damage(actual_damage, attack.damage_type) user.do_attack_animation(src, FIST_ATTACK_ANIMATION) return simple_harm_attack(user) diff --git a/html/changelogs/Doxxmedearly - simplemob_unarmed.yml b/html/changelogs/Doxxmedearly - simplemob_unarmed.yml new file mode 100644 index 00000000000..3346dd2a60f --- /dev/null +++ b/html/changelogs/Doxxmedearly - simplemob_unarmed.yml @@ -0,0 +1,6 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Punching and kicking simplemobs (including viscerators) now applies damage again."