Skip to content

Feburary Fixes part 2 #5409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion code/modules/wiremod/components/action/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand All @@ -111,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
Expand Down
8 changes: 6 additions & 2 deletions monkestation/code/modules/mech_comp/objects/_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand All @@ -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)
Expand All @@ -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()
Expand Down
7 changes: 7 additions & 0 deletions monkestation/code/modules/mech_comp/objects/messages/money.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Loading