From 4d89db5f9c0fc4bf006492873f05e5eac6d33b82 Mon Sep 17 00:00:00 2001 From: Coll6 Date: Mon, 10 Feb 2025 11:54:36 -0700 Subject: [PATCH 1/5] fixes wiremod radio component and nerfs recv trig --- code/modules/wiremod/components/action/radio.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/wiremod/components/action/radio.dm b/code/modules/wiremod/components/action/radio.dm index 74b2c54c1b816..e314fe0a85d4c 100644 --- a/code/modules/wiremod/components/action/radio.dm +++ b/code/modules/wiremod/components/action/radio.dm @@ -74,7 +74,7 @@ INVOKE_ASYNC(src, PROC_REF(handle_radio_input), port) /obj/item/circuit_component/radio/proc/handle_radio_input(datum/port/input/port) - if(!TIMER_COOLDOWN_CHECK(parent, COOLDOWN_SIGNALLER_SEND)) + if(TIMER_COOLDOWN_CHECK(parent, COOLDOWN_SIGNALLER_SEND)) return var/frequency = freq.value @@ -103,6 +103,9 @@ /obj/item/circuit_component/radio/receive_signal(datum/signal/signal) . = FALSE + if(TIMER_COOLDOWN_CHECK(parent, COOLDOWN_SIGNALLER_SEND)) + // Maybe not needed but might allow fast triggering from different sources with same signal without it. + return if(!signal) return if(signal.data["code"] != round(code.value || 0)) From 51af60ce1b45e9eda234081ac89bd1c6651d50ad Mon Sep 17 00:00:00 2001 From: Coll6 Date: Mon, 10 Feb 2025 13:49:44 -0700 Subject: [PATCH 2/5] Adjust Tirizine for monkestation values. --- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 236e7e42ac755..64c90c71e7e23 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -539,13 +539,13 @@ description = "A nonlethal poison that causes extreme fatigue and weakness in its victim." silent_toxin = TRUE color = "#6E2828" - data = 15 + data = 45 // monkestation edit toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.stamina.adjust(-data * REM * seconds_per_tick, 0) - data = max(data - 1, 3) + data = max(data - 3, 9) // monkestation edit ..() . = TRUE From 4a807541a50c29e877dc90d1cabe57395b1b57b8 Mon Sep 17 00:00:00 2001 From: Coll6 Date: Mon, 10 Feb 2025 14:00:54 -0700 Subject: [PATCH 3/5] Makes sure receiving also starts cooldown --- code/modules/wiremod/components/action/radio.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/wiremod/components/action/radio.dm b/code/modules/wiremod/components/action/radio.dm index e314fe0a85d4c..f8bd02d1f4ed9 100644 --- a/code/modules/wiremod/components/action/radio.dm +++ b/code/modules/wiremod/components/action/radio.dm @@ -114,6 +114,7 @@ if(public_options.value == COMP_RADIO_PRIVATE && parent?.owner_id != signal.data["key"]) return + TIMER_COOLDOWN_START(parent, COOLDOWN_SIGNALLER_SEND, signal_cooldown_time) trigger_output.set_output(COMPONENT_SIGNAL) #undef COMP_RADIO_PUBLIC From 75a0bdae2aed84e90506366c43fe1193ad555025 Mon Sep 17 00:00:00 2001 From: Coll6 Date: Mon, 10 Feb 2025 16:17:59 -0700 Subject: [PATCH 4/5] Fix money component and tool interactions. --- monkestation/code/modules/mech_comp/objects/_object.dm | 8 ++++++-- .../code/modules/mech_comp/objects/messages/money.dm | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/mech_comp/objects/_object.dm b/monkestation/code/modules/mech_comp/objects/_object.dm index 24eec2524615b..cb03b6b7cebfc 100644 --- a/monkestation/code/modules/mech_comp/objects/_object.dm +++ b/monkestation/code/modules/mech_comp/objects/_object.dm @@ -48,6 +48,8 @@ /obj/item/mcobject/wrench_act(mob/living/user, obj/item/tool) if(default_unfasten_wrench(user, tool)) log_message("[anchored ? "wrenched down" : "unwrenched"] by [key_name(user)]", LOG_MECHCOMP) + return TRUE + /obj/item/mcobject/set_anchored(anchorvalue) . = ..() @@ -71,15 +73,16 @@ if(!create_link(user, link.target)) to_chat(user, span_warning("Unsucessful link buffer cleared.")) qdel(link) - return + return TRUE qdel(link) - return + return TRUE var/action = tgui_input_list(user, "Select a config to modify", "Configure Component", configs) if(!action) return call(src, configs[action])(user, tool) + return TRUE /obj/item/mcobject/multitool_act_secondary(mob/living/user, obj/item/tool) var/datum/component/mclinker/link = tool.GetComponent(/datum/component/mclinker) @@ -88,6 +91,7 @@ qdel(link) add_linker(user, tool) + return TRUE /obj/item/mcobject/proc/unlink(mob/user, obj/item/tool) var/list/options = list() diff --git a/monkestation/code/modules/mech_comp/objects/messages/money.dm b/monkestation/code/modules/mech_comp/objects/messages/money.dm index 2137e296951c3..27e8788141680 100644 --- a/monkestation/code/modules/mech_comp/objects/messages/money.dm +++ b/monkestation/code/modules/mech_comp/objects/messages/money.dm @@ -14,6 +14,9 @@ ///the string displayed after the payment threshold has been reached var/output_string = "" + ///CAN_BE_HIT required to allow payments of credits and accounts + obj_flags = CAN_BE_HIT + /obj/item/mcobject/messaging/payment/update_desc(updates) . = ..() . += "Known for eating your change." @@ -101,6 +104,7 @@ attacked_stack.amount -= amount_to_reduce collected += actual_input say("[output_string]") + fire(stored_message) // required to signal other components something happened. else collected += total_value qdel(attacked_stack) @@ -110,7 +114,10 @@ if(attacked_chip.credits >= price) collected += price attacked_chip.credits -= price + if(attacked_chip.credits == 0) + qdel(attacking_item) say("[output_string]") + fire(stored_message) // required to signal other components something happened. else collected += attacked_chip.credits qdel(attacked_chip) From 08232b4778855d4ffd0c5964739207cc6c57d275 Mon Sep 17 00:00:00 2001 From: Coll6 Date: Mon, 10 Feb 2025 17:16:22 -0700 Subject: [PATCH 5/5] replacees machinery/jukebox with media/jukebox --- _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 1b07f1de75512..b89b278d0be60 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -1180,8 +1180,8 @@ /area/ruin/powered/beach) "PN" = ( /obj/effect/turf_decal/sand, -/obj/machinery/jukebox, /obj/item/coin/gold, +/obj/machinery/media/jukebox, /turf/open/floor/sepia, /area/ruin/powered/beach) "PY" = (