From 840510f1b240d25f53964cbfa50f15a5b1d77b19 Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Sun, 24 Jul 2022 19:39:28 -0400
Subject: [PATCH] Merge pull request #13390 from Heroman3003/two-fixes

Fixes two bugs
---
 code/modules/admin/admin.dm       |  6 ++----
 code/modules/admin/verbs/smite.dm | 22 ++++++++--------------
 code/modules/planet/virgo3c_vr.dm | 10 +++++-----
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b311f2f5c8..ebbece968d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1,5 +1,3 @@
-
-var/global/BSACooldown = 0
 var/global/floorIsLava = 0
 
 
@@ -1567,8 +1565,8 @@ var/datum/announcement/minor/admin_min_announcer = new
 			for(var/client/C in GLOB.admins)
 				if((R_ADMIN | R_MOD | R_EVENT) & C.holder.rights)
 					to_chat(C, "<span class='log_message'><span class='prefix'>FAX LOG:</span>[key_name_admin(src.owner)] has sent a fax message to [destination.department] (<a href='?_src_=holder;AdminFaxView=\ref[rcvdcopy]'>VIEW</a>)</span>")
-		
-		var/plaintext_title = P.sender ? "replied to [key_name(P.sender)]'s fax" : "sent a fax message to [destination.department]" 
+
+		var/plaintext_title = P.sender ? "replied to [key_name(P.sender)]'s fax" : "sent a fax message to [destination.department]"
 		var/fax_text = paper_html_to_plaintext(P.info)
 		log_game(plaintext_title)
 		log_game(fax_text)
diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm
index 78fd832f11..a407454d2b 100644
--- a/code/modules/admin/verbs/smite.dm
+++ b/code/modules/admin/verbs/smite.dm
@@ -25,21 +25,21 @@
 				broken_legs++
 			if(!broken_legs)
 				to_chat(src,"[target] didn't have any breakable legs, sorry.")
-		
+
 		if(SMITE_BLUESPACEARTILLERY)
 			bluespace_artillery(target,src)
-		
+
 		if(SMITE_SPONTANEOUSCOMBUSTION)
 			target.adjust_fire_stacks(10)
 			target.IgniteMob()
 			target.visible_message("<span class='danger'>[target] bursts into flames!</span>")
-		
+
 		if(SMITE_LIGHTNINGBOLT)
 			var/turf/T = get_step(get_step(target, NORTH), NORTH)
 			T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5)
 			target.electrocute_act(75,def_zone = BP_HEAD)
 			target.visible_message("<span class='danger'>[target] is struck by lightning!</span>")
-		
+
 		else
 			return //Injection? Don't print any messages.
 
@@ -50,14 +50,6 @@
 	if(!istype(target))
 		return
 
-	if(BSACooldown)
-		if(user)
-			to_chat(user,"<span class='warning'>BSA is still cooling down, please wait!</span>")
-		return
-
-	BSACooldown = 1
-	VARSET_IN(global, BSACooldown, FALSE, 5 SECONDS)
-
 	to_chat(target,"You've been hit by bluespace artillery!")
 	log_and_message_admins("[key_name(target)] has been hit by Bluespace Artillery fired by [key_name(user ? user : usr)]")
 
@@ -68,10 +60,12 @@
 		if(prob(80))	T.break_tile_to_plating()
 		else			T.break_tile()
 
-	if(target.health == 1)
+	playsound(T, get_sfx("explosion"), 100, 1, get_rand_frequency(), falloff = 5) // get_sfx() is so that everyone gets the same sound
+
+	if(target.health < 10)
 		target.gib()
 	else
-		target.adjustBruteLoss( min( 99 , (target.health - 1) )    )
+		target.adjustBruteLoss( max( 99 , (target.health - 1) )    )
 		target.Stun(20)
 		target.Weaken(20)
 		target.stuttering = 20
diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm
index 95e870a79f..45c64daee2 100644
--- a/code/modules/planet/virgo3c_vr.dm
+++ b/code/modules/planet/virgo3c_vr.dm
@@ -147,11 +147,11 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 /datum/weather/virgo3c/clear
 	name = "clear"
 	transition_chances = list(
-		WEATHER_CLEAR = 60,
-		WEATHER_OVERCAST = 20,
-		WEATHER_LIGHT_SNOW = 1,
-		WEATHER_BLOOD_MOON = 1,
-		WEATHER_EMBERFALL = 0.5)
+		WEATHER_CLEAR = 120,
+		WEATHER_OVERCAST = 40,
+		WEATHER_LIGHT_SNOW = 2,
+		WEATHER_BLOOD_MOON = 2,
+		WEATHER_EMBERFALL = 1)
 	transition_messages = list(
 		"The sky clears up.",
 		"The sky is visible.",