Merge branch 'master' of https://github.com/CarpHead/RuTGMC-Reborn

PMC-Unga-Marines · Sep 5, 2024 · f509030 · f509030
2 parents 32bdc16 + b13d195
commit f509030
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -613,7 +613,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define RAVAGER_RAGE_MIN_HEALTH_THRESHOLD				0.75 //The maximum % of HP we can have to trigger Rage
 #define RAVAGER_RAGE_STAGGERSTUN_IMMUNE_THRESHOLD		0.5
 #define RAVAGER_RAGE_ENDURE_INCREASE_PER_SLASH			2 SECONDS //The amount of time each slash during Rage increases Endure's duration
-#define RAVAGER_RAGE_HEALTH_RECOVERY_PER_SLASH			60 //Maximum amount of healing from slash during Rage
+#define RAVAGER_RAGE_HEALTH_RECOVERY_PER_SLASH			100 //Maximum amount of healing from slash during Rage
 
 //crusher defines
 #define CRUSHER_STOMP_LOWER_DMG 40

diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm
@@ -190,7 +190,7 @@
 	sharp = IS_SHARP_ITEM_SIMPLE
 	name = "sharpened " + name
 	shovelspeed = 10
-	force = 60
+	force = 90
 	update_icon()
 
 /obj/item/tool/shovel/etool/examine(mob/user)

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/ravager.dm
@@ -81,13 +81,16 @@
 			ravage.clear_cooldown()
 		on_cooldown = TRUE
 
+		GLOB.round_statistics.ravager_rages++
+		SSblackbox.record_feedback("tally", "round_statistics", 1, "ravager_rages")
+
 /mob/living/carbon/xenomorph/ravager/proc/drain_slash(datum/source, mob/living/target, damage, list/damage_mod, list/armor_mod)
 	SIGNAL_HANDLER
 	var/brute_damage = getBruteLoss()
 	var/burn_damage = getFireLoss()
 	if(!brute_damage && !burn_damage)
 		return
-	var/health_recovery = rage_power * RAVAGER_RAGE_HEALTH_RECOVERY_PER_SLASH
+	var/health_recovery = RAVAGER_RAGE_HEALTH_RECOVERY_PER_SLASH * rage_power
 	var/health_modifier
 	if(brute_damage)
 		health_modifier = -min(brute_damage, health_recovery)
@@ -99,7 +102,7 @@
 
 	var/datum/action/ability/xeno_action/endure/endure_ability = actions_by_path[/datum/action/ability/xeno_action/endure]
 	if(endure_ability.endure_duration) //Check if Endure is active
-		var/new_duration = min(RAVAGER_ENDURE_DURATION, (timeleft(endure_ability.endure_duration) + RAVAGER_RAGE_ENDURE_INCREASE_PER_SLASH * rage_power))
+		var/new_duration = min(RAVAGER_ENDURE_DURATION, (timeleft(endure_ability.endure_duration) + RAVAGER_RAGE_ENDURE_INCREASE_PER_SLASH))
 		deltimer(endure_ability.endure_duration) //Reset timers
 		deltimer(endure_ability.endure_warning_duration)
 		endure_ability.endure_duration = addtimer(CALLBACK(endure_ability, TYPE_PROC_REF(/datum/action/ability/xeno_action/endure, endure_deactivate)), new_duration, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE)

diff --git a/html/changelogs/AutoChangeLog-pr-188.yml b/html/changelogs/AutoChangeLog-pr-188.yml
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
@@ -53,3 +53,7 @@
       , \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u0438 \u0432 \u043E\u0431\
       \u0440\u0430\u0442\u043D\u0443\u044E \u0441\u0442\u043E\u0440\u043E\u043D\u0443\
       ."
+2024-09-05:
+  Helg2:
+  - refactor: "\u041F\u0435\u0440\u0435\u0434\u0435\u043B\u0430\u043D \u043A\u043E\
+      \u0434 \u043A\u0438\u0441\u043B\u043E\u0442\u044B."