Merge branch 'master' into donator-upgrade

code/__DEFINES/_auxtools.dm

@@ -1,9 +1,12 @@
 #define AUXMOS (world.system_type == MS_WINDOWS ? "auxmos.dll" : __detect_auxmos())
 
 /proc/__detect_auxmos()
+	var/static/known_auxmos_var
+	if(!known_auxmos_var)
 		if (fexists("./libauxmos.so"))
-		return "./libauxmos.so"
+			known_auxmos_var = "./libauxmos.so"
 		else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so"))
-		return "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so"
+			known_auxmos_var = "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so"
 		else
 			CRASH("Could not find libauxmos.so")
+	return known_auxmos_var

code/game/objects/effects/decals/cleanable/misc.dm

@@ -126,7 +126,7 @@
 	icon_state = "greenglow"
 	beauty = -300
 	mergeable_decal = TRUE
-	persistent = TRUE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/greenglow/Initialize(mapload)
 	. = ..()

code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm

@@ -66,6 +66,7 @@
 /obj/item/stake/afterattack(atom/target, mob/user, proximity)
 	//to_chat(world, "<span class='notice'>DEBUG: Staking </span>")
 	// Invalid Target, or not targetting chest with HARM intent?
+	. = ..()
 	if(!iscarbon(target) || check_zone(user.zone_selected) != "chest" || user.a_intent != INTENT_HARM)
 		return
 	var/mob/living/carbon/C = target
@@ -139,9 +140,8 @@
 
 // Convert back to Silver
 /obj/item/stake/hardened/silver/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weldingtool))
+	if(I.tool_behaviour == TOOL_WELDER)
-		var/obj/item/weldingtool/WT = I
+		if(I.use(0))//remove_fuel(0, user))
-		if(WT.use(0))//remove_fuel(0, user))
 			var/obj/item/stack/sheet/mineral/silver/newsheet = new (user.loc)
 			for(var/obj/item/stack/sheet/mineral/silver/S in user.loc)
 				if(S == newsheet)

code/modules/events/dust.dm

@@ -19,7 +19,7 @@
 	typepath = /datum/round_event/sandstorm
 	weight = 5
 	max_occurrences = 1
-	min_players = 5
+	min_players = 10
 	earliest_start = 20 MINUTES
 
 /datum/round_event/sandstorm
@@ -28,5 +28,8 @@
 	announceWhen = 0
 	fakeable = FALSE
 
+/datum/round_event/sandstorm/announce(fake)
+	priority_announce("The station is passing through a heavy debris cloud. Watch out for breaches.", "Collision Alert")
+
 /datum/round_event/sandstorm/tick()
-	spawn_meteors(10, GLOB.meteorsC)
+	spawn_meteors(rand(6,10), GLOB.meteorsC)

code/modules/projectiles/boxes_magazines/external/magweapon.dm

@@ -1,4 +1,5 @@
 /obj/item/ammo_box/magazine/mmag
+	name = "magrifle magazine (non-lethal disabler)"
 	icon_state = "mediummagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/magnetic/disabler
 	caliber = "mag"

code/modules/surgery/tools.dm

@@ -105,6 +105,7 @@
 	attack_verb = list("burnt")
 	tool_behaviour = TOOL_CAUTERY
 	toolspeed = 1
+	heat = 3500
 
 /obj/item/cautery/attack(mob/living/L, mob/user)
 	if(user.a_intent == INTENT_HELP)
@@ -159,6 +160,7 @@
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "surgicaldrill_a"
 	hitsound = 'sound/items/welder.ogg'
+	heat = 3500
 
 /obj/item/surgicaldrill/advanced/Initialize(mapload)
 	. = ..()
@@ -234,6 +236,7 @@
 	toolspeed = 0.7
 	light_color = LIGHT_COLOR_GREEN
 	sharpness = SHARP_POINTY
+	heat = 3500
 
 /obj/item/scalpel/advanced/Initialize(mapload)
 	. = ..()

html/changelogs/archive/2022-08.yml

@@ -137,3 +137,20 @@
   - server: Adds the option to kick players who are likely connecting through a vpn
       on join
   - code_imp: reorganizes modular config code just a bit
+  SpookyTheFox:
+  - bugfix: fixed non-lethal magrifle ammo magazine name
+  BlueWildrose:
+  - balance: Removes persistence from the cleanable glowing goo. It'll no longer last
+      between rounds.
+  TripleShades:
+  - rscadd: '[Omega] One decal to better indicate Turbine area'
+  - rscdel: '[Omega] Duplicate leftover intercom'
+  - bugfix: '[Omega] Virology Airlock access buttons should actually work'
+2022-08-20:
+  Putnam3145:
+  - bugfix: Stake (maybe)
+  - bugfix: Caches the auxmos file if found
+  - balance: Sandstorm now happens less often, tends to be less powerful and is announced.
+  zeroisthebiggay:
+  - tweak: cauteries searing tools and energy scalpels now have heat and can be used
+      to light cigarettes