diff --git a/aurorastation.dme b/aurorastation.dme
index dfe2f0f8bfc..7a1e5dd5a7d 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -983,7 +983,6 @@
#include "code\game\objects\items\weapons\explosives.dm"
#include "code\game\objects\items\weapons\extinguisher.dm"
#include "code\game\objects\items\weapons\flamethrower.dm"
-#include "code\game\objects\items\weapons\gift_wrappaper.dm"
#include "code\game\objects\items\weapons\handcuffs.dm"
#include "code\game\objects\items\weapons\hydroponics.dm"
#include "code\game\objects\items\weapons\improvised_components.dm"
@@ -1941,6 +1940,7 @@
#include "code\modules\heavy_vehicle\premade\miner.dm"
#include "code\modules\heavy_vehicle\premade\misc.dm"
#include "code\modules\heavy_vehicle\premade\powerloader.dm"
+#include "code\modules\holidays\christmas\props.dm"
#include "code\modules\holidays\halloween\costumes.dm"
#include "code\modules\holidays\halloween\props.dm"
#include "code\modules\holodeck\HolodeckControl.dm"
diff --git a/code/game/gamemodes/events/holidays/christmas.dm b/code/game/gamemodes/events/holidays/christmas.dm
index fcb79f47178..2b69f0da4d8 100644
--- a/code/game/gamemodes/events/holidays/christmas.dm
+++ b/code/game/gamemodes/events/holidays/christmas.dm
@@ -16,55 +16,3 @@
evil_tree.icon_gib = evil_tree.icon_state
qdel(xmas)
-/obj/item/toy/xmas_cracker
- name = "xmas cracker"
- icon = 'icons/obj/christmas.dmi'
- icon_state = "cracker"
- desc = "Directions for use: Requires two people, one to pull each end."
- var/cracked = 0
-
-/obj/item/toy/xmas_cracker/attack(mob/target, mob/user, var/target_zone)
- if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
- target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.")
- var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
- var/title = "[pick("awful","terrible","unfunny")] joke"
- var/content = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'",
- "Why couldn't the snowman get laid?\n\nHe was frigid!",
- "Where are santa's helpers educated?\n\nNowhere, they're ELF-taught.",
- "What happened to the man who stole advent calanders?\n\nHe got 25 days.",
- "What does Santa get when he gets stuck in a chimney?\n\nClaus-trophobia.",
- "Where do you find chili beans?\n\nThe north pole.",
- "What do you get from eating tree decorations?\n\nTinsilitis!",
- "What do snowmen wear on their heads?\n\nIce caps!",
- "Why is Christmas just like life in NanoTrasen?\n\nYou do all the work and the fat guy gets all the credit.",
- "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.")
- Joke.set_content_unsafe(title, content)
- new /obj/item/clothing/head/festive(target.loc)
- user.update_icon()
- cracked = 1
- icon_state = "cracker1"
- var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target)
- other_half.cracked = 1
- other_half.icon_state = "cracker2"
- target.put_in_active_hand(other_half)
- playsound(user, 'sound/effects/snap.ogg', 50, 1)
- return 1
- return ..()
-
-/obj/item/clothing/head/festive
- name = "festive paper hat"
- icon_state = "xmashat"
- desc = "A crappy paper hat that you are REQUIRED to wear."
- flags_inv = 0
- body_parts_covered = 0
- armor = null
-
-/obj/item/clothing/head/festive/santa
- name = "santa hat"
- icon_state = "santahat"
- desc = "A cheap fabric santa hat."
-
-/obj/item/clothing/head/festive/santa/beard
- desc = "A cheap fabric santa hat, this one with a beard."
- body_parts_covered = HEAD
- icon_state = "santahat_alt"
\ No newline at end of file
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7162f03f371..616a6dfcc90 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -237,18 +237,6 @@
desc_extended = "There's a tag that reads: \"Apparition Halloween LLC.\""
icon_state = "ghostballoon"
-/obj/item/toy/balloon/xmastree
- name = "giant christmas tree balloon"
- desc = "Mandatory at inter-generational christmas gatherings and office parties."
- desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
- icon_state = "xmastreeballoon"
-
-/obj/item/toy/balloon/candycane
- name = "giant candy cane balloon"
- desc = "Kris Kringle ain't got nothing on this candied confection."
- desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
- icon_state = "candycaneballoon"
-
/obj/item/toy/balloon/color /// To color it, VV the 'color' var with a hex color code with the # included.
desc = "It's a plain little balloon. Comes in many colors!"
icon_state = "colorballoon"
@@ -1161,16 +1149,6 @@
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
-/obj/item/toy/xmastree
- name = "miniature Christmas tree"
- desc = "Now with 99% less pine needles."
- icon_state = "tinyxmastree"
- w_class = ITEMSIZE_TINY
- force = 1
- throwforce = 1
- drop_sound = 'sound/items/drop/cardboardbox.ogg'
- pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
-
/obj/item/toy/aurora
name = "aurora miniature"
desc = "A miniature of a space station, built into an asteroid. A tiny suspension field keeps it afloat. A small plaque on the front reads: NSS Aurora, Tau Ceti, Romanovich Cloud, 2464. Onward to new horizons."
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 32c109c1a7d..c9a9eaeadcb 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -59,24 +59,6 @@
qdel(src)
else ..()
-//
-// Christmas
-//
-
-/obj/structure/sign/christmas/lights
- name = "christmas lights"
- desc = "Flashy."
- icon = 'icons/obj/christmas.dmi'
- icon_state = "xmaslights"
- layer = 4.9
-
-/obj/structure/sign/christmas/wreath
- name = "wreath"
- desc = "Prickly and overrated."
- icon = 'icons/obj/christmas.dmi'
- icon_state = "doorwreath"
- layer = 5
-
//
// Generic Signs
//
@@ -1292,4 +1274,4 @@
sign_state = "shumaila_painting"
desc_extended = "Since entering the public eye in 2459, Shumaila enjoys much support from the women of Kaltir. Many look to her as an inspiration, buying military style jackets to emulate her \
look, given that Shumaila became one of the few Tajara women to lead a nation. However, this fame has also led to calls from the nobility and her family to choose a husband. Shumaila retains \
- that her marriage comes after her coronation. She was finally crowned in 2463 after King Azunja passed away. Outside of continuing her uncle's legacy, her plans to the Kingdom are still unclear to the wide public."
\ No newline at end of file
+ that her marriage comes after her coronation. She was finally crowned in 2463 after King Azunja passed away. Outside of continuing her uncle's legacy, her plans to the Kingdom are still unclear to the wide public."
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/modules/holidays/christmas/props.dm
similarity index 65%
rename from code/game/objects/items/weapons/gift_wrappaper.dm
rename to code/modules/holidays/christmas/props.dm
index 32deb2a6cd0..a1cd2405deb 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/modules/holidays/christmas/props.dm
@@ -1,8 +1,40 @@
-/* Gifts and wrapping paper
- * Contains:
- * Gifts
- * X-mas Gifts
- */
+// All Christmas Props, now UNIFIED in one place. Merry Christmas ~KingOfThePing
+
+// Things in your HAND
+/obj/item/toy/xmas_cracker
+ name = "xmas cracker"
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "cracker"
+ desc = "Directions for use: Requires two people, one to pull each end."
+ var/cracked = 0
+
+/obj/item/toy/xmas_cracker/attack(mob/target, mob/user, var/target_zone)
+ if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
+ target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.")
+ var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
+ var/title = "[pick("awful","terrible","unfunny")] joke"
+ var/content = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'",
+ "Why couldn't the snowman get laid?\n\nHe was frigid!",
+ "Where are santa's helpers educated?\n\nNowhere, they're ELF-taught.",
+ "What happened to the man who stole advent calanders?\n\nHe got 25 days.",
+ "What does Santa get when he gets stuck in a chimney?\n\nClaus-trophobia.",
+ "Where do you find chili beans?\n\nThe north pole.",
+ "What do you get from eating tree decorations?\n\nTinsilitis!",
+ "What do snowmen wear on their heads?\n\nIce caps!",
+ "Why is Christmas just like life in NanoTrasen?\n\nYou do all the work and the fat guy gets all the credit.",
+ "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.")
+ Joke.set_content_unsafe(title, content)
+ new /obj/item/clothing/head/festive(target.loc)
+ user.update_icon()
+ cracked = 1
+ icon_state = "cracker1"
+ var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target)
+ other_half.cracked = 1
+ other_half.icon_state = "cracker2"
+ target.put_in_active_hand(other_half)
+ playsound(user, 'sound/effects/snap.ogg', 50, 1)
+ return 1
+ return ..()
/*
* Gifts
@@ -10,7 +42,7 @@
/obj/item/a_gift
name = "gift"
desc = "PRESENTS!!!! eek!"
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/holidays/christmas/presents.dmi'
icon_state = "gift1"
item_state = "gift1"
drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -117,17 +149,13 @@
qdel(src)
return
-/*
- * Wrapping Paper
- */
-
/*
* Xmas Gifts
*/
/obj/item/xmasgift
name = "christmas gift"
desc = "PRESENTS!!!! eek!"
- icon = 'icons/obj/items.dmi'
+ icon = 'icons/holidays/christmas/presents.dmi'
icon_state = "gift1"
item_state = "gift"
w_class = ITEMSIZE_TINY
@@ -344,3 +372,114 @@
/obj/item/xmasgift/viscerator
gift_type = /mob/living/simple_animal/hostile/viscerator
w_class = ITEMSIZE_NORMAL
+
+// Things on your HEAD
+/obj/item/clothing/head/festive
+ name = "festive paper hat"
+ icon_state = "xmashat"
+ desc = "A crappy paper hat that you are REQUIRED to wear."
+ flags_inv = 0
+ body_parts_covered = 0
+ armor = null
+
+/obj/item/clothing/head/festive/santa
+ name = "santa hat"
+ icon_state = "santahat"
+ desc = "A cheap fabric santa hat."
+
+/obj/item/clothing/head/festive/santa/beard
+ desc = "A cheap fabric santa hat, this one with a beard."
+ body_parts_covered = HEAD
+ icon_state = "santahat_alt"
+
+// Things at your PLACE
+/obj/structure/sign/christmas/lights
+ name = "christmas lights"
+ desc = "Flashy."
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "xmaslights"
+ layer = 4.9
+
+/obj/structure/sign/christmas/wreath
+ name = "wreath"
+ desc = "Prickly and very festive."
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "doorwreath"
+ layer = 5
+
+/obj/structure/sign/christmas/garland
+ name = "festive garland"
+ desc = "Very festive lights. How nice."
+ icon = 'icons/holidays/christmas/props.dmi'
+ icon_state = "garland_on"
+ layer = 4.9
+
+/obj/structure/sign/christmas/tinsel
+ name = "tinsel"
+ desc = "There used to be more tinsel."
+ icon = 'icons/holidays/christmas/props.dmi'
+ icon_state = "tinsel_g"
+ layer = 5
+
+/obj/structure/sign/christmas/tinsel/red
+ name = "red tinsel"
+ icon_state = "tinsel_r"
+
+/obj/structure/sign/christmas/tinsel/yellow
+ name = "yellow tinsel"
+ icon_state = "tinsel_y"
+
+/obj/structure/sign/christmas/tinsel/white
+ name = "white tinsel"
+ icon_state = "tinsel_w"
+
+/obj/structure/sign/christmas/snowman
+ name = "snowman sticker"
+ desc = "A cheaply made adhesive sticker, looking like a snowman. At least it doesn't melt."
+ icon = 'icons/holidays/christmas/props.dmi'
+ icon_state = "snowman_s"
+
+/obj/structure/sign/christmas/snowman/hat
+ name = "hat snowman sticker"
+ desc = "A cheaply made adhesive sticker, looking like a snowman, but wearing a hat. At least it doesn't melt."
+ icon_state = "snowman_hat"
+
+/obj/structure/sign/christmas/snowflakes
+ name = "snowflake stickers"
+ desc = "Adhesive stickers, sticking really everywhere and looking like a stylized snowflake. Just like the one you are."
+ icon = 'icons/holidays/christmas/props.dmi'
+ icon_state = "snowflakes_1"
+
+/obj/structure/sign/christmas/snowflakes/alt
+ icon_state = "snowflakes_2"
+
+/obj/structure/sign/christmas/snowflakes/alt_2
+ icon_state = "snowflakes_3"
+
+/obj/structure/sign/christmas/snowflakes/alt_3
+ icon_state = "snowflakes_4"
+
+/obj/item/toy/xmastree
+ name = "miniature Christmas tree"
+ desc = "Now with 99% less pine needles."
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "tinyxmastree"
+ w_class = ITEMSIZE_TINY
+ force = 1
+ throwforce = 1
+ drop_sound = 'sound/items/drop/cardboardbox.ogg'
+ pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
+
+/obj/item/toy/balloon/xmastree
+ name = "giant christmas tree balloon"
+ desc = "Mandatory at inter-generational christmas gatherings and office parties."
+ desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "xmastreeballoon"
+
+/obj/item/toy/balloon/candycane
+ name = "giant candy cane balloon"
+ desc = "Kris Kringle ain't got nothing on this candied confection."
+ desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
+ icon = 'icons/holidays/christmas/items.dmi'
+ icon_state = "candycaneballoon"
diff --git a/html/changelogs/KingOfThePing - twice_upon_a_time.yml b/html/changelogs/KingOfThePing - twice_upon_a_time.yml
new file mode 100644
index 00000000000..35d4f838822
--- /dev/null
+++ b/html/changelogs/KingOfThePing - twice_upon_a_time.yml
@@ -0,0 +1,8 @@
+author: KingOfThePing
+
+delete-after: True
+
+changes:
+ - rscadd: "Added garlands, snowflake stickers, snowman stickers and tinsel as halloween decorations."
+ - maptweak: "Added all of the above in one way or another to the Idris Cruise map for the event."
+ - maptweak: "Tweaked some of the previously added crates of stuff on the Idris Cruise map."
diff --git a/icons/holidays/christmas/items.dmi b/icons/holidays/christmas/items.dmi
new file mode 100644
index 00000000000..4b015d4f91d
Binary files /dev/null and b/icons/holidays/christmas/items.dmi differ
diff --git a/icons/holidays/christmas/presents.dmi b/icons/holidays/christmas/presents.dmi
new file mode 100644
index 00000000000..b74ae97c296
Binary files /dev/null and b/icons/holidays/christmas/presents.dmi differ
diff --git a/icons/holidays/christmas/props.dmi b/icons/holidays/christmas/props.dmi
new file mode 100644
index 00000000000..7b408881a47
Binary files /dev/null and b/icons/holidays/christmas/props.dmi differ
diff --git a/icons/obj/christmas.dmi b/icons/obj/christmas.dmi
deleted file mode 100644
index f8ff8ff3035..00000000000
Binary files a/icons/obj/christmas.dmi and /dev/null differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index cd039b5816a..aa944562085 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index c5a1d6f0c5c..53b3948ce6c 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm
index 0cfa9134c7e..16d7ace2189 100644
--- a/maps/event/idris_cruise/idris_cruise-1.dmm
+++ b/maps/event/idris_cruise/idris_cruise-1.dmm
@@ -380,6 +380,7 @@
icon_state = "open";
opacity = 0
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -630,6 +631,11 @@
icon_state = "desert"
},
/area/cruise/jungle)
+"avi" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna1)
"avp" = (
/obj/structure/table/standard,
/obj/item/hand_tele,
@@ -677,6 +683,8 @@
/obj/machinery/door/airlock{
name = "Aft Washroom"
},
+/obj/structure/sign/christmas/tinsel/white,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "freezerfloor"
},
@@ -1567,6 +1575,7 @@
name = "Washroom Stall"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "freezerfloor"
},
@@ -1853,6 +1862,11 @@
icon_state = "dark"
},
/area/cruise/fore)
+"bjC" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/medical)
"bkh" = (
/obj/structure/railing/mapped{
dir = 8
@@ -1934,6 +1948,13 @@
icon_state = "dark2"
},
/area/cruise/aft)
+"bmq" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
+/turf/unsimulated/floor{
+ icon_state = "lino_grey"
+ },
+/area/cruise/pool)
"bny" = (
/obj/structure/closet/crate/medical,
/obj/item/roller,
@@ -2157,12 +2178,18 @@
name = "lush grass"
},
/area/cruise/jungle)
+"bsi" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore)
"bsm" = (
/obj/machinery/door/airlock{
id_tag = "c3";
name = "Washroom Stall"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "freezerfloor"
},
@@ -2215,6 +2242,8 @@
/area/cruise/main_bar)
"bvl" = (
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
+/obj/structure/sign/christmas/tinsel/red,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/carpet.dmi';
icon_state = "rub_carpet"
@@ -2555,6 +2584,11 @@
icon_state = "dark2"
},
/area/cruise/security)
+"bKY" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna2)
"bLx" = (
/turf/unsimulated/floor{
icon_state = "dark2"
@@ -2573,6 +2607,7 @@
req_access = list(101)
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor{
icon_state = "floor7"
},
@@ -2818,6 +2853,16 @@
icon_state = "wood_birch"
},
/area/cruise/escort)
+"bYt" = (
+/obj/machinery/door/airlock/glass{
+ name = "Main Bar"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
+/turf/unsimulated/floor{
+ icon_state = "lino_grey"
+ },
+/area/cruise/main_bar/aft)
"bZF" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/stool/padded/red,
@@ -3258,6 +3303,7 @@
name = "Cafe"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -3808,6 +3854,11 @@
name = "lush grass"
},
/area/cruise/jungle)
+"cLq" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"cLz" = (
/obj/item/flame/candle,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -3885,6 +3936,7 @@
icon_state = "open";
opacity = 0
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "bar"
},
@@ -3973,6 +4025,12 @@
icon_state = "carpet13-5"
},
/area/cruise/security)
+"cQz" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna1)
"cQI" = (
/obj/machinery/recharge_station,
/obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -4009,6 +4067,7 @@
name = "Centerline Entertainment Suites"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -4112,6 +4171,11 @@
icon_state = "lino_grey"
},
/area/cruise/arcade)
+"cVx" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"cVN" = (
/obj/structure/closet/walllocker/firecloset{
pixel_x = -32
@@ -4298,7 +4362,10 @@
opacity = 0
},
/obj/machinery/door/firedoor,
-/obj/structure/closet/crate,
+/obj/structure/closet/crate{
+ desc = "A rectangular steel crate with a note on the side: 'Don't drink all at once.'";
+ name = "alcohol extravaganza crate"
+ },
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
@@ -4311,6 +4378,15 @@
/obj/item/reagent_containers/food/drinks/bottle/veterans_choice,
/obj/item/reagent_containers/food/drinks/bottle/vintage_wine,
/obj/item/reagent_containers/food/drinks/bottle/vintage_wine,
+/obj/structure/closet/crate{
+ desc = "A rectangular steel crate with a note on the side: 'Don't drink all at once.'";
+ name = "alcohol extravaganza crate"
+ },
+/obj/item/reagent_containers/food/drinks/bottle/darmadhir_brew,
+/obj/item/reagent_containers/food/drinks/bottle/darmadhir_brew,
+/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
+/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
+/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -4507,6 +4583,20 @@
icon_state = "wood_birch"
},
/area/cruise/escort)
+"dhl" = (
+/obj/effect/decal/fake_object{
+ density = 1;
+ desc = "Ding.";
+ icon = 'icons/obj/doors/doorlift.dmi';
+ icon_state = "door_closed";
+ name = "elevator door";
+ opacity = 1
+ },
+/obj/structure/sign/christmas/wreath,
+/turf/unsimulated/floor{
+ icon_state = "dark"
+ },
+/area/cruise/fore)
"dhz" = (
/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ramp{
@@ -4939,6 +5029,7 @@
name = "Beach"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
/turf/unsimulated/floor{
icon_state = "bar"
},
@@ -5447,6 +5538,11 @@
icon_state = "dark"
},
/area/cruise/aft_p)
+"dZa" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/arcade)
"dZt" = (
/obj/structure/flora/grass/jungle,
/turf/unsimulated/beach/sand{
@@ -5526,6 +5622,11 @@
icon_state = "wood_cherry"
},
/area/cruise/dining_hall)
+"efZ" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/jungle)
"egb" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -5590,6 +5691,11 @@
icon_state = "new_white"
},
/area/cruise/medical)
+"eig" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/dining_hall)
"eim" = (
/obj/machinery/door/airlock/multi_tile/glass{
name = "Pool Junction"
@@ -5652,6 +5758,11 @@
icon_state = "freezerfloor"
},
/area/cruise/beach)
+"ekI" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"ekS" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/crescent,
@@ -5737,6 +5848,7 @@
name = "Centerline Entertainment Suites"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
/turf/unsimulated/floor{
icon_state = "wood_birch"
},
@@ -5747,6 +5859,10 @@
icon_state = "wood_birch"
},
/area/cruise/centerline)
+"eov" = (
+/obj/structure/sign/christmas/snowman/hat,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/main_bar)
"eoJ" = (
/obj/effect/decal/fake_object{
desc = "A descriptive sign.";
@@ -6449,6 +6565,10 @@
name = "gloomy grass"
},
/area/cruise/virtual_reality)
+"eKy" = (
+/obj/structure/sign/christmas/snowman,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/main_bar/aft)
"eLd" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/effect/floor_decal/industrial/warning{
@@ -6464,6 +6584,11 @@
/obj/structure/closet/crate/large,
/turf/unsimulated/floor/plating,
/area/cruise/arcade)
+"eLs" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman/hat,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"eLE" = (
/obj/structure/window/reinforced/crescent{
dir = 1
@@ -6819,6 +6944,7 @@
},
/obj/machinery/door/firedoor,
/obj/item/toy/xmastree,
+/obj/structure/sign/christmas/lights,
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -6918,6 +7044,16 @@
icon_state = "platebot"
},
/area/template_noop)
+"fdQ" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+ name = "Medical Care Unit"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel,
+/turf/unsimulated/floor{
+ icon_state = "new_white"
+ },
+/area/cruise/medical)
"feC" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/unsimulated/floor{
@@ -7071,6 +7207,16 @@
"fja" = (
/turf/simulated/floor/tiled/ramp,
/area/cruise/main_bar)
+"fjE" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+ name = "Fore Midship Hallway"
+ },
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor{
+ icon_state = "dark"
+ },
+/area/cruise/central)
"fjG" = (
/obj/structure/closet/crate/bin,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -7438,7 +7584,7 @@
name = "Main Bar"
},
/obj/machinery/door/firedoor,
-/obj/structure/sign/christmas/wreath,
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -7956,6 +8102,7 @@
"fRG" = (
/obj/item/clothing/suit/snowman_costume,
/obj/item/clothing/head/snowman_hat,
+/obj/item/toy/balloon/candycane,
/turf/unsimulated/floor/xmas,
/area/cruise/centerline)
"fRP" = (
@@ -8092,6 +8239,7 @@
id_tag = "main_unit_2";
name = "Changing Room 2"
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -8209,6 +8357,7 @@
id_tag = "main_unit_1";
name = "Changing Room 1"
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -8242,6 +8391,11 @@
icon_state = "dark"
},
/area/cruise/central)
+"gby" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"gbC" = (
/obj/structure/sink{
dir = 4;
@@ -8769,6 +8923,7 @@
name = "elevator door";
opacity = 1
},
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -8938,6 +9093,11 @@
icon_state = "carpet5-1"
},
/area/cruise/security)
+"gwp" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore_p)
"gxb" = (
/obj/item/hullbeacon/red,
/turf/unsimulated/floor{
@@ -8954,6 +9114,17 @@
name = "gloomy grass"
},
/area/cruise/virtual_reality)
+"gyM" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/glass{
+ name = "Fore Midship Hallway"
+ },
+/obj/structure/sign/christmas/wreath,
+/turf/unsimulated/floor{
+ icon_state = "dark"
+ },
+/area/cruise/central)
"gyN" = (
/obj/structure/lattice,
/obj/effect/decal/fake_object{
@@ -9002,6 +9173,14 @@
icon_state = "dark"
},
/area/cruise/aft_p)
+"gAM" = (
+/obj/structure/sign/christmas/lights{
+ dir = 1
+ },
+/turf/unsimulated/floor{
+ icon_state = "tiles_small"
+ },
+/area/cruise/aft_p)
"gAS" = (
/obj/effect/decal/fake_object{
desc = "An automated gun turret.";
@@ -9188,6 +9367,20 @@
icon_state = "wood"
},
/area/cruise/library)
+"gIP" = (
+/obj/effect/decal/fake_object{
+ density = 1;
+ desc = "Ding.";
+ icon = 'icons/obj/doors/doorlift.dmi';
+ icon_state = "door_closed";
+ name = "elevator door";
+ opacity = 1
+ },
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor{
+ icon_state = "dark"
+ },
+/area/cruise/fore)
"gJa" = (
/turf/unsimulated/floor{
icon_state = "bar"
@@ -10156,6 +10349,14 @@
icon_state = "dark2"
},
/area/cruise/escort)
+"hsp" = (
+/obj/structure/table/stone/marble,
+/obj/item/toy/balloon/xmastree,
+/obj/item/toy/balloon/candycane,
+/turf/unsimulated/floor{
+ icon_state = "wood_cherry"
+ },
+/area/cruise/dining_hall)
"htb" = (
/obj/item/hullbeacon/red,
/obj/structure/window/reinforced/polarized{
@@ -10933,6 +11134,7 @@
name = "Pool"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -11361,6 +11563,11 @@
},
/turf/template_noop,
/area/cruise/main_bar/aft)
+"irY" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/dining_hall)
"ism" = (
/obj/structure/table/standard,
/obj/structure/window/reinforced/crescent{
@@ -11596,6 +11803,7 @@
name = "Public Backup Custodial Closet"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/wreath,
/turf/unsimulated/floor{
icon_state = "dark2"
},
@@ -11722,6 +11930,11 @@
icon_state = "dark2"
},
/area/cruise/aft_s)
+"iIs" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar)
"iIH" = (
/obj/item/modular_computer/console/preset/command/teleporter,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -11788,6 +12001,9 @@
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/machinery/door/firedoor,
/obj/item/storage/box/fancy/cookiesnack,
+/obj/structure/sign/christmas/lights{
+ dir = 1
+ },
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -11824,6 +12040,12 @@
},
/turf/simulated/floor/tiled/ramp,
/area/cruise/fore_p)
+"iMU" = (
+/obj/structure/sign/christmas/tinsel/red,
+/turf/unsimulated/floor{
+ icon_state = "wood_cherry"
+ },
+/area/cruise/centerline)
"iMV" = (
/obj/structure{
density = 1;
@@ -11938,6 +12160,11 @@
icon_state = "floor7"
},
/area/cruise/arcade)
+"iPE" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman/hat,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"iQL" = (
/obj/structure/table/stone/marble,
/obj/machinery/door/firedoor,
@@ -12164,6 +12391,7 @@
/area/cruise/aft_s)
"iVJ" = (
/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor/plating,
/area/cruise/aft_p)
"iVT" = (
@@ -12233,6 +12461,7 @@
/obj/machinery/door/airlock/multi_tile/glass{
name = "Centerline Entertainment Suites"
},
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor{
icon_state = "wood_cherry"
},
@@ -12262,6 +12491,7 @@
/obj/machinery/door/airlock/glass{
name = "Fore Midship Hallway"
},
+/obj/structure/sign/christmas/tinsel/red,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -12276,6 +12506,11 @@
},
/turf/simulated/floor/tiled/ramp,
/area/cruise/aft)
+"iZO" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar)
"iZT" = (
/obj/structure/window/reinforced/crescent{
dir = 4
@@ -12516,6 +12751,11 @@
icon_state = "wood_cherry"
},
/area/cruise/centerline)
+"jkI" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/wreath,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"jkT" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas/half{
@@ -12740,6 +12980,11 @@
dir = 1
},
/area/cruise/jungle)
+"jsz" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/arcade)
"jsG" = (
/obj/structure/table/standard,
/obj/structure/window/reinforced/crescent,
@@ -13154,6 +13399,11 @@
icon_state = "floor7"
},
/area/cruise/aft)
+"jNk" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore)
"jNT" = (
/obj/machinery/light{
dir = 1
@@ -13236,6 +13486,11 @@
icon_state = "wood"
},
/area/cruise/pool/sauna1)
+"jRf" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore_s)
"jRv" = (
/obj/structure/flora/pottedplant/random,
/obj/structure/sign/flag/idris{
@@ -13336,6 +13591,10 @@
icon_state = "dark2"
},
/area/cruise/escort)
+"jVv" = (
+/obj/structure/sign/christmas/garland,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/aft)
"jVy" = (
/turf/unsimulated/floor{
dir = 8;
@@ -13648,6 +13907,7 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/simulated/floor/wood,
/area/cruise/dining_hall)
"kkc" = (
@@ -13895,6 +14155,8 @@
/area/template_noop)
"kqC" = (
/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor/plating,
/area/cruise/custodial_p)
"kqY" = (
@@ -14149,6 +14411,7 @@
/turf/template_noop,
/area/cruise/dining_hall)
"kzj" = (
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/wall/fakeairlock{
icon = 'icons/obj/doors/Doorext.dmi';
icon_state = "door_locked";
@@ -14387,6 +14650,11 @@
dir = 4
},
/area/cruise/main_bar)
+"kJI" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"kKJ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -14671,6 +14939,7 @@
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/pen,
+/obj/item/clothing/head/festive/santa,
/turf/unsimulated/floor{
icon_state = "wood_cherry"
},
@@ -14893,12 +15162,22 @@
name = "lush grass"
},
/area/cruise/jungle)
+"ldg" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/dining_hall)
"ldq" = (
/obj/structure/bed/stool/padded/red,
/turf/unsimulated/floor{
icon_state = "bar"
},
/area/cruise/beach)
+"ldH" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"leB" = (
/turf/unsimulated/floor{
icon_state = "wood-broken3"
@@ -15112,10 +15391,16 @@
/obj/machinery/door/airlock{
name = "VR Suite"
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
/area/cruise/arcade)
+"lmV" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna3)
"lnT" = (
/obj/structure/railing/mapped,
/turf/unsimulated/beach/coastline{
@@ -15539,6 +15824,11 @@
icon_state = "dark2"
},
/area/cruise/beach)
+"lBU" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft_p)
"lCi" = (
/obj/structure/flora/tree/pine/xmas,
/turf/unsimulated/floor/xmas,
@@ -15615,6 +15905,13 @@
icon_state = "lino_grey"
},
/area/cruise/main_bar/aft)
+"lDr" = (
+/obj/structure/table/stone/marble,
+/obj/item/toy/balloon/xmastree,
+/turf/unsimulated/floor{
+ icon_state = "wood_cherry"
+ },
+/area/cruise/dining_hall)
"lDu" = (
/obj/effect/floor_decal/corner/mauve{
dir = 5
@@ -15896,6 +16193,7 @@
/obj/structure/sign/christmas/lights{
dir = 8
},
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -15966,6 +16264,11 @@
icon_state = "wood-broken3"
},
/area/cruise/virtual_reality)
+"lOF" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"lOR" = (
/obj/structure/sign/christmas/lights,
/turf/unsimulated/floor{
@@ -16082,6 +16385,10 @@
icon_state = "carpetside"
},
/area/cruise/escort)
+"lRU" = (
+/obj/structure/sign/christmas/snowman/hat,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/main_bar/aft)
"lSq" = (
/obj/structure/railing/mapped,
/obj/structure/railing/mapped{
@@ -16095,6 +16402,7 @@
"lSB" = (
/obj/machinery/chemical_dispenser/bar_soft/full,
/obj/structure/table/stone/marble,
+/obj/structure/sign/christmas/tinsel/red,
/turf/simulated/floor/wood,
/area/cruise/dining_hall)
"lTe" = (
@@ -16161,6 +16469,7 @@
},
/obj/structure/table/stone/marble,
/obj/item/toy/xmastree,
+/obj/item/toy/xmas_cracker,
/turf/unsimulated/floor{
icon_state = "wood_cherry"
},
@@ -16267,6 +16576,13 @@
icon_state = "floor7"
},
/area/cruise/pool)
+"lYD" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor{
+ icon_state = "tiles_small"
+ },
+/area/cruise/fore_s)
"lYX" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -16502,6 +16818,7 @@
/obj/machinery/door/airlock/multi_tile/glass{
name = "Starboard Primary Hall - Midship"
},
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
icon_state = "tiles_small"
},
@@ -16571,6 +16888,11 @@
/obj/item/xmasgift/medium,
/turf/unsimulated/floor/xmas,
/area/cruise/centerline)
+"mly" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool)
"mlC" = (
/obj/effect/floor_decal/spline/fancy{
dir = 4
@@ -16672,6 +16994,11 @@
icon_state = "new_white"
},
/area/cruise/virtual_reality)
+"mqX" = (
+/obj/item/toy/balloon/candycane,
+/obj/item/toy/balloon/candycane,
+/turf/unsimulated/floor/xmas,
+/area/cruise/centerline)
"mrn" = (
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/structure/table/stone/marble,
@@ -16761,6 +17088,11 @@
icon_state = "dark2"
},
/area/cruise/centerline)
+"mtT" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"mub" = (
/obj/effect/landmark/force_spawnpoint{
job_tag = "Passenger"
@@ -17149,6 +17481,10 @@
icon_state = "tiles_small"
},
/area/cruise/central)
+"mJT" = (
+/obj/structure/sign/christmas/garland,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/jungle)
"mKn" = (
/obj/machinery/atm{
pixel_x = 28;
@@ -17202,6 +17538,11 @@
},
/turf/simulated/floor/tiled/ramp,
/area/cruise/arcade)
+"mNe" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/medical)
"mNq" = (
/obj/structure/table/rack,
/obj/item/stack/material/glass/reinforced/full,
@@ -17377,6 +17718,11 @@
},
/turf/simulated/floor/reinforced,
/area/cruise/virtual_reality)
+"mOU" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool)
"mPr" = (
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -17392,6 +17738,7 @@
/obj/structure/railing/mapped{
dir = 8
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "wood_light"
},
@@ -17629,6 +17976,13 @@
name = "lush grass"
},
/area/cruise/jungle)
+"mYw" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor{
+ icon_state = "wood_birch"
+ },
+/area/cruise/centerline)
"mZn" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/corner/blue{
@@ -17824,6 +18178,11 @@
icon_state = "wood_willow"
},
/area/cruise/centerline)
+"niT" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel/red,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"njd" = (
/obj/machinery/vending/wallmed1{
pixel_x = -32;
@@ -17898,6 +18257,7 @@
name = "Emergency Supplies Closet"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/wreath,
/turf/unsimulated/floor{
icon_state = "floor7"
},
@@ -17926,6 +18286,7 @@
/area/cruise/escort)
"npf" = (
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/yellow,
/turf/unsimulated/floor{
icon_state = "wood_birch"
},
@@ -20294,9 +20655,6 @@
"pin" = (
/obj/structure/closet/crate/bin,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/unsimulated/floor{
icon_state = "dark2"
},
@@ -21298,6 +21656,10 @@
icon_state = "dark2"
},
/area/cruise/fore_p)
+"pVP" = (
+/obj/structure/sign/christmas/snowman,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/fore_s)
"pWh" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp/lava/red,
@@ -21327,6 +21689,9 @@
/obj/machinery/light{
dir = 8
},
+/obj/item/toy/balloon/xmastree,
+/obj/item/toy/balloon/xmastree,
+/obj/item/toy/balloon/xmastree,
/turf/unsimulated/floor{
icon_state = "wood_birch"
},
@@ -21403,6 +21768,11 @@
icon_state = "dark2"
},
/area/cruise/pool)
+"qaO" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/medical)
"qbd" = (
/obj/structure/window/reinforced/crescent,
/turf/unsimulated/floor{
@@ -22007,6 +22377,7 @@
name = "Washroom Stall"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "freezerfloor"
},
@@ -22454,6 +22825,11 @@
},
/turf/template_noop,
/area/template_noop)
+"qTD" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman/hat,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"qUf" = (
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -22706,6 +23082,7 @@
name = "Public Backup Custodial Closet"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "dark2"
},
@@ -23090,6 +23467,11 @@
icon_state = "dark2"
},
/area/cruise/custodial_s)
+"ruQ" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool)
"rvP" = (
/obj/structure/window/reinforced{
dir = 8
@@ -23108,6 +23490,11 @@
/obj/effect/decal/remains,
/turf/unsimulated/floor/plating,
/area/template_noop)
+"rwZ" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel/white,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft_p)
"rxO" = (
/obj/effect/decal/fake_object{
desc = "A descriptive sign.";
@@ -23126,6 +23513,9 @@
"rym" = (
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/sign/christmas/lights{
+ dir = 1
+ },
/turf/unsimulated/floor{
icon_state = "tiles_small"
},
@@ -23220,6 +23610,9 @@
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/machinery/door/firedoor,
/obj/item/rfd/service,
+/obj/structure/sign/christmas/lights{
+ dir = 1
+ },
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -23555,6 +23948,18 @@
icon_state = "desert"
},
/area/cruise/beach)
+"rPD" = (
+/obj/structure/curtain/black{
+ icon_state = "open";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
+/turf/unsimulated/floor{
+ dir = 8;
+ icon_state = "wood"
+ },
+/area/cruise/main_bar/aft)
"rQy" = (
/obj/structure/sink{
dir = 8;
@@ -23625,6 +24030,11 @@
},
/turf/simulated/floor/tiled/ramp,
/area/cruise/centerline)
+"rUJ" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar)
"rUT" = (
/obj/structure/sign/christmas/lights{
dir = 4
@@ -23914,6 +24324,8 @@
/obj/structure/table/wood,
/obj/machinery/recharger,
/obj/structure/railing/mapped,
+/obj/item/toy/balloon/candycane,
+/obj/item/toy/balloon/xmastree,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -24274,6 +24686,11 @@
dir = 4
},
/area/cruise/main_bar/aft)
+"svf" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman/hat,
+/turf/unsimulated/floor/plating,
+/area/cruise/dining_hall)
"svu" = (
/turf/unsimulated/floor{
icon_state = "freezerfloor"
@@ -24390,6 +24807,7 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "wood_light"
},
@@ -24583,6 +25001,8 @@
name = "Main Deck Hydroponics"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/carpet.dmi';
icon_state = "rub_carpet"
@@ -24632,6 +25052,7 @@
/obj/effect/floor_decal/corner/green/diagonal,
/obj/item/flag/idris,
/obj/item/flag/idris,
+/obj/item/clothing/head/festive/santa,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -25019,6 +25440,11 @@
dir = 4
},
/area/cruise/hangar)
+"sZc" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore_p)
"sZf" = (
/turf/unsimulated/floor{
icon_state = "platebot"
@@ -25402,6 +25828,11 @@
icon_state = "wood"
},
/area/cruise/virtual_reality)
+"tmX" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool)
"tne" = (
/obj/structure/curtain/black{
icon_state = "open";
@@ -25467,6 +25898,11 @@
name = "lush grass"
},
/area/cruise/jungle)
+"tqp" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna3)
"tqr" = (
/obj/item/clothing/suit/armor/tactical,
/obj/item/clothing/suit/armor/tactical,
@@ -25659,6 +26095,11 @@
icon_state = "wood"
},
/area/cruise/pool/sauna1)
+"tyw" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"tyD" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/bed/roller,
@@ -25881,6 +26322,11 @@
},
/turf/unsimulated/floor/plating,
/area/cruise/arcade)
+"tEp" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore)
"tEy" = (
/obj/structure/closet/firecloset/full,
/turf/unsimulated/floor{
@@ -26000,6 +26446,7 @@
/obj/machinery/door/firedoor,
/obj/item/storage/box/fancy/cookiesnack,
/obj/item/toy/xmastree,
+/obj/structure/sign/christmas/lights,
/turf/unsimulated/floor{
icon_state = "new_white"
},
@@ -26330,6 +26777,7 @@
name = "Reading Room"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/white,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -26433,6 +26881,7 @@
/obj/structure/sign/christmas/lights{
dir = 4
},
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -26610,6 +27059,11 @@
icon_state = "wood_light"
},
/area/cruise/virtual_reality)
+"ucW" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/arcade)
"udp" = (
/obj/structure/lattice/catwalk/indoor/grate,
/turf/unsimulated/floor/plating,
@@ -26816,6 +27270,7 @@
name = "Garden"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
/turf/unsimulated/floor{
icon_state = "wood_birch"
},
@@ -27054,6 +27509,7 @@
/area/cruise/arcade)
"uti" = (
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -27090,6 +27546,13 @@
icon_state = "platebot"
},
/area/cruise/pool/sauna1)
+"uuh" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
+/turf/unsimulated/floor{
+ icon_state = "new_white"
+ },
+/area/cruise/medical)
"uum" = (
/obj/machinery/shieldgen,
/obj/effect/floor_decal/industrial/outline/red,
@@ -27109,6 +27572,7 @@
},
/obj/structure/table/stone/marble,
/obj/machinery/chemical_dispenser/bar_alc/full,
+/obj/structure/sign/christmas/tinsel,
/turf/simulated/floor/wood,
/area/cruise/dining_hall)
"uvK" = (
@@ -27154,9 +27618,6 @@
/obj/item/soap/golden_soap,
/obj/item/towel,
/obj/item/storage/box/fancy/candle_box,
-/obj/structure/sign/christmas/lights{
- dir = 1
- },
/turf/unsimulated/floor{
icon_state = "dark2"
},
@@ -27413,6 +27874,11 @@
/obj/machinery/light/small,
/turf/unsimulated/floor/plating,
/area/cruise/arcade)
+"uFe" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna1)
"uFf" = (
/obj/structure/bed/stool/padded/red,
/obj/structure/window/reinforced{
@@ -27431,6 +27897,11 @@
icon_state = "bar"
},
/area/cruise/beach)
+"uGw" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowman,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"uGE" = (
/obj/effect/overlay/palmtree_r,
/turf/unsimulated/beach/sand{
@@ -27547,6 +28018,7 @@
/obj/machinery/door/airlock/glass{
name = "Fore Midship Hallway"
},
+/obj/structure/sign/christmas/tinsel,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -27578,6 +28050,8 @@
/obj/structure/table/wood,
/obj/item/material/ashtray/bronze,
/obj/item/toy/xmas_cracker,
+/obj/item/toy/balloon/candycane,
+/obj/item/toy/balloon/candycane,
/turf/unsimulated/floor{
icon_state = "wood_willow"
},
@@ -27822,6 +28296,8 @@
name = "Aft Washroom"
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/red,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -27967,6 +28443,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/white,
/turf/unsimulated/floor{
icon_state = "floor7"
},
@@ -28038,6 +28515,11 @@
icon_state = "lino_grey"
},
/area/cruise/arcade)
+"vfy" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/beach)
"vfC" = (
/obj/structure/table/reinforced,
/obj/structure/sign/flag/coalition,
@@ -28188,6 +28670,11 @@
"vlW" = (
/turf/simulated/wall/shuttle/idris/cardinal,
/area/cruise/medical)
+"vlX" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/jungle)
"vmx" = (
/obj/structure/bed/stool/chair/wood{
dir = 4
@@ -28207,6 +28694,11 @@
icon_state = "dark2"
},
/area/cruise/escort)
+"vnt" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/pool/sauna2)
"vnA" = (
/obj/structure/railing/mapped{
dir = 1
@@ -28440,6 +28932,11 @@
icon_state = "dark"
},
/area/cruise/security)
+"vyJ" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel/white,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"vzh" = (
/obj/structure/bed/stool/bar/padded/red,
/turf/unsimulated/floor{
@@ -28749,6 +29246,17 @@
icon_state = "new_white"
},
/area/cruise/virtual_reality)
+"vPg" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock{
+ name = "Aft Washroom"
+ },
+/obj/structure/sign/christmas/tinsel,
+/obj/structure/sign/christmas/garland,
+/turf/unsimulated/floor{
+ icon_state = "freezerfloor"
+ },
+/area/cruise/washroom_aft)
"vPo" = (
/obj/machinery/light{
dir = 8
@@ -29063,6 +29571,11 @@
icon_state = "asteroidplating"
},
/area/cruise/beach)
+"vYb" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"vYF" = (
/obj/effect/floor_decal/spline/fancy{
dir = 1
@@ -29229,6 +29742,11 @@
name = "dirt"
},
/area/cruise/jungle)
+"wdk" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore_s)
"wdG" = (
/turf/unsimulated/beach/coastline{
dir = 9;
@@ -29506,6 +30024,11 @@
icon_state = "asteroidfloor"
},
/area/cruise/beach)
+"wjP" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"wkx" = (
/obj/machinery/door/airlock/centcom{
name = "Teleporter Room";
@@ -29581,6 +30104,11 @@
icon_state = "desert"
},
/area/cruise/beach)
+"woD" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"wpY" = (
/obj/effect/decal/fake_object{
desc = "A descriptive sign.";
@@ -29661,6 +30189,10 @@
icon_state = "grass_stalk"
},
/area/cruise/medical)
+"wvN" = (
+/obj/structure/sign/christmas/garland,
+/turf/simulated/wall/shuttle/idris/cardinal,
+/area/cruise/main_bar/aft)
"wwj" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -29686,6 +30218,13 @@
icon_state = "new_white"
},
/area/cruise/medical)
+"wxF" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/tinsel/yellow,
+/turf/unsimulated/floor{
+ icon_state = "bar"
+ },
+/area/cruise/beach)
"wyb" = (
/turf/unsimulated/floor{
icon_state = "panelscorched"
@@ -29849,6 +30388,11 @@
icon_state = "wood_birch"
},
/area/cruise/aft)
+"wEb" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/beach)
"wEp" = (
/obj/structure/railing/mapped{
dir = 8
@@ -29946,6 +30490,11 @@
icon_state = "wood_birch"
},
/area/cruise/escort)
+"wHk" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/tinsel,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"wHq" = (
/obj/structure/window/reinforced/crescent{
dir = 4
@@ -30042,6 +30591,11 @@
icon_state = "bcircuit"
},
/area/cruise/arcade)
+"wKj" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_3,
+/turf/unsimulated/floor/plating,
+/area/cruise/centerline)
"wKt" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -30064,6 +30618,7 @@
/area/template_noop)
"wKP" = (
/obj/structure/table/stone/marble,
+/obj/item/xmasgift/large,
/turf/unsimulated/floor{
icon_state = "wood_cherry"
},
@@ -30290,6 +30845,11 @@
icon_state = "wood"
},
/area/cruise/pool/sauna1)
+"wUH" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore_s)
"wVG" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -30343,6 +30903,11 @@
icon_state = "panelscorched"
},
/area/cruise/arcade)
+"wXX" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/main_bar/aft)
"wXY" = (
/obj/effect/floor_decal/spline/fancy{
dir = 1
@@ -30550,6 +31115,18 @@
icon_state = "dark2"
},
/area/cruise/central)
+"xhb" = (
+/obj/structure/curtain/black{
+ icon_state = "open";
+ layer = 4.1;
+ opacity = 0
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
+/turf/unsimulated/floor{
+ icon_state = "dark2"
+ },
+/area/cruise/pool)
"xhc" = (
/obj/machinery/light{
dir = 8
@@ -31128,6 +31705,11 @@
icon_state = "tiles_small"
},
/area/cruise/aft)
+"xAy" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes,
+/turf/unsimulated/floor/plating,
+/area/cruise/aft)
"xAz" = (
/obj/effect/floor_decal/corner/mauve{
dir = 10
@@ -31405,6 +31987,7 @@
opacity = 0
},
/obj/machinery/door/firedoor,
+/obj/structure/sign/christmas/garland,
/turf/unsimulated/floor{
icon_state = "lino_grey"
},
@@ -31435,6 +32018,11 @@
/obj/structure/table/rack,
/turf/simulated/floor/reinforced,
/area/cruise/virtual_reality)
+"xII" = (
+/obj/effect/map_effect/window_spawner/reinforced/crescent,
+/obj/structure/sign/christmas/snowflakes/alt_2,
+/turf/unsimulated/floor/plating,
+/area/cruise/fore)
"xJk" = (
/obj/structure/window/reinforced{
dir = 4
@@ -31996,6 +32584,11 @@
icon_state = "dark2"
},
/area/cruise/pool)
+"yja" = (
+/obj/item/toy/xmas_cracker,
+/obj/item/xmasgift/schlorrgo,
+/turf/unsimulated/floor/xmas,
+/area/cruise/centerline)
"yjG" = (
/obj/effect/floor_decal/industrial/loading/yellow{
dir = 8
@@ -53839,9 +54432,9 @@ oSt
oSt
cPr
cPr
+avi
cul
-cul
-cul
+uFe
cPr
cPr
cPr
@@ -53859,7 +54452,7 @@ fgt
fgt
fgt
fgt
-uJc
+mly
uJc
fgt
fgt
@@ -53868,13 +54461,13 @@ aoL
fgt
fgt
uJc
+tmX
uJc
-uJc
-uJc
+mly
fgt
fgt
uJc
-uJc
+mly
rdY
lIu
oSt
@@ -54120,8 +54713,8 @@ cqO
aGo
oJY
fgt
-uJc
-uJc
+tmX
+mly
fgt
scA
kQj
@@ -54132,7 +54725,7 @@ iXb
kYD
flk
uJc
-uJc
+mly
oUA
oSt
oSt
@@ -54351,7 +54944,7 @@ oSt
oSt
veA
tsv
-cul
+uFe
bcl
qMF
qMF
@@ -54608,7 +55201,7 @@ oSt
oSt
utV
hLn
-cul
+cQz
ijF
qMF
qMF
@@ -54619,7 +55212,7 @@ cPr
pin
lgh
nHT
-kQi
+xhb
aUb
aUb
aUb
@@ -54628,7 +55221,7 @@ aUb
aUb
bxs
uQb
-kQi
+xhb
ogj
srw
rYr
@@ -54876,7 +55469,7 @@ wiq
dND
lgh
nHT
-kQi
+xhb
uQb
xdd
xdd
@@ -54885,7 +55478,7 @@ xdd
xdd
xdd
uQb
-kQi
+xhb
ogj
srw
nlB
@@ -54903,7 +55496,7 @@ ohc
srw
srw
ubo
-uJc
+tmX
rdY
lIu
oSt
@@ -55142,7 +55735,7 @@ xdd
xdd
xdd
uQb
-kQi
+xhb
ogj
srw
wTR
@@ -55417,7 +56010,7 @@ mzD
mzD
srw
rpv
-uJc
+mly
kDO
lIu
oSt
@@ -55893,7 +56486,7 @@ oSt
oSt
veA
tsv
-lHn
+bKY
aaw
uaU
uaU
@@ -55931,7 +56524,7 @@ mzD
vnA
srw
rpv
-uJc
+mly
oUA
lIu
oSt
@@ -56188,7 +56781,7 @@ srw
srw
srw
rpv
-uJc
+mly
rdY
lIu
oSt
@@ -56407,7 +57000,7 @@ oSt
oSt
veA
hLn
-lHn
+vnt
arl
uaU
uaU
@@ -57435,7 +58028,7 @@ oSt
oSt
pvP
tsv
-nxF
+lmV
pXi
xzN
xzN
@@ -57692,7 +58285,7 @@ jUO
gAS
bwx
hLn
-nxF
+tqp
aDi
xzN
xzN
@@ -57932,10 +58525,10 @@ uPJ
wfr
wfr
wfr
-uPJ
+sZc
tlW
dXN
-uPJ
+gwp
wfr
rqB
gjs
@@ -58169,7 +58762,7 @@ wjH
nbb
sUg
gTZ
-lWQ
+wEb
lWQ
lWQ
wfr
@@ -58682,7 +59275,7 @@ kev
tdJ
sUg
sUg
-ext
+wxF
xAM
ijb
xAM
@@ -58941,7 +59534,7 @@ nbb
sUg
gTZ
lWQ
-lWQ
+vfy
lWQ
wfr
omS
@@ -59009,7 +59602,7 @@ xdd
xdd
xdd
uQb
-cGI
+bmq
nYS
nYS
hlV
@@ -59510,7 +60103,7 @@ uJc
fgt
fgt
uJc
-uJc
+mly
uJc
uJc
fgt
@@ -59771,7 +60364,7 @@ gpb
wby
wby
mzj
-uJc
+mOU
oSt
oSt
oSt
@@ -60288,10 +60881,10 @@ fSJ
fgt
uJc
uJc
-uJc
+mly
fgt
uJc
-uJc
+ruQ
uJc
fgt
fgt
@@ -60517,8 +61110,8 @@ oSt
oSt
lIu
asj
-iVJ
-xTE
+lBU
+gAM
xTE
shq
ulC
@@ -60558,7 +61151,7 @@ uBc
iOr
iOr
lQy
-lQy
+wjP
lQy
iOr
div
@@ -60566,9 +61159,9 @@ tUT
kzw
iOr
lQy
+mtT
lQy
-lQy
-lQy
+xAy
iOr
tLR
xDt
@@ -60774,8 +61367,8 @@ oSt
oSt
lIu
asj
-iVJ
-xTE
+rwZ
+gAM
xTE
xTE
xTE
@@ -61008,7 +61601,7 @@ ouM
hXW
osf
osf
-osf
+iIs
osf
osf
osf
@@ -61020,7 +61613,7 @@ waL
ezk
ezk
dek
-tKo
+lOF
gxb
oSt
oSt
@@ -61259,7 +61852,7 @@ oSt
lIu
lIu
asj
-osf
+iZO
oGz
iNL
iUS
@@ -61343,7 +61936,7 @@ qDN
pES
pES
jFJ
-lQy
+xAy
asj
fcA
lIu
@@ -61528,7 +62121,7 @@ sbw
dEI
kxc
kxc
-tKo
+lOF
kxc
bqz
ezk
@@ -61537,7 +62130,7 @@ mhP
kxc
kxc
tKo
-tKo
+tyw
tKo
asj
oSt
@@ -61553,9 +62146,9 @@ aLD
aLD
aQy
dwA
+wKj
esl
-esl
-esl
+cLq
esl
dwA
ilE
@@ -61773,7 +62366,7 @@ tVt
tVt
tVt
tVt
-iUS
+eov
knB
kyu
iUS
@@ -61857,7 +62450,7 @@ iOr
sAV
pES
jFJ
-lQy
+xAy
asj
fcA
lIu
@@ -62052,7 +62645,7 @@ hof
sTR
rSA
uha
-tKo
+ekI
lIu
oSt
oSt
@@ -62588,11 +63181,11 @@ nhW
nhW
cOM
dwA
-esl
-esl
+kJI
+wKj
dwA
esl
-esl
+cLq
esl
dwA
ePu
@@ -62611,7 +63204,7 @@ asj
xiy
nFb
uId
-lQy
+wHk
jJf
tLR
ykB
@@ -62747,7 +63340,7 @@ bUa
xHw
soG
soG
-lAG
+xII
soG
soG
cEJ
@@ -62815,7 +63408,7 @@ kxc
fQJ
hXh
hXh
-kxc
+eKy
qdk
wJF
wJF
@@ -62823,7 +63416,7 @@ ezk
ezk
ezk
xNv
-tKo
+lOF
lIu
oSt
oSt
@@ -62868,7 +63461,7 @@ oSt
oSt
nFb
asj
-lQy
+niT
iKg
nvO
iRT
@@ -62878,10 +63471,10 @@ iOr
iOr
iOr
iOr
-lQy
+xAy
jNh
qcE
-lQy
+mtT
iOr
iOr
iOr
@@ -63125,7 +63718,7 @@ oSt
oSt
slK
asj
-lQy
+vyJ
iKg
iRT
qpQ
@@ -63263,7 +63856,7 @@ aix
ist
feP
feP
-lAG
+jNk
lIu
lIu
soG
@@ -63372,7 +63965,7 @@ qWZ
qWZ
kTu
kTu
-esl
+woD
asj
fcA
apU
@@ -63382,7 +63975,7 @@ iuV
lIu
nFb
asj
-lQy
+vYb
iKg
iRT
qpQ
@@ -63572,7 +64165,7 @@ qNr
vdp
xBF
iUS
-osf
+rUJ
aaU
kFj
iUS
@@ -63598,7 +64191,7 @@ nJz
tKo
kxc
tKo
-tKo
+ldH
tKo
kxc
kxc
@@ -63639,7 +64232,7 @@ oSt
oSt
nFb
asj
-lQy
+wjP
aFo
vvz
dlF
@@ -63778,8 +64371,8 @@ soG
hrO
hrO
soG
-lAG
-lAG
+bsi
+tEp
soG
feP
ist
@@ -63794,7 +64387,7 @@ feP
feP
feP
feP
-uKQ
+fjE
qNr
fvC
qNr
@@ -63851,7 +64444,7 @@ dek
lux
lux
lux
-fxw
+bYt
qAV
sOX
iWb
@@ -63886,7 +64479,7 @@ qWZ
anI
vHO
vHO
-esl
+cLq
asj
fcA
smV
@@ -63896,7 +64489,7 @@ oSt
oSt
nFb
asj
-lQy
+uGw
iKg
sGU
kEk
@@ -64051,7 +64644,7 @@ ist
ist
ist
ist
-iYI
+gyM
cfr
cfr
cfr
@@ -64104,7 +64697,7 @@ xiy
dcJ
cXu
kxc
-kxc
+wvN
qdj
lux
lux
@@ -64129,14 +64722,14 @@ qWZ
qWZ
anI
vHO
-esl
+iPE
wyX
bAB
-nLx
+yja
tUe
fRG
btP
-esl
+kJI
ddz
qWZ
qWZ
@@ -64153,7 +64746,7 @@ iuV
usu
nFb
asj
-lQy
+jkI
iKg
sGU
mfQ
@@ -64161,7 +64754,7 @@ kEk
emS
drh
iOr
-iOr
+jVv
ftS
lzI
gNa
@@ -64317,7 +64910,7 @@ qNr
fzN
qNr
qNr
-uKQ
+fjE
ajf
qNr
qNr
@@ -64365,7 +64958,7 @@ dek
lux
lux
lux
-fxw
+bYt
qAV
sUH
czd
@@ -64386,21 +64979,21 @@ qWZ
qWZ
anI
vHO
-esl
+gby
wyX
bAB
ddf
uBN
oZQ
aaR
-esl
+cLq
eiV
qWZ
qWZ
anI
vHO
vHO
-esl
+woD
asj
fcA
smV
@@ -64410,7 +65003,7 @@ oSt
oSt
nFb
asj
-lQy
+eLs
iKg
sGU
kEk
@@ -64610,7 +65203,7 @@ cOY
rog
aiT
aiT
-cXu
+rPD
shv
mHB
mHB
@@ -64626,7 +65219,7 @@ nJz
kxc
kxc
tKo
-tKo
+qTD
tKo
kxc
kxc
@@ -64657,7 +65250,7 @@ qWZ
anI
vHO
vHO
-esl
+woD
asj
fcA
smV
@@ -64667,7 +65260,7 @@ oSt
oSt
nFb
asj
-lQy
+mtT
aFo
eBi
jOx
@@ -64904,7 +65497,7 @@ mWW
yeg
qWZ
vXu
-ocH
+mqX
nLx
cBs
dwA
@@ -64914,7 +65507,7 @@ qWZ
qWZ
kRt
kRt
-esl
+kJI
asj
fcA
apU
@@ -64924,7 +65517,7 @@ iuV
lIu
nFb
asj
-lQy
+vYb
iKg
afh
qpQ
@@ -65181,7 +65774,7 @@ oSt
oSt
slK
asj
-lQy
+vyJ
iKg
blU
qpQ
@@ -65316,7 +65909,7 @@ pfD
pfD
pfD
pzV
-gpx
+dhl
mOE
feP
ist
@@ -65381,7 +65974,7 @@ iKO
qRy
fbA
iUS
-kxc
+lRU
oBd
nXh
nXh
@@ -65438,7 +66031,7 @@ oSt
oSt
nFb
asj
-lQy
+niT
iKg
nvO
iRT
@@ -65448,10 +66041,10 @@ iOr
iOr
iOr
iOr
-lQy
+mtT
jNh
oES
-lQy
+wjP
iOr
iOr
iOr
@@ -65573,7 +66166,7 @@ aMX
pfD
pfD
pzV
-gpx
+gIP
mOE
feP
feP
@@ -65673,11 +66266,11 @@ tXV
tXV
vZG
esl
-esl
+cLq
dwA
+woD
esl
-esl
-esl
+wKj
dwA
eoi
ohX
@@ -65695,7 +66288,7 @@ asj
xiy
nFb
uId
-lQy
+wHk
mIG
tLR
wLs
@@ -65947,8 +66540,8 @@ eWm
eWm
dwA
dwA
-esl
-esl
+woD
+wKj
dwA
dwA
dwA
@@ -66173,11 +66766,11 @@ oSt
oSt
asj
oXd
-oXd
+irY
oXd
vZG
oXd
-oXd
+svf
vZG
vZG
gHb
@@ -66226,7 +66819,7 @@ eZS
aCV
pES
jFJ
-lQy
+wjP
asj
fdx
lIu
@@ -66420,7 +67013,7 @@ kxc
kxc
kxc
nJz
-kxc
+eKy
uEI
uEI
kxc
@@ -66459,7 +67052,7 @@ wzV
mOa
tnF
tnF
-qWZ
+iMU
srP
qWZ
qWZ
@@ -66707,9 +67300,9 @@ fAT
mds
sZI
dwA
+woD
esl
-esl
-esl
+wKj
dwA
dwA
xLj
@@ -66943,7 +67536,7 @@ oSt
oSt
oSt
oSt
-oXd
+svf
cby
efG
ddC
@@ -66960,9 +67553,9 @@ vRj
sPq
oZo
dwA
+cLq
esl
-esl
-esl
+wKj
dwA
icW
fTa
@@ -66970,9 +67563,9 @@ wFX
cLJ
dwA
esl
+kJI
esl
-esl
-esl
+wKj
mWW
dwA
cco
@@ -67194,7 +67787,7 @@ vPu
vPu
iiU
igL
-tKo
+lOF
lIu
oSt
oSt
@@ -67211,7 +67804,7 @@ qfG
hrf
uXl
chu
-wKP
+lDr
vZG
ttj
sPq
@@ -67432,11 +68025,11 @@ tyZ
jMA
hXW
iUS
+iZO
osf
osf
osf
-osf
-osf
+rUJ
kxc
lpq
gMA
@@ -67457,7 +68050,7 @@ wSm
wSm
wSm
wSm
-oXd
+ldg
cby
efG
sYw
@@ -67468,12 +68061,12 @@ bgk
mge
uXl
chu
-wKP
+hsp
vZG
oRK
sPq
sPq
-iTH
+mYw
uby
uby
uby
@@ -67511,7 +68104,7 @@ rUT
rUT
pES
jFJ
-lQy
+xAy
asj
fcA
lIu
@@ -67708,7 +68301,7 @@ vPu
vPu
iiU
igL
-tKo
+wXX
asj
lIu
lIu
@@ -67753,17 +68346,17 @@ qhR
cKw
iOr
iOr
-lQy
-lQy
+mtT
+cVx
lQy
iOr
pES
pES
kzw
iOr
-lQy
-lQy
-lQy
+xAy
+wjP
+xAy
lQy
iOr
tLR
@@ -67919,7 +68512,7 @@ jlw
hUO
onn
onn
-onn
+mJT
dMa
qQP
cLb
@@ -67996,13 +68589,13 @@ cpr
cpr
cpr
dqM
+mNe
+nFd
+bjC
nFd
nFd
nFd
-nFd
-nFd
-nFd
-nFd
+qaO
nFd
dqM
aoM
@@ -68216,8 +68809,8 @@ dJt
gHs
tKo
tKo
-tKo
-tKo
+wXX
+tyw
tKo
kxc
sxE
@@ -68229,11 +68822,11 @@ oSt
oSt
asj
oXd
+eig
oXd
oXd
oXd
-oXd
-oXd
+ldg
vZG
uvG
fCr
@@ -68465,13 +69058,13 @@ lIu
oSt
oSt
gxb
-tKo
+lOF
cGU
lux
lux
lux
lux
-tKo
+ekI
lIu
oSt
oSt
@@ -68947,7 +69540,7 @@ qQP
hUO
onn
onn
-onn
+mJT
akd
qQP
vuG
@@ -68980,11 +69573,11 @@ asj
oSt
lIu
tKo
+wXX
tKo
+ekI
tKo
-tKo
-tKo
-tKo
+tyw
tKo
lIu
oSt
@@ -69222,7 +69815,7 @@ nLU
sVV
omf
omf
-omf
+efZ
soC
ojt
xAz
@@ -69531,13 +70124,13 @@ ska
ska
ska
ska
-awo
+vPg
ska
ska
tpw
bxB
bxB
-xER
+fdQ
nWh
nWh
nWh
@@ -69794,7 +70387,7 @@ nJS
bxB
bxB
bxB
-aoM
+uuh
nWh
nWh
nWh
@@ -69992,7 +70585,7 @@ klL
nLU
sVV
omf
-omf
+vlX
omf
soC
jRv
@@ -70273,7 +70866,7 @@ oSt
oSt
oSt
gxb
-mUi
+wUH
nOZ
nOZ
nOZ
@@ -70530,7 +71123,7 @@ oSt
asj
asj
asj
-soC
+pVP
egJ
egJ
egJ
@@ -71036,11 +71629,11 @@ kRc
faM
soC
mUi
-mUi
+jRf
soC
uWs
mUi
-mUi
+wdk
soC
eDK
kRc
@@ -71284,7 +71877,7 @@ aBo
ehQ
vEp
asj
-mUi
+wUH
fpz
kRc
kRc
@@ -71548,7 +72141,7 @@ mmt
kRc
kRc
kRc
-egJ
+lYD
kRc
kRc
kRc
@@ -71805,7 +72398,7 @@ uJY
kRc
kRc
oeV
-soC
+pVP
mmt
adm
adm
@@ -73132,7 +73725,7 @@ vfd
xlm
iuH
nDc
-oOq
+dZa
wSN
kTh
vlW
@@ -73389,7 +73982,7 @@ hqW
hKj
tVX
nDc
-oOq
+jsz
wSN
uEV
vlW
@@ -73646,7 +74239,7 @@ vWW
wqI
rkC
nDc
-oOq
+jsz
wSN
kTh
pFI
@@ -74141,7 +74734,7 @@ nnD
hFF
tDB
kTh
-oOq
+dZa
mOC
mOC
mOC
@@ -74912,7 +75505,7 @@ cWB
hFF
tDB
nBK
-oOq
+ucW
jqa
jqa
jqa
@@ -74931,7 +75524,7 @@ jqa
wqI
tVX
nDc
-oOq
+jsz
wSN
eAi
paM
@@ -76200,20 +76793,20 @@ kTh
kTh
sjz
sjz
+dZa
oOq
-oOq
-oOq
+ucW
juG
-oOq
+ucW
oOq
oOq
sjz
-oOq
-oOq
+ucW
+dZa
oOq
juG
oOq
-oOq
+dZa
oOq
sjz
sjz