diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 8a39f6df8d1..dfebfd356cb 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -186,9 +186,9 @@ foodtypes = GRAIN | JUNKFOOD | SUGAR crafting_complexity = FOOD_COMPLEXITY_2 -/obj/item/food/cookie/sugar/Initialize(mapload) +/obj/item/food/cookie/sugar/Initialize(mapload, seasonal_changes = TRUE) . = ..() - if(check_holidays(FESTIVE_SEASON)) + if(seasonal_changes && check_holidays(FESTIVE_SEASON)) var/shape = pick("tree", "bear", "santa", "stocking", "present", "cane") desc = "A sugar cookie in the shape of a [shape]. I hope Santa likes it!" icon_state = "sugarcookie_[shape]" diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 8eb29fa706c..8cc87a60df5 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -40,6 +40,10 @@ icon_state = "coffincookie" crafting_complexity = FOOD_COMPLEXITY_2 +/obj/item/food/cookie/sugar/spookycoffin/Initialize(mapload, seasonal_changes = FALSE) + // Changes default parameter of seasonal_changes to FALSE, pass to parent + return ..(mapload, seasonal_changes) + //spooky items /obj/item/storage/spooky