From e5248851c41ccc1d9dac26fdb7667a8000bd7ad4 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sat, 2 Nov 2024 08:19:53 +0000 Subject: [PATCH 1/5] Bubberstation automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-2309.yml | 4 ---- html/changelogs/archive/2024-11.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2309.yml diff --git a/html/changelogs/AutoChangeLog-pr-2309.yml b/html/changelogs/AutoChangeLog-pr-2309.yml deleted file mode 100644 index f7a7e94d9f2b1..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-2309.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Jinshee" -delete-after: True -changes: - - rscadd: "New gecko tail!" \ No newline at end of file diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index 152e6c7063a85..9ba8283f1f499 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -5,3 +5,6 @@ - bugfix: The fax machine in Port Tarkon should no longer give a TGUI error. xPokee: - bugfix: fixed cryogenic consoles being destroyable +2024-11-02: + Jinshee: + - rscadd: New gecko tail! From 52c8a43d331ef01934b79d089e5dd389dd089a2f Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:32:43 -0400 Subject: [PATCH 2/5] Fix storyteller null event runtime (#2319) --- .../modules/storyteller/storytellers/tellers/_storyteller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zubbers/code/modules/storyteller/storytellers/tellers/_storyteller.dm b/modular_zubbers/code/modules/storyteller/storytellers/tellers/_storyteller.dm index 942b49d6a692b..d9c001768db65 100644 --- a/modular_zubbers/code/modules/storyteller/storytellers/tellers/_storyteller.dm +++ b/modular_zubbers/code/modules/storyteller/storytellers/tellers/_storyteller.dm @@ -138,4 +138,4 @@ ///If the event has occured already, apply a penalty multiplier based on amount of occurences weight_total -= event.reoccurence_penalty_multiplier * weight_total * (1 - (event_repetition_multiplier ** occurences)) /// Write it - event.calculated_weight = weight_total + event.calculated_weight = round(weight_total, 1) From 6a096440197da65ed9320e31f8c3ef479a75cfac Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sat, 2 Nov 2024 20:33:07 +0100 Subject: [PATCH 3/5] Automatic changelog for PR #2319 [ci skip] --- html/changelogs/AutoChangeLog-pr-2319.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2319.yml diff --git a/html/changelogs/AutoChangeLog-pr-2319.yml b/html/changelogs/AutoChangeLog-pr-2319.yml new file mode 100644 index 0000000000000..c04f2bfab3112 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2319.yml @@ -0,0 +1,4 @@ +author: "TealSeer" +delete-after: True +changes: + - bugfix: "find_and_buy_event_from_track should no longer randomly fail." \ No newline at end of file From cdc6bce411d7c80a8805e4cb355334ba08382032 Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:33:37 -0400 Subject: [PATCH 4/5] Remove archived map config entries (#2316) --- config/maps.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/config/maps.txt b/config/maps.txt index 9329441ed4336..5b2c5bbb2a4b4 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -63,10 +63,6 @@ endmap ##SKYRAT MAPS## -map blueshift - votable -endmap - map voidraptor votable endmap @@ -75,10 +71,6 @@ map biodome votable endmap -map limastation - votable -endmap - ##BUBBERSTATION MAPS## map boxstation @@ -89,9 +81,6 @@ map moonstation votable endmap -map ss13_construct -endmap - map kilostation votable endmap From 089ea803e1ef30753697a7c055a7ccc86f80ea47 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sat, 2 Nov 2024 20:34:57 +0100 Subject: [PATCH 5/5] Automatic changelog for PR #2316 [ci skip] --- html/changelogs/AutoChangeLog-pr-2316.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2316.yml diff --git a/html/changelogs/AutoChangeLog-pr-2316.yml b/html/changelogs/AutoChangeLog-pr-2316.yml new file mode 100644 index 0000000000000..c45d436d311d0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2316.yml @@ -0,0 +1,4 @@ +author: "TealSeer" +delete-after: True +changes: + - config: "Removed config entries for archived maps" \ No newline at end of file