mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 04:22:39 +01:00
Twice Upon A Time (#15419)
This commit is contained in:
KingOfThePing
+1
-1
@@ -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"
|
||||
|
||||
@@ -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("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")
|
||||
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<i>'Is it me or can you smell carrots?'</i>",
|
||||
"Why couldn't the snowman get laid?\n\n<i>He was frigid!</i>",
|
||||
"Where are santa's helpers educated?\n\n<i>Nowhere, they're ELF-taught.</i>",
|
||||
"What happened to the man who stole advent calanders?\n\n<i>He got 25 days.</i>",
|
||||
"What does Santa get when he gets stuck in a chimney?\n\n<i>Claus-trophobia.</i>",
|
||||
"Where do you find chili beans?\n\n<i>The north pole.</i>",
|
||||
"What do you get from eating tree decorations?\n\n<i>Tinsilitis!</i>",
|
||||
"What do snowmen wear on their heads?\n\n<i>Ice caps!</i>",
|
||||
"Why is Christmas just like life in NanoTrasen?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
|
||||
"Why doesn't Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
|
||||
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"
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
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."
|
||||
|
||||
+150
-11
@@ -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("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")
|
||||
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<i>'Is it me or can you smell carrots?'</i>",
|
||||
"Why couldn't the snowman get laid?\n\n<i>He was frigid!</i>",
|
||||
"Where are santa's helpers educated?\n\n<i>Nowhere, they're ELF-taught.</i>",
|
||||
"What happened to the man who stole advent calanders?\n\n<i>He got 25 days.</i>",
|
||||
"What does Santa get when he gets stuck in a chimney?\n\n<i>Claus-trophobia.</i>",
|
||||
"Where do you find chili beans?\n\n<i>The north pole.</i>",
|
||||
"What do you get from eating tree decorations?\n\n<i>Tinsilitis!</i>",
|
||||
"What do snowmen wear on their heads?\n\n<i>Ice caps!</i>",
|
||||
"Why is Christmas just like life in NanoTrasen?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
|
||||
"Why doesn't Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
|
||||
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"
|
||||
@@ -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."
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 9.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 59 KiB |
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user