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 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 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 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)