From 2f8a26587fd82d2cd4a8d976171ea70d06caa05f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 27 Apr 2022 09:06:30 +0200 Subject: [PATCH] [MIRROR] adds christmas tree spawner + christmas cracker documentation [MDB IGNORE] (#13159) * adds christmas tree spawner + christmas cracker documentation (#66498) * Merge https://github.com/tgstation/tgstation into new_pda * boolean changes * Update code/modules/events/holiday/xmas.dm Co-authored-by: Seth Scherer Co-authored-by: Seth Scherer * adds christmas tree spawner + christmas cracker documentation Co-authored-by: magatsuchi <88991542+magatsuchi@users.noreply.github.com> Co-authored-by: Seth Scherer --- code/modules/events/holiday/xmas.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 67dd4308468..ad233195816 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -3,7 +3,8 @@ icon = 'icons/obj/christmas.dmi' icon_state = "cracker" desc = "Directions for use: Requires two people, one to pull each end." - var/cracked = 0 + /// The crack state of the toy. If set to TRUE, you can no longer crack it by attacking. + var/cracked = FALSE /obj/item/toy/xmas_cracker/attack(mob/target, mob/user) if( !cracked && ishuman(target) && (target.stat == CONSCIOUS) && !target.get_active_held_item() ) @@ -22,7 +23,7 @@ "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.") new /obj/item/clothing/head/festive(target.loc) user.update_icons() - cracked = 1 + cracked = TRUE icon_state = "cracker1" var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target) other_half.cracked = 1 @@ -47,7 +48,9 @@ layer = FLY_LAYER plane = ABOVE_GAME_PLANE + /// Christmas tree, no presents included. var/festive_tree = /obj/structure/flora/tree/pine/xmas + /// Christmas tree, presents included. var/christmas_tree = /obj/structure/flora/tree/pine/xmas/presents /obj/effect/spawner/xmastree/Initialize(mapload)