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

2019-12-24 00:07:32 +01:00
parent e74339ce8b 3f42677254
commit d571bbd292
82 changed files with 9095 additions and 3384 deletions
@@ -286,8 +286,8 @@
 	if(health < maxHealth)
 		adjustBruteLoss(-8) //Fast life regen
 	for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
-		if(!D.is_frosted)
-			D.frost_donut()
+		if(!D.is_decorated)
+			D.decorate_donut()

 /mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
 	..()