more intense jiggling

more scrimblo code

code/__HELPERS/~skyrat_helpers/unsorted.dm

@@ -1,4 +1,4 @@
-/atom/proc/do_jiggle(targetangle = 45, timer = 20)
+/atom/proc/do_jiggle_sr(targetangle = 45, timer = 20)
 	var/matrix/OM = matrix(transform)
 	var/matrix/M = matrix(transform)
 	var/halftime = timer * 0.5

code/datums/elements/crusher_loot.dm

@@ -38,8 +38,8 @@
 	// SKYRAT EDIT START - ASHWALKER TROPHIES
 	var/datum/status_effect/ashwalker_damage/ashie_damage = target.has_status_effect(/datum/status_effect/ashwalker_damage) // SKYRAT EDIT ADDITION
 	var/damage_total = damage?.total_damage + ashie_damage?.total_damage // SKYRAT EDIT ADDITION
+	if(damage && prob((damage.damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default.
 	// SKYRAT EDIT END - ASHWALKER TROPHIES
-	if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default.
 		if(!islist(trophy_type))
 			make_path(target, trophy_type)
 			return

code/game/objects/items/melee/energy.dm

@@ -507,7 +507,7 @@
 		balloon_alert(user, "no charge!")
 		return COMPONENT_BLOCK_TRANSFORM
 
-/obj/item/melee/energy/sword/surplus/do_jiggle(mob/user) // BUBBER EDIT - MAKES THIS AN OVERRIDE BECAUSE SKYRAT HAS IT DEFINED ON /ATOM - THIS SHOULDNT CAUSE ISSUES BUT IF YOU COME LOOKING LATER THIS IS WHAT IS GOING ON
+/obj/item/melee/energy/sword/surplus/proc/do_jiggle(mob/user)
 	if(!COOLDOWN_FINISHED(src, jiggle_cooldown))
 		return TRUE
 

modular_skyrat/modules/decay_subsystem/code/nests.dm

@@ -116,7 +116,7 @@
 
 /obj/structure/mob_spawner/attacked_by(obj/item/I, mob/living/user)
 	. = ..()
-	do_jiggle()
+	do_jiggle_sr()
 	if(!retaliated)
 		visible_message(span_danger("[src] grubbles angrily!"))
 		var/chosen_mob_type = pick(monster_types)

modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm

@@ -333,7 +333,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/tarkon, 32)
 	visible_message(span_boldannounce("The nest rumbles violently as the entrance begins to crack and break apart!"))
 	playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
 	addtimer(CALLBACK(src, PROC_REF(rustle)), 5 SECONDS)
-	do_jiggle()
+	do_jiggle_sr()
 
 /obj/structure/spawner/tarkon_xenos/common
 	name = "infested nest"