From 098564aab17365233a428e0b0d52be5bacafd8f7 Mon Sep 17 00:00:00 2001 From: nevimer <77420409+nevimer@users.noreply.github.com> Date: Sun, 7 Sep 2025 13:13:05 -0400 Subject: [PATCH] more intense jiggling more scrimblo code --- code/__HELPERS/~skyrat_helpers/unsorted.dm | 2 +- code/datums/elements/crusher_loot.dm | 2 +- code/game/objects/items/melee/energy.dm | 2 +- modular_skyrat/modules/decay_subsystem/code/nests.dm | 2 +- modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/~skyrat_helpers/unsorted.dm b/code/__HELPERS/~skyrat_helpers/unsorted.dm index 7affdd9ef3d..8ee4ab16e41 100644 --- a/code/__HELPERS/~skyrat_helpers/unsorted.dm +++ b/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 diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm index 0a8a2103649..a6aa071fb97 100644 --- a/code/datums/elements/crusher_loot.dm +++ b/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 diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 13670a50e54..8697cd3e72a 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/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 diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index a85eab2cbad..59413eda7d1 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/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) diff --git a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm index 67b8f80b011..6c9684c2b90 100644 --- a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm +++ b/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"