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)
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!"
diff --git a/html/changelog.html b/html/changelog.html
index da0ba48e8b..9098c074a2 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:
@@ -342,70 +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
-
-
-
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
-
-
-
13 November 2021
-
Putnam3145 updated:
-
- - 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
-
-
-
10 November 2021
-
Ethan4303 updated:
-
- - Added two wire nodes under the engineering PA room Apc and under the HOS office APC
- - Added cables to connect the second floor relay to the power grid
- - Removed the generic broken computer from Hos Office
- - Fixed Hos office not having the Security records console
-
-
Putnam3145 updated:
-
- - Power alerts now work
- - No longer have too much O2 from too much CO2
-
-
SandPoot updated:
-
- - Crayon precision mode.
-
GoonStation 13 Development Team
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/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index 6e47a47b1c..a21c6dd896 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -11,7 +11,7 @@
"inferno-vnode-flags": "^7.4.8",
"js-yaml": "^4.1.0",
"katex": "^0.15.1",
- "marked": "^2.1.3",
+ "marked": "^4.0.10",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
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