From c8472f954aed63211f8916394bd94398e0234837 Mon Sep 17 00:00:00 2001 From: Mori || Boxes Date: Mon, 4 Dec 2023 16:44:49 -0500 Subject: [PATCH 1/2] Adds Wcorp round healing effect --- code/game/gamemodes/management/event/combat.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index 5d6675a7e37d..55f71080768d 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -68,6 +68,14 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u /datum/game_mode/combat/proc/counterincrease() addtimer(CALLBACK(src, .proc/counterincrease), 1 MINUTES) GLOB.combat_counter+=1 + if(SSmaptype.maptype == "wcorp") + for(var/mob/living/carbon/human/H in GLOB.human_list) + if(H.stat == DEAD) + continue + if(!H.ckey) + continue + H.adjustBruteLoss(-(maxHealth*0.10)) + H.adjustSanityLoss(-(maxSanity*0.10)) /datum/game_mode/combat/proc/rcorp_announce() var/announcement_type = "" @@ -78,3 +86,4 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u announcement_type = "Intelligence has located a highly intelligent target in the vicinity. Destroy it at all costs." minor_announce("[announcement_type]" , "R-Corp Intelligence Office") + From 452a81af40db78dc1b9a3bd1b13bb3a7000bc81e Mon Sep 17 00:00:00 2001 From: Mori || Boxes Date: Mon, 4 Dec 2023 16:54:30 -0500 Subject: [PATCH 2/2] Update combat.dm --- code/game/gamemodes/management/event/combat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index 55f71080768d..e0d3b219d9e2 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -74,8 +74,8 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u continue if(!H.ckey) continue - H.adjustBruteLoss(-(maxHealth*0.10)) - H.adjustSanityLoss(-(maxSanity*0.10)) + H.adjustBruteLoss(-(H.maxHealth*0.10)) + H.adjustSanityLoss(-(H.maxSanity*0.10)) /datum/game_mode/combat/proc/rcorp_announce() var/announcement_type = ""