finishing touches?

shiptest-ss13 · Oct 11, 2023 · c6beba2 · c6beba2
1 parent 45571ee
commit c6beba2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
@@ -25,14 +25,16 @@
 					update_damage_overlays()
 			else //no bodypart, we deal damage with a more general method.
 				adjustBruteLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 		if(BURN)
 			if(BP)
 				if(BP.receive_damage(0, damage_amount, break_modifier))
 					update_damage_overlays()
 			else
 				adjustFireLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 		if(TOX)
 			adjustToxLoss(damage_amount, forced = forced)
 		if(OXY)
@@ -45,7 +47,8 @@
 					update_damage_overlays()
 			else
 				adjustStaminaLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 	return TRUE
 
 

diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
@@ -1768,7 +1768,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					H.update_damage_overlays()
 			else//no bodypart, we deal damage with a more general method.
 				H.adjustBruteLoss(damage_amount)
-			H.shake_animation(damage_amount)
+			if(H.stat <= HARD_CRIT)
+				H.shake_animation(damage_amount)
 		if(BURN)
 			H.damageoverlaytemp = 20
 			var/damage_amount = forced ? damage : damage * hit_percent * burnmod * H.physiology.burn_mod
@@ -1777,7 +1778,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					H.update_damage_overlays()
 			else
 				H.adjustFireLoss(damage_amount)
-			H.shake_animation(damage_amount)
+			if(H.stat <= HARD_CRIT)
+				H.shake_animation(damage_amount)
 		if(TOX)
 			var/damage_amount = forced ? damage : damage * hit_percent * H.physiology.tox_mod
 			H.adjustToxLoss(damage_amount)
@@ -1794,7 +1796,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					H.update_stamina()
 			else
 				H.adjustStaminaLoss(damage_amount)
-			H.shake_animation(damage_amount)
+			if(H.stat <= HARD_CRIT)
+				H.shake_animation(damage_amount)
 		if(BRAIN)
 			var/damage_amount = forced ? damage : damage * hit_percent * H.physiology.brain_mod
 			H.adjustOrganLoss(ORGAN_SLOT_BRAIN, damage_amount)

diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
@@ -23,10 +23,12 @@
 	switch(damagetype)
 		if(BRUTE)
 			adjustBruteLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 		if(BURN)
 			adjustFireLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 		if(TOX)
 			adjustToxLoss(damage_amount, forced = forced)
 		if(OXY)
@@ -35,7 +37,8 @@
 			adjustCloneLoss(damage_amount, forced = forced)
 		if(STAMINA)
 			adjustStaminaLoss(damage_amount, forced = forced)
-			shake_animation(damage_amount)
+			if(stat <= HARD_CRIT)
+				shake_animation(damage_amount)
 	return TRUE
 
 ///like [apply_damage][/mob/living/proc/apply_damage] except it always uses the damage procs

diff --git a/code/modules/projectiles/boxes_magazines/external/gauss.dm b/code/modules/projectiles/boxes_magazines/external/gauss.dm
@@ -9,7 +9,7 @@
 
 /obj/item/ammo_box/magazine/modelh
 	name = "Model H magazine (ferromagnetic slugs)"
-	desc = "A 10-round magazine for the Model H pistol. Ferromagnetic slugs are slow, but do incredible damage with significant armor penetration."
+	desc = "A 10-round magazine for the Model H pistol. Ferromagnetic slugs are slow and incredibly powerful bullets, but are easily stopped by even a sliver of armor."
 	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
 	caliber = "slug"

diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -12,7 +12,7 @@
 	spread_unwielded = 80
 	recoil = 1
 	recoil_unwielded = 4
-	wield_slowdown = 2
+	wield_slowdown = 4
 
 // L6 SAW //
 

diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
@@ -19,7 +19,7 @@
 
 /obj/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
 	..()
-	explosion(target, -1, 1, 3, 1, 0, flame_range = 4)
+	explosion(target, 1, 1, 2, 1, 0, flame_range = 4)
 
 	if(ismecha(target))
 		var/obj/mecha/M = target
@@ -69,7 +69,7 @@
 	..()
 	for(var/i in sturdy)
 		if(istype(target, i))
-			explosion(target, 0, 1, 1, 2)
+			explosion(target, 1, 1, 1, 2)
 			return BULLET_ACT_HIT
 	//if(istype(target, /turf/closed) || ismecha(target))
 	new /obj/item/broken_missile(get_turf(src), 1)