Proper Upstream merge

_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm

@@ -63,12 +63,7 @@
 /obj/item/cult_shift,
 /obj/effect/decal/remains/human,
 /obj/item/melee/cultblade/dagger,
-/obj/effect/step_trigger/sound_effect{
-	happens_once = 1;
-	name = "\proper a grave mistake";
-	sound = 'sound/effects/hallucinations/i_see_you1.ogg';
-	triggerer_only = 1
-	},
+/obj/effect/step_trigger/sound_effect/lavaland_cult_altar,
 /obj/effect/step_trigger/message{
 	message = "<span class='cult italic'><b><span class='big'>You've made a grave mistake, haven't you?</span></b></span>";
 	name = "ohfuck"

code/controllers/configuration/entries/general.dm

@@ -315,7 +315,7 @@
 /datum/config_entry/string/banappeals
 
 /datum/config_entry/string/wikiurl
-	default = "http://www.tgstation13.org/wiki" //IRIS EDIT - Original: "http://www.tgstation13.org/wiki"
+	default = "https://wiki.novasector13.com/index.php" //NOVA EDIT CHANGE - Original: default = "http://tgstation13.org/wiki"
 
 /datum/config_entry/string/forumurl
 	default = "http://tgstation13.org/phpBB/index.php"

code/modules/fishing/fish/_fish.dm

@@ -766,11 +766,14 @@
 		hunger_mult = 1 - (hunger - FISH_GROWTH_PEAK) * 4
 		if(hunger_mult <= 0)
 			return
+	var/base_mult = FISH_GROWTH_MULT
+	if(HAS_TRAIT(src, TRAIT_FISH_QUICK_GROWTH))
+		base_mult *= 2.5
 	if(size < maximum_size)
-		new_size += CEILING((maximum_size - size) * FISH_GROWTH_MULT / (w_class * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
+		new_size += CEILING((maximum_size - size) * base_mult / (w_class * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
 		new_size = min(new_size, maximum_size)
 	if(weight < maximum_weight)
-		new_weight += CEILING((maximum_weight - weight) * FISH_GROWTH_MULT / (get_weight_rank() * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
+		new_weight += CEILING((maximum_weight - weight) * base_mult / (get_weight_rank() * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
 		new_weight = min(new_weight, maximum_weight)
 	if(new_size != size || new_weight != weight)
 		update_size_and_weight(new_size, new_weight)

modular_nova/modules/borgs/code/robot_upgrade.dm

@@ -311,7 +311,6 @@
 		smoke.start()
 		sleep(0.2 SECONDS)
 		for(var/i in 1 to 4)
-			playsound(borg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/tools/ratchet.ogg'), 80, TRUE, -1)
 			playsound(borg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/tools/ratchet.ogg'), 80, TRUE, -1)
 			sleep(1.2 SECONDS)
 		if(!prev_lockcharge)