Merge branch 'master' into upstream-mirror-4615

code/modules/bitrunning/server/loot.dm

@@ -30,9 +30,9 @@
 
 	spark_at_location(cache) // abracadabra!
 	qdel(cache) // and it's gone!
-	SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_COMPLETE, cache, generated_domain.reward_points)
+	SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_COMPLETE, cache, generated_domain.reward_points * 2) // NOVA EDIT CHANGE - Original : SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_COMPLETE, cache, generated_domain.reward_points)
 
-	points += generated_domain.reward_points
+	points += (generated_domain.reward_points * 2) // NOVA EDIT CHANGE - Original : points += generated_domain.reward_points
 	playsound(src, 'sound/machines/terminal/terminal_success.ogg', 30, vary = TRUE)
 
 	var/bonus = calculate_rewards()

html/changelogs/AutoChangeLog-pr-5222.yml

@@ -0,0 +1,4 @@
+author: "Kocma-san"
+delete-after: True
+changes:
+  - rscadd: "new weather - snowfall"

html/changelogs/archive/2024-12.yml

@@ -725,3 +725,6 @@
   - bugfix: xenomorph larva can evolve again
   RashCat:
   - rscadd: Some private items for the winners of FF poster contest
+2024-12-12:
+  Smol42:
+  - bugfix: fixed some minor issues.

modular_nova/modules/bitrunning/code/disks.dm

@@ -1,3 +1,6 @@
+/obj/item/bitrunning_disk
+	w_class = WEIGHT_CLASS_SMALL
+
 /obj/item/bitrunning_disk/ability/tier0
 	name = "bitrunning program: cantrip"
 	selectable_actions = list(

modular_nova/modules/bitrunning/code/flair.dm

@@ -92,5 +92,6 @@
 		/obj/item/pizzabox/vegetable,
 		/obj/item/pizzabox/mushroom,
 		/obj/item/pizzabox/meat,
+		/obj/item/pizzabox/sassysage,
 		/obj/item/pizzabox/pineapple,
 	)

modular_nova/modules/bitrunning/code/loot.dm

@@ -0,0 +1,2 @@
+/obj/item/pizzabox/sassysage
+	pizza = /obj/item/food/pizza/sassysage

tff_modular/modules/snowfall/snowfall.dm

@@ -0,0 +1,29 @@
+// Безопасный снегопад! Без урона и не так сильно перекрывает видимость, в отличие от снежной бури. ff в начале, потому что апстримы могут свой с похожим именем сделать...
+/datum/weather/snow_storm/ff_snowfall
+	name = "snowfall"
+	desc = "Little snowflakes are falling from the sky. So calm and peaceful..."
+	probability = 0
+
+	telegraph_duration = 0
+
+	weather_message  = span_warning("Little snowflakes are falling from the sky...")
+	weather_overlay = "light_snow"
+	weather_duration_lower = 1800
+	weather_duration_upper = 3000
+
+	end_message = span_warning("Less snowflakes fall from the sky...")
+	end_duration = 100
+
+	cooling_lower = 1
+	cooling_upper = 3
+
+	var/harmfull = FALSE
+
+/datum/weather/snow_storm/ff_snowfall/weather_act(mob/living/living)
+	if(!harmfull)
+		return
+	return ..()
+
+/datum/weather/snow_storm/ff_snowfall/forever
+	probability = 0
+	perpetual = TRUE

tgstation.dme

@@ -7183,11 +7183,8 @@
 #include "modular_nova\modules\better_vox\code\vox_sprite_accessories.dm"
 #include "modular_nova\modules\bitrunning\code\disks.dm"
 #include "modular_nova\modules\bitrunning\code\flair.dm"
-<<<<<<< HEAD
-=======
 #include "modular_nova\modules\bitrunning\code\ghost_spawner.dm"
 #include "modular_nova\modules\bitrunning\code\loot.dm"
->>>>>>> 2a173268945 (Tweaks to Bitrunning SNPC spawners (and some other things) (but without TGS DMAPI) (#4615))
 #include "modular_nova\modules\bitrunning\code\mobs.dm"
 #include "modular_nova\modules\bitrunning\code\outfit.dm"
 #include "modular_nova\modules\bitrunning\code\spells.dm"
@@ -8893,6 +8890,7 @@
 #include "tff_modular\modules\selestial_language\language.dm"
 #include "tff_modular\modules\silicon_laws_tweaks\code\upload.dm"
 #include "tff_modular\modules\smites\femboyfication.dm"
+#include "tff_modular\modules\snowfall\snowfall.dm"
 #include "tff_modular\modules\timed_citations\crime.dm"
 #include "tff_modular\modules\toys\code\loadout_datum_toys.dm"
 #include "tff_modular\modules\toys\code\plushes.dm"