From 5f7ef21a7c6b8c1b8c878f87decba3df67211c91 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Mon, 10 Jan 2022 21:56:48 -0800 Subject: [PATCH 01/12] More supernova tweaks --- code/modules/events/supernova.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index e1d6991c89..b6a389f345 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -58,7 +58,7 @@ supernova.power_mod = min(supernova.power_mod*1.2, power) if(activeFor > endWhen-10) supernova.power_mod /= 4 - if(prob(round(supernova.power_mod)) && prob(3) && storm_count < 5 && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) + if(prob(round(supernova.power_mod)) && prob(5-storm_count) && !SSweather.get_weather_by_type(/datum/weather/rad_storm)) SSweather.run_weather(/datum/weather/rad_storm/supernova) storm_count++ @@ -73,6 +73,6 @@ weather_duration_lower = 50 weather_duration_upper = 100 telegraph_duration = 200 - radiation_intensity = 1000 + radiation_intensity = 500 weather_sound = null telegraph_message = "The air begins to grow very warm!" From d499ea1d9ee74697cc6ea9aa98ae24a25b0c4c64 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 12 Jan 2022 00:31:27 +0000 Subject: [PATCH 02/12] Automatic changelog compile [ci skip] --- html/changelog.html | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index da0ba48e8b..7188ae07d4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -388,24 +388,6 @@ - -

10 November 2021

-

Ethan4303 updated:

- -

Putnam3145 updated:

- -

SandPoot updated:

- GoonStation 13 Development Team From ef3e6923f8fd7808c1480ddc9fd2e2cb73cf3188 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 11 Jan 2022 17:39:50 -0800 Subject: [PATCH 03/12] Added more logging for climax-in-container --- code/modules/arousal/arousal.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm index a3adf0d25b..a27e2cdb74 100644 --- a/code/modules/arousal/arousal.dm +++ b/code/modules/arousal/arousal.dm @@ -74,7 +74,7 @@ if(spill && R.total_volume >= 5) R.reaction(turfing ? target : target.loc, TOUCH, 1, 0) if(!turfing) - R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1)) + R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1), log = TRUE) G.last_orgasmed = world.time R.clear_reagents() @@ -117,6 +117,7 @@ if(!do_after(src, mb_time, target = src) || !in_range(src, container) || !G.climaxable(src, TRUE)) return to_chat(src,"You used your [G.name] to fill [container].") + message_admins("[src] used their [G.name] to fill [container].") do_climax(fluid_source, container, G, FALSE) /mob/living/carbon/human/proc/pick_climax_genitals(silent = FALSE) From 65676ae59a28a078a434c5982fe9321555d40390 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 13 Jan 2022 00:32:58 +0000 Subject: [PATCH 04/12] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 7188ae07d4..615ac1814a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -378,16 +378,6 @@
  • Chonker cubans pete now no longer have a reasonable chance to be unbeatable
- -

11 November 2021

-

DrPainis updated:

-
    -
  • The universe has realized that not every species uses hemoglobin again.
  • -
-

Putnam3145 updated:

-
    -
  • "REM" removed, replaced with "REAGENTS_EFFECT_MULTIPLIER", which "REM" is short for
  • -
GoonStation 13 Development Team From 4db84cc664a1ec577648edae8cf30a45c604810b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 03:39:22 +0000 Subject: [PATCH 05/12] Bump pillow from 8.3.2 to 9.0.0 in /tools Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index a9abe5e826..c4f554212c 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,6 @@ pygit2==1.0.1 bidict==0.13.1 -Pillow==8.3.2 +Pillow==9.0.0 # changelogs PyYaml==5.4 From 2d93037901d7d8323bd2422ca40bba7d75619109 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 13 Jan 2022 10:53:47 -0600 Subject: [PATCH 06/12] Automatic changelog generation for PR #15467 [ci skip] --- html/changelogs/AutoChangeLog-pr-15467.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15467.yml diff --git a/html/changelogs/AutoChangeLog-pr-15467.yml b/html/changelogs/AutoChangeLog-pr-15467.yml new file mode 100644 index 0000000000..7ae2143134 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15467.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - admin: "More logging for bad ERP reagent mechanics" From dfc439523ded8dd24766c01fae4c8cf0ff11e9ee Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 13 Jan 2022 10:53:56 -0600 Subject: [PATCH 07/12] Automatic changelog generation for PR #15465 [ci skip] --- html/changelogs/AutoChangeLog-pr-15465.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15465.yml diff --git a/html/changelogs/AutoChangeLog-pr-15465.yml b/html/changelogs/AutoChangeLog-pr-15465.yml new file mode 100644 index 0000000000..de6833365b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15465.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Made supernova rad storms less strong, slightly more common (but less spammy)" From ca5d388bc7e65037898dfa94586dc50daba334d2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 14 Jan 2022 00:31:04 +0000 Subject: [PATCH 08/12] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15465.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15467.yml | 4 ---- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15465.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15467.yml diff --git a/html/changelog.html b/html/changelog.html index 615ac1814a..b1a0dd5c40 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,13 @@ -->
+

