From dff9a1d3b7f83c8bc2ffd4f432cdfa6fa5f65cd7 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sun, 27 Dec 2015 16:40:09 -0500 Subject: [PATCH 1/6] Adds valentines and candy hearts for Valentine's Day. --- code/modules/events/holiday/vday.dm | 68 ++++++++++++++++++++++++++++ icons/obj/holiday_misc.dmi | Bin 0 -> 288 bytes tgstation.dme | 1 + 3 files changed, 69 insertions(+) create mode 100644 code/modules/events/holiday/vday.dm create mode 100644 icons/obj/holiday_misc.dmi diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm new file mode 100644 index 00000000000..76c927d1d41 --- /dev/null +++ b/code/modules/events/holiday/vday.dm @@ -0,0 +1,68 @@ +// Valentine's Day events // +// why are you playing spessmens on valentine's day you wizard // + + +// valentine / candy heart distribution // + +/datum/round_event_control/valentines + name = "Valentines!" + holidayID = VALENTINES + typepath = /datum/round_event/valentines + weight = -1 //forces it to be called, regardless of weight + max_occurrences = 1 + earliest_start = 0 + +/datum/round_event/valentines/start() + ..() + for(var/mob/living/carbon/human/H in mob_list) + H.put_in_hands(new /obj/item/weapon/valentine) + var/obj/item/weapon/storage/backpack/b = locate() in H.contents + new /obj/item/weapon/reagent_containers/food/snacks/candyheart(b) + +/datum/round_event/valentines/announce() + priority_announce("It's Valentine's Day! Give a valentine to that special someone!") + +/obj/item/weapon/valentine + name = "valentine" + desc = "A Valentine's card! Wonder what it says..." + icon = 'icons/obj/toy.dmi' + icon_state = "sc_Ace of Hearts_syndicate" // shut up + var/message = "A generic message of love or whatever." + burn_state = FLAMMABLE + w_class = 1 + +/obj/item/weapon/valentine/New() + ..() + message = pick("Roses are red / Violets are good / One day while Andy...", + "My love for you is like the singularity. It cannot be contained.", + "Will you be my lusty xenomorph maid?", + "We go together like the clown and the external airlock.", + "Roses are red, liches are wizards, I love you more than a whole squad of lizards.", + "Be my valentine. Law 2.", + "You must be a mime, because you leave me speechless.", + "We make a better couple than Ian and the HoP." + "You're hotter than a plasma fire in toxins.") + +/obj/item/weapon/valentine/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon)) + var/recipient = stripped_input(user, "Who is receiving this valentine?", "To:", null , 20) + var/sender = stripped_input(user, "Who is sending this valentine?", "From:", null , 20) + if(recipient && sender) + name = "valentine - To: [recipient] From [sender]" + ..() + +/obj/item/weapon/reagent_containers/food/snacks/candyheart + name = "candy heart" + icon = 'icons/obj/holiday_misc.dmi' + icon_state = "candyheart" + desc = "A heart-shaped candy that reads: " + list_reagents = list("sugar" = 4) + junkiness = 5 + +/obj/item/weapon/valentine/New() + ..() + desc = pick("A heart-shaped candy that reads: HONK ME", + "A heart-shaped candy that reads: ERP", + "A heart-shaped candy that reads: LEWD", + "A heart-shaped candy that reads: LUSTY", + "A heart-shaped candy that reads: SPESS LOVE") \ No newline at end of file diff --git a/icons/obj/holiday_misc.dmi b/icons/obj/holiday_misc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b9bffa6231984e01dfa314f4478df61684a8d08c GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*oQ~g6>=7`>Go#fr z_!@plUEfIQR0$XoLrPyP?DLS$G}iACpfI2 zsPy}n;DV1|pJ;jOYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;j zYg!uWFEvs&-MGS~v)fp8^9l)#j1xy^hE160@`fj z>EaloF)=wo;#EVSBWI|?%@YxfGtWQK(0b9Pb3kq03_TzgTe~DWM4fi{@+i literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 3822e2fec1f..e38bc50aa90 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1028,6 +1028,7 @@ #include "code\modules\events\vent_clog.dm" #include "code\modules\events\wormholes.dm" #include "code\modules\events\holiday\halloween.dm" +#include "code\modules\events\holiday\vday.dm" #include "code\modules\events\holiday\xmas.dm" #include "code\modules\events\wizard\aid.dm" #include "code\modules\events\wizard\blobies.dm" From 1feff7ac81851996cab9f9227e60ef6879a08b89 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sun, 27 Dec 2015 17:27:07 -0500 Subject: [PATCH 2/6] MORE MESSAGES --- code/modules/events/holiday/vday.dm | 33 +++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 76c927d1d41..266b308a17b 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -37,11 +37,27 @@ "My love for you is like the singularity. It cannot be contained.", "Will you be my lusty xenomorph maid?", "We go together like the clown and the external airlock.", - "Roses are red, liches are wizards, I love you more than a whole squad of lizards.", + "Roses are red / Liches are wizards / I love you more than a whole squad of lizards.", "Be my valentine. Law 2.", "You must be a mime, because you leave me speechless.", - "We make a better couple than Ian and the HoP." - "You're hotter than a plasma fire in toxins.") + "I love you like Ian loves the HoP.", + "You're hotter than a plasma fire in toxins.", + "Are you a rogue atmos tech? Because you're taking my breath away.", + "Could I have all access... to your jumpsuit?", + "Call me the CMO, because I'm here to inspect your johnson.", + "Space is black. So is CO2. Be my Valentine. What the fuck is CO2?", + "I'm not a changeling, but you make me extend my proboscis.", + "I just can't get EI NATH of you.", + "You must be a nuke op, because you make my heart explode.", + "Roses are red / Botany's a farm / Not being my Valentine / causes human harm.", + "I want you more than an assistant wants gloves.", + "If I was a security officer, I'd brig you all shift.", + "You know what you wanna do, right? You wanna put a banging donk in me.", + "Are you the janitor? Because I think I've fallen for you.", + "You're always valid to my heart.", + "I'd risk the wrath of the gods to bwoink you.", + "You look as beautiful now as the last time you were cloned.", + ) /obj/item/weapon/valentine/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon)) @@ -65,4 +81,13 @@ "A heart-shaped candy that reads: ERP", "A heart-shaped candy that reads: LEWD", "A heart-shaped candy that reads: LUSTY", - "A heart-shaped candy that reads: SPESS LOVE") \ No newline at end of file + "A heart-shaped candy that reads: SPESS LOVE" + "A heart-shaped candy that reads: AYY LMAO", + "A heart-shaped candy that reads: TABLE ME", + "A heart-shaped candy that reads: HAND CUFFS", + "A heart-shaped candy that reads: SHAFT MINER", + "A heart-shaped candy that reads: BANGING DONK", + "A heart-shaped candy that reads: Y-YOU T-TOO", + "A heart-shaped candy that reads: GOT WOOD", + "A heart-shaped candy that reads: MEMES", + "A heart-shaped candy that reads: MURDER BONER") \ No newline at end of file From 60e533d21eae377ae65e6386540486f76468d198 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 28 Dec 2015 12:46:14 -0500 Subject: [PATCH 3/6] fewer memes so sad :( --- code/modules/events/holiday/vday.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 266b308a17b..e1dc1740897 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -43,20 +43,21 @@ "I love you like Ian loves the HoP.", "You're hotter than a plasma fire in toxins.", "Are you a rogue atmos tech? Because you're taking my breath away.", - "Could I have all access... to your jumpsuit?", + "Could I have all access... to your heart?", "Call me the CMO, because I'm here to inspect your johnson.", - "Space is black. So is CO2. Be my Valentine. What the fuck is CO2?", "I'm not a changeling, but you make me extend my proboscis.", "I just can't get EI NATH of you.", "You must be a nuke op, because you make my heart explode.", - "Roses are red / Botany's a farm / Not being my Valentine / causes human harm.", - "I want you more than an assistant wants gloves.", + "Roses are red / Chickens live on farms / Not being my Valentine / causes human harm.", + "I want you more than an assistant wants insulated gloves.", "If I was a security officer, I'd brig you all shift.", - "You know what you wanna do, right? You wanna put a banging donk in me.", "Are you the janitor? Because I think I've fallen for you.", "You're always valid to my heart.", "I'd risk the wrath of the gods to bwoink you.", "You look as beautiful now as the last time you were cloned.", + "Your love is more valuable than raw plasma ore.", + "Someone check the gravitational generator, because I'm only attracted to you.", + "If I were the warden I'd alwasys let you into my armory." ) /obj/item/weapon/valentine/attackby(obj/item/weapon/W, mob/user, params) @@ -75,7 +76,7 @@ list_reagents = list("sugar" = 4) junkiness = 5 -/obj/item/weapon/valentine/New() +/obj/item/weapon/reagent_containers/food/snacks/candyheart/New() ..() desc = pick("A heart-shaped candy that reads: HONK ME", "A heart-shaped candy that reads: ERP", @@ -89,5 +90,5 @@ "A heart-shaped candy that reads: BANGING DONK", "A heart-shaped candy that reads: Y-YOU T-TOO", "A heart-shaped candy that reads: GOT WOOD", - "A heart-shaped candy that reads: MEMES", - "A heart-shaped candy that reads: MURDER BONER") \ No newline at end of file + "A heart-shaped candy that reads: TFW NO GF", + "A heart-shaped candy that reads: WAG MY TAIL") \ No newline at end of file From caf002c4cfa9133ea96dc30a223ec9f1df5c4cfa Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 28 Dec 2015 13:39:47 -0500 Subject: [PATCH 4/6] fixes travis, even more valentimes --- code/modules/events/holiday/vday.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index e1dc1740897..235218dbfcf 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -57,8 +57,11 @@ "You look as beautiful now as the last time you were cloned.", "Your love is more valuable than raw plasma ore.", "Someone check the gravitational generator, because I'm only attracted to you.", - "If I were the warden I'd alwasys let you into my armory." - ) + "If I were the warden I'd always let you into my armory.", + "The virologist is rogue, and the only cure is a kiss from you.", + "Would you spend some time in my upgraded sleeper?", + "You must be a silicon, because you've unbolted my heart." + "Are you Nar-Sie? Because there's nar-one else I sie." ) /obj/item/weapon/valentine/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon)) From cdd5be39beaaffadf8c289538c7e0fa7ca14b77e Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 28 Dec 2015 13:52:34 -0500 Subject: [PATCH 5/6] valentines are actually examinable honk --- code/modules/events/holiday/vday.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 235218dbfcf..c26ce6e13ed 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -71,6 +71,20 @@ name = "valentine - To: [recipient] From [sender]" ..() +/obj/item/weapon/valentine/examine(mob/user) + if(in_range(user, src) || isobserver(user)) + if( !(ishuman(user) || isobserver(user) || issilicon(user)) ) + user << browse("[name][stars(message)]", "window=[name]") + onclose(user, "[name]") + else + user << browse("[name][message]", "window=[name]") + onclose(user, "[name]") + else + user << "It is too far away." + +/obj/item/weapon/valentine/attack_self(mob/user) + user.examinate(src) + /obj/item/weapon/reagent_containers/food/snacks/candyheart name = "candy heart" icon = 'icons/obj/holiday_misc.dmi' From 0a1a30f2a9d4b2783210ca0be48af5d10a211ac4 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Fri, 29 Jan 2016 20:30:46 -0500 Subject: [PATCH 6/6] fixes razharas's dank meme --- code/modules/events/holiday/vday.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index c26ce6e13ed..41a971d29c6 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -45,10 +45,10 @@ "Are you a rogue atmos tech? Because you're taking my breath away.", "Could I have all access... to your heart?", "Call me the CMO, because I'm here to inspect your johnson.", - "I'm not a changeling, but you make me extend my proboscis.", + "I'm not a changeling, but you make my proboscis extend.", "I just can't get EI NATH of you.", "You must be a nuke op, because you make my heart explode.", - "Roses are red / Chickens live on farms / Not being my Valentine / causes human harm.", + "Roses are red / Botany is a farm / Not being my Valentine / causes human harm.", "I want you more than an assistant wants insulated gloves.", "If I was a security officer, I'd brig you all shift.", "Are you the janitor? Because I think I've fallen for you.",