Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts: # icons/mob/clothing/mask.dmi
2021-03-16 19:19:12 -04:00
parent 24e0b7dc22 4053758828
commit 01d92230a3
903 changed files with 33579 additions and 24286 deletions
@@ -106,6 +106,7 @@
 			for(var/i in 1 to 3)
 				if(config_tag in saved_dynamic_rules[i])
 					weight_mult -= (repeated_mode_adjust[i]/100)
+	weight_mult = max(0,weight_mult)
 	if(config_tag in costs)
 		cost = costs[config_tag]
 	if(config_tag in requirementses)