14 January 2022

+

Putnam3145 updated:

+
    +
  • More logging for bad ERP reagent mechanics
  • +
  • Made supernova rad storms less strong, slightly more common (but less spammy)
  • +
+

10 January 2022

Linzolle updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b58c419ceb..d58eef022f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30472,3 +30472,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: the blood in the BDM ruin is no longer white Putnam3145: - bugfix: Alcohol works again +2022-01-14: + Putnam3145: + - admin: More logging for bad ERP reagent mechanics + - balance: Made supernova rad storms less strong, slightly more common (but less + spammy) diff --git a/html/changelogs/AutoChangeLog-pr-15465.yml b/html/changelogs/AutoChangeLog-pr-15465.yml deleted file mode 100644 index de6833365b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15465.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Made supernova rad storms less strong, slightly more common (but less spammy)" diff --git a/html/changelogs/AutoChangeLog-pr-15467.yml b/html/changelogs/AutoChangeLog-pr-15467.yml deleted file mode 100644 index 7ae2143134..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15467.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - admin: "More logging for bad ERP reagent mechanics" From fdb7fac0571294f10646fefe95136a3c554a61d5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 15 Jan 2022 00:30:42 +0000 Subject: [PATCH 09/12] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index b1a0dd5c40..3d767e4523 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -379,12 +379,6 @@
    • Admins get messaged if dynamic midrounds fail to hijack
    - -

    13 November 2021

    -

    Putnam3145 updated:

    -
      -
    • Chonker cubans pete now no longer have a reasonable chance to be unbeatable
    • -
GoonStation 13 Development Team From 3771afdabd9bf2a640d585dcaa27ac8cdad5a32b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 02:39:28 +0000 Subject: [PATCH 10/12] Bump marked from 2.0.3 to 4.0.10 in /tgui Bumps [marked](https://github.com/markedjs/marked) from 2.0.3 to 4.0.10. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v2.0.3...v4.0.10) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tgui/packages/tgui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index 97a6893254..f52db6e76d 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -8,7 +8,7 @@ "inferno": "^7.4.8", "inferno-vnode-flags": "^7.4.8", "katex": "^0.15.1", - "marked": "^2.0.3", + "marked": "^4.0.10", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" } From 3fd22085166f02127c369162f2db6c10496af9d5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 16 Jan 2022 00:32:33 +0000 Subject: [PATCH 11/12] Automatic changelog compile [ci skip] --- html/changelog.html | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 3d767e4523..28cdc0a666 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -359,26 +359,6 @@
  • (Pubby) Engineering security checkpoint no longer has a duplicate records console
- -

14 November 2021

-

TripleShades updated:

-
    -
  • (Pubby) Surgery table to Brig Medical
  • -
  • (Pubby) Dirt decals added to Command maint
  • -
  • (Pubby) Decals and gavel block to Courtroom
  • -
  • (Pubby) Training bomb to Birg
  • -
  • (Pubby) Chapel stripper pole room
  • -
  • (Pubby) Command maint storage shed room tweak: (Pubby) Makes Arrivals atmos room into a main atmos grid room akin to what Meta has
  • -
  • (Pubby) Gulag shuttle spawning in a tile off from the airlocks
  • -
  • (Pubby) Air Injector in Medical maints having no power
  • -
  • (Pubby) Incorrect area on one side at AI Sat where the turrets are
  • -
  • (Pubby) Arrivals atmos is now linked to the main atmos grid
  • -
  • (Pubby) Medbay front airlocks access
  • -
-

keronshb updated:

-
    -
  • Admins get messaged if dynamic midrounds fail to hijack
  • -
GoonStation 13 Development Team From 3bf92703cc8ea9c7c347743d6f8ab1497e2a5a61 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 18 Jan 2022 00:32:02 +0000 Subject: [PATCH 12/12] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 28cdc0a666..9098c074a2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -349,16 +349,6 @@
  • Tree chopping/Grass cutting
  • Vectorcars
  • - -

    16 November 2021

    -

    Putnam3145 updated:

    -
      -
    • Lavaland can no longer go below 281 kelvins
    • -
    -

    TripleShades updated:

    -
      -
    • (Pubby) Engineering security checkpoint no longer has a duplicate records console
    • -
    GoonStation 13 Development Team