Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

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,"<span class='userlove'>You used your [G.name] to fill [container].</span>")
+	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)

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 = "<span class='userdanger'>The air begins to grow very warm!</span>"

html/changelog.html

@@ -50,6 +50,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 January 2022</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">More logging for bad ERP reagent mechanics</li>
+				<li class="balance">Made supernova rad storms less strong, slightly more common (but less spammy)</li>
+			</ul>
+
 			<h2 class="date">10 January 2022</h2>
 			<h3 class="author">Linzolle updated:</h3>
 			<ul class="changes bgimages16">
@@ -342,70 +349,6 @@
 				<li class="rscadd">Tree chopping/Grass cutting</li>
 				<li class="rscadd">Vectorcars</li>
 			</ul>
-
-			<h2 class="date">16 November 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Lavaland can no longer go below 281 kelvins</li>
-			</ul>
-			<h3 class="author">TripleShades updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">(Pubby) Engineering security checkpoint no longer has a duplicate records console</li>
-			</ul>
-
-			<h2 class="date">14 November 2021</h2>
-			<h3 class="author">TripleShades updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">(Pubby) Surgery table to Brig Medical</li>
-				<li class="rscadd">(Pubby) Dirt decals added to Command maint</li>
-				<li class="rscadd">(Pubby) Decals and gavel block to Courtroom</li>
-				<li class="rscadd">(Pubby) Training bomb to Birg</li>
-				<li class="rscdel">(Pubby) Chapel stripper pole room</li>
-				<li class="rscdel">(Pubby) Command maint storage shed room tweak: (Pubby) Makes Arrivals atmos room into a main atmos grid room akin to what Meta has</li>
-				<li class="bugfix">(Pubby) Gulag shuttle spawning in a tile off from the airlocks</li>
-				<li class="bugfix">(Pubby) Air Injector in Medical maints having no power</li>
-				<li class="bugfix">(Pubby) Incorrect area on one side at AI Sat where the turrets are</li>
-				<li class="bugfix">(Pubby) Arrivals atmos is now linked to the main atmos grid</li>
-				<li class="bugfix">(Pubby) Medbay front airlocks access</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="admin">Admins get messaged if dynamic midrounds fail to hijack</li>
-			</ul>
-
-			<h2 class="date">13 November 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Chonker cubans pete now no longer have a reasonable chance to be unbeatable</li>
-			</ul>
-
-			<h2 class="date">11 November 2021</h2>
-			<h3 class="author">DrPainis updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">The universe has realized that not every species uses hemoglobin again.</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="refactor">"REM" removed, replaced with "REAGENTS_EFFECT_MULTIPLIER", which "REM" is short for</li>
-			</ul>
-
-			<h2 class="date">10 November 2021</h2>
-			<h3 class="author">Ethan4303 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added two wire nodes under the engineering PA room Apc and under the HOS office APC</li>
-				<li class="rscadd">Added cables to connect the second floor relay to the power grid</li>
-				<li class="rscdel">Removed the generic broken computer from Hos Office</li>
-				<li class="bugfix">Fixed Hos office not having the Security records console</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Power alerts now work</li>
-				<li class="bugfix">No longer have too much O2 from too much CO2</li>
-			</ul>
-			<h3 class="author">SandPoot updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Crayon precision mode.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</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)

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:*"
   }

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