From d4188ee7cc0cc6742b5e7df1a6e4217065827864 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 23 Feb 2020 21:35:47 +0100 Subject: [PATCH 1/3] Caps the healt and damage of sentient animals --- code/modules/events/sentience.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index fb896e9e2a6..76550384447 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -36,9 +36,9 @@ SA.universal_speak = 1 SA.sentience_act() SA.can_collar = 1 - SA.maxHealth += 200 - SA.melee_damage_lower += 15 - SA.melee_damage_upper += 15 + SA.maxHealth = min(SA.maxHealth + 200, 300) + SA.melee_damage_lower = min(SA.melee_damage_lower + 15, 20) + SA.melee_damage_upper = min(SA.melee_damage_upper + 15, 25) SA.health = SA.maxHealth SA.del_on_death = FALSE greet_sentient(SA) From 9809e5f7b7a0833cc0c1cabe1b8b6085f6198468 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 8 Mar 2020 11:49:15 +0100 Subject: [PATCH 2/3] Review fixes --- code/modules/events/sentience.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 76550384447..74726219570 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -36,9 +36,9 @@ SA.universal_speak = 1 SA.sentience_act() SA.can_collar = 1 - SA.maxHealth = min(SA.maxHealth + 200, 300) - SA.melee_damage_lower = min(SA.melee_damage_lower + 15, 20) - SA.melee_damage_upper = min(SA.melee_damage_upper + 15, 25) + SA.maxHealth = min(SA.maxHealth + 200, max(SA.maxHealth, 300)) + SA.melee_damage_lower = min(SA.melee_damage_lower + 15, max(SA.melee_damage_lower, 20)) + SA.melee_damage_upper = min(SA.melee_damage_upper + 15, max(SA.melee_damage_upper, 25)) SA.health = SA.maxHealth SA.del_on_death = FALSE greet_sentient(SA) From 872ffb5c1b1410380ae1d0f0f166dc78fecfb2c8 Mon Sep 17 00:00:00 2001 From: farie82 Date: Sat, 14 Mar 2020 22:08:30 +0100 Subject: [PATCH 3/3] Update sentience.dm --- code/modules/events/sentience.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 74726219570..4dfe181bdb5 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -36,9 +36,7 @@ SA.universal_speak = 1 SA.sentience_act() SA.can_collar = 1 - SA.maxHealth = min(SA.maxHealth + 200, max(SA.maxHealth, 300)) - SA.melee_damage_lower = min(SA.melee_damage_lower + 15, max(SA.melee_damage_lower, 20)) - SA.melee_damage_upper = min(SA.melee_damage_upper + 15, max(SA.melee_damage_upper, 25)) + SA.maxHealth = max(SA.maxHealth, 200) SA.health = SA.maxHealth SA.del_on_death = FALSE greet_sentient(SA)