From dca81de36c57a8d70e58328e18b9e4dce3269ac8 Mon Sep 17 00:00:00 2001 From: chefferz Date: Thu, 22 Aug 2019 20:09:52 -0400 Subject: [PATCH 1/7] Gives His Grace stamina regeneration His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten. This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion. --- code/game/objects/items/his_grace.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index c6f246ab97..f4405d578e 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -93,6 +93,7 @@ master.remove_status_effect(STATUS_EFFECT_HISGRACE) REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) master.Knockdown(60) + master.adjustStaminaLoss(-5) master.adjustBruteLoss(master.maxHealth) playsound(master, 'sound/effects/splat.ogg', 100, 0) else From de4d4a990b2ef64437a847e13bc82244d711f2bd Mon Sep 17 00:00:00 2001 From: chefferz Date: Thu, 22 Aug 2019 21:07:31 -0400 Subject: [PATCH 2/7] Updated weight class Updated weight class per Bhjin's suggestion --- code/game/objects/items/his_grace.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index f4405d578e..2d8a6ab54f 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -12,7 +12,7 @@ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' icon = 'icons/obj/items_and_weapons.dmi' - w_class = WEIGHT_CLASS_GIGANTIC + w_class = WEIGHT_CLASS_NORMAL force = 12 total_mass = TOTAL_MASS_NORMAL_ITEM // average toolbox attack_verb = list("robusted") From 580ea38199e9ce6eec1281527b654c93df3600b6 Mon Sep 17 00:00:00 2001 From: chefferz Date: Fri, 23 Aug 2019 03:45:44 -0400 Subject: [PATCH 3/7] Update buffs.dm --- code/datums/status_effects/buffs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 0512977d1a..f54c9687c5 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -170,6 +170,7 @@ tick_interval = 4 alert_type = /obj/screen/alert/status_effect/his_grace var/bloodlust = 0 + owner.adjustStaminaLoss(-5) /obj/screen/alert/status_effect/his_grace name = "His Grace" @@ -208,6 +209,7 @@ owner.adjustToxLoss(-grace_heal, TRUE, TRUE) owner.adjustOxyLoss(-(grace_heal * 2)) owner.adjustCloneLoss(-grace_heal) + owner.adjustStaminaLoss(-(grace_heal * 30)) /datum/status_effect/his_grace/on_remove() owner.log_message("lost His Grace's stun immunity", LOG_ATTACK) From bd1dae9082c13bc2add5517bae56db06ce49151f Mon Sep 17 00:00:00 2001 From: chefferz Date: Fri, 23 Aug 2019 03:46:13 -0400 Subject: [PATCH 4/7] Update buffs.dm --- code/datums/status_effects/buffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index f54c9687c5..2d460af68c 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -209,7 +209,7 @@ owner.adjustToxLoss(-grace_heal, TRUE, TRUE) owner.adjustOxyLoss(-(grace_heal * 2)) owner.adjustCloneLoss(-grace_heal) - owner.adjustStaminaLoss(-(grace_heal * 30)) + owner.adjustStaminaLoss(-(grace_heal * 25)) /datum/status_effect/his_grace/on_remove() owner.log_message("lost His Grace's stun immunity", LOG_ATTACK) From 788d616c763e5784d6837bafa09b05ef6acb1cdd Mon Sep 17 00:00:00 2001 From: chefferz Date: Fri, 23 Aug 2019 03:47:21 -0400 Subject: [PATCH 5/7] Update his_grace.dm --- code/game/objects/items/his_grace.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 2d8a6ab54f..e9fd6e00bb 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -93,7 +93,6 @@ master.remove_status_effect(STATUS_EFFECT_HISGRACE) REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) master.Knockdown(60) - master.adjustStaminaLoss(-5) master.adjustBruteLoss(master.maxHealth) playsound(master, 'sound/effects/splat.ogg', 100, 0) else From 0f4f20c29a63f2f83d57848a4470ca66b60559a6 Mon Sep 17 00:00:00 2001 From: chefferz Date: Fri, 23 Aug 2019 03:50:28 -0400 Subject: [PATCH 6/7] Update buffs.dm --- code/datums/status_effects/buffs.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 2d460af68c..336945f622 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -170,8 +170,7 @@ tick_interval = 4 alert_type = /obj/screen/alert/status_effect/his_grace var/bloodlust = 0 - owner.adjustStaminaLoss(-5) - + /obj/screen/alert/status_effect/his_grace name = "His Grace" desc = "His Grace hungers, and you must feed Him." From 3fcf9b329f32f0ab8ddc568434ca959a5bd56a95 Mon Sep 17 00:00:00 2001 From: chefferz Date: Fri, 23 Aug 2019 21:46:04 -0400 Subject: [PATCH 7/7] Update his_grace.dm --- code/game/objects/items/his_grace.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index e9fd6e00bb..3be57d23f1 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -12,7 +12,7 @@ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' icon = 'icons/obj/items_and_weapons.dmi' - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY force = 12 total_mass = TOTAL_MASS_NORMAL_ITEM // average toolbox attack_verb = list("robusted")