From 5759edf4784bc7b63429ff9428eb4a4b11b70ab0 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Mar 2024 18:19:19 -0400 Subject: [PATCH] changes --- code/game/machinery/computer/communications.dm | 4 ++-- code/modules/antagonists/revolution/revolution.dm | 3 +-- .../modules/storytellers/converted_events/solo/bloodcult.dm | 2 +- .../storytellers/converted_events/solo/clockwork_cult.dm | 2 +- .../storytellers/converted_events/solo/clown_operative.dm | 2 +- .../code/modules/storytellers/converted_events/solo/malf.dm | 2 +- .../storytellers/converted_events/solo/nuclear_operative.dm | 2 +- .../storytellers/converted_events/solo/revolutionary.dm | 2 +- .../code/modules/storytellers/converted_events/solo/wizard.dm | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 562a0f0cba7728..d46efbe39a47c9 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -881,8 +881,8 @@ continue shake_camera(crew_member, 15, 1) - var/datum/game_mode/dynamic/dynamic = SSticker.mode - dynamic.unfavorable_situation() + SSgamemode.point_gain_multipliers[EVENT_TRACK_ROLESET]++ + if(HACK_SLEEPER) // Trigger one or multiple sleeper agents with the crew (or for latejoining crew) var/datum/dynamic_ruleset/midround/sleeper_agent_type = /datum/dynamic_ruleset/midround/from_living/autotraitor diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 3324fe447db241..1138874d63d102 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -570,8 +570,7 @@ job.allow_bureaucratic_error = FALSE job.total_positions = 0 - var/datum/game_mode/dynamic/dynamic = SSticker.mode - dynamic.unfavorable_situation() + SSgamemode.point_gain_multipliers[EVENT_TRACK_ROLESET]++ var/message_header = "A recent assessment of your station has marked your station as a severe risk area for high ranking Nanotrasen officials." var/extra_detail = try_auto_call_shuttle() \ diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm index c1c613d5dbffe8..1c47846bc6599d 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm @@ -31,7 +31,7 @@ min_players = 30 roundstart = TRUE earliest_start = 0 SECONDS - weight = 4 + weight = 20 max_occurrences = 1 /datum/round_event/antagonist/solo/bloodcult diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm index f5a7ab9804f040..799de17f47adde 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm @@ -31,7 +31,7 @@ min_players = 30 roundstart = TRUE earliest_start = 0 SECONDS - weight = 4 + weight = 20 max_occurrences = 1 /datum/round_event/antagonist/solo/clockcult diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm index 3848053211e6b6..471d533f675edc 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm @@ -34,7 +34,7 @@ min_players = 35 roundstart = TRUE earliest_start = 0 SECONDS - weight = 1 //these are meant to be very rare + weight = 5 //these are meant to be very rare max_occurrences = 1 /datum/round_event/antagonist/solo/clown_operative diff --git a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm index d5cb6f3fb621b8..d2ac47c982b32e 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm @@ -15,7 +15,7 @@ maximum_antags = 1 exclusive_roles = list(JOB_AI) required_enemies = 4 - weight = 2 + weight = 10 min_players = 35 max_occurrences = 1 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm index 0299cbea2b5c78..9929c537500cda 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm @@ -34,7 +34,7 @@ min_players = 35 roundstart = TRUE earliest_start = 0 SECONDS - weight = 4 + weight = 20 max_occurrences = 3 /datum/round_event/antagonist/solo/nuclear_operative diff --git a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm index 48ae15bf43173c..b0be932a37b205 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm @@ -31,7 +31,7 @@ min_players = 35 roundstart = TRUE earliest_start = 0 SECONDS - weight = 0 //value was 3, we need to manually test if this works or not before allowing it normally + weight = 15 //value was 3, we need to manually test if this works or not before allowing it normally max_occurrences = 1 /datum/antagonist/rev/head/event_trigger diff --git a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm index 12d081b8fcead0..b55f9f507bbfea 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm @@ -21,7 +21,7 @@ required_enemies = 5 roundstart = TRUE earliest_start = 0 SECONDS - weight = 2 + weight = 10 min_players = 35 max_occurrences = 1