From f5ac0b5762fb9cd4ce74694e9163d1675800391e Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 23 Jul 2020 18:10:46 +0100 Subject: [PATCH] some fixes --- code/datums/wounds/cuts.dm | 3 +++ code/modules/antagonists/slaughter/slaughter.dm | 4 ++-- .../mob/living/carbon/human/species_types/furrypeople.dm | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/datums/wounds/cuts.dm b/code/datums/wounds/cuts.dm index 578c8b9ddf..0ab3bbd5f8 100644 --- a/code/datums/wounds/cuts.dm +++ b/code/datums/wounds/cuts.dm @@ -132,6 +132,9 @@ if(!iscatperson(user)) return FALSE + if(!(user.client?.prefs.vore_flags & LICKABLE)) + return FALSE + lick_wounds(user) return TRUE diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 0c51c65a6f..35a674fb0e 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -34,8 +34,8 @@ healable = 0 environment_smash = ENVIRONMENT_SMASH_STRUCTURES obj_damage = 50 - melee_damage_lower = 15 // reduced from 30 to 15 with wounds since they get big buffs to slicing wounds - melee_damage_upper = 15 + melee_damage_lower = 22.5 // reduced from 30 to 22.5 with wounds since they get big buffs to slicing wounds + melee_damage_upper = 22.5 wound_bonus = -10 bare_wound_bonus = 0 sharpness = TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 9520d77015..203f8fa289 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -55,7 +55,7 @@ say_mod = "hisses" default_color = "00FF00" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR) mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg'