Skip to content

Commit

Permalink
Merge pull request #2 from animusdev/master
Browse files Browse the repository at this point in the history
Мерж
  • Loading branch information
kreeperHLC authored Feb 8, 2018
2 parents 04e67f7 + 69127b1 commit 60f97ca
Show file tree
Hide file tree
Showing 34 changed files with 1,367 additions and 85 deletions.
4 changes: 4 additions & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@
#include "code\game\gamemodes\events\holidays\Christmas.dm"
#include "code\game\gamemodes\events\holidays\Holidays.dm"
#include "code\game\gamemodes\events\holidays\Other.dm"
#include "code\game\gamemodes\events\holidays\valentine.dm"
#include "code\game\gamemodes\extended\extended.dm"
#include "code\game\gamemodes\heist\heist.dm"
#include "code\game\gamemodes\malfunction\malf_hardware.dm"
Expand Down Expand Up @@ -820,6 +821,7 @@
#include "code\game\objects\structures\ladders.dm"
#include "code\game\objects\structures\lamarr_cage.dm"
#include "code\game\objects\structures\lattice.dm"
#include "code\game\objects\structures\loot_piles.dm"
#include "code\game\objects\structures\magnetic_coil.dm"
#include "code\game\objects\structures\mirror.dm"
#include "code\game\objects\structures\mop_bucket.dm"
Expand Down Expand Up @@ -1771,8 +1773,10 @@
#include "code\modules\security levels\security levels.dm"
#include "code\modules\shieldgen\emergency_shield.dm"
#include "code\modules\shieldgen\energy_field.dm"
#include "code\modules\shieldgen\handheld_defuser.dm"
#include "code\modules\shieldgen\sheldwallgen.dm"
#include "code\modules\shieldgen\shield_capacitor.dm"
#include "code\modules\shieldgen\shield_diffuser.dm"
#include "code\modules\shieldgen\shield_gen.dm"
#include "code\modules\shieldgen\shield_gen_external.dm"
#include "code\modules\shuttles\antagonist.dm"
Expand Down
88 changes: 88 additions & 0 deletions code/game/gamemodes/events/holidays/valentine.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/obj/item/valentine
name = "valentine"
desc = "A Valentine's card! Wonder what it says..."
icon = 'icons/obj/toy.dmi'
icon_state = "valentine"
var/message = "A generic message of love or whatever."

/obj/item/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.",
"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 heart?",
"Call me the doctor, because I'm here to inspect your johnson.",
"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 / 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.",
"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.",
"Someone check the gravitational generator, because I'm only attracted to you.",
"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.",
"If you were a taser, you'd be set to stunning.",
"Do you have stamina damage from running through my dreams?",
"If I were an alien, would you let me hug you?",
"My love for you is stronger than a reinforced wall.",
"This must be the captain's office, because I see a fox.",
"I'm not a highlander, but there can only be one for me.",
"The floor is made of lava! Quick, get on my bed.",
"If you were an abandoned station you'd be the DEARelict.",
"If you had a pickaxe you'd be a shaft FINEr.",
"Roses are red, tide is gray, if I were an assistant I'd steal you away.",
"Roses are red, text is green, I love you more than cleanbots clean.",
"If you were a carp I'd fi-lay you.",
"I'm a nuke op, and my pinpointer leads to your heart.",
"Wanna slay my megafauna?",
"I'm a clockwork cultist. Or zl inyragvar.",
"If you were a disposal bin I'd ride you all day.",
"Put on your explorer's suit because I'm taking you to LOVEaland.",
"I must be the CMO, 'cause I saw you on my CUTE sensors.",
"You're the vomit to my flyperson.",
"You must be liquid dark matter, because you're pulling me closer.",
"Not even sorium can drive me away from you.",
"Wanna make like a borg and do some heavy petting?",
"Are you powering the station? Because you super matter to me.",
"I wish science could make me a bag of holding you.",
"Let's call the emergency CUDDLE.",
"I must be tripping on BZ, because I saw an angel walk by.",
"Wanna empty out my tool storage?",
"Did you visit the medbay after you fell from heaven?",
"Are you wearing space pants? Wanna not be?" )

/obj/item/valentine/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/effect/decal/cleanable/crayon))
var/recipient = input(user, "Who is receiving this valentine?", "To:", null, null)
var/sender = input(user, "Who is sending this valentine?", "From:", null , null)
if(recipient && sender)
name = "valentine - To: [recipient] From: [sender]"

/obj/item/valentine/examine(mob/user)
if(in_range(user, src) || isobserver(user))
if( !(ishuman(user) || isobserver(user) || issilicon(user)) )
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(message)]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[message]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
to_chat(user, "<span class='notice'>It is too far away.</span>")

/obj/item/valentine/attack_self(mob/user)
user.examinate(src)
4 changes: 4 additions & 0 deletions code/game/jobs/job/assistant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
ear = /obj/item/device/radio/headset
shoes = /obj/item/clothing/shoes/black

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!H) return 0
if (H.mind && H.mind.role_alt_title)
Expand Down
6 changes: 4 additions & 2 deletions code/game/jobs/job/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
dufflebag = /obj/item/storage/backpack/dufflebag/cap

put_in_backpack = list(
/obj/item/storage/box/ids
/obj/item/storage/box/ids,
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
Expand Down Expand Up @@ -78,7 +79,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
put_in_backpack = list(
/obj/item/storage/box/ids,
/obj/item/weapon/a_gift,
/obj/item/clothing/head/santa
/obj/item/clothing/head/santa,
/obj/item/valentine
)

minimal_access = list(
Expand Down
33 changes: 28 additions & 5 deletions code/game/jobs/job/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
suit = /obj/item/clothing/suit/storage/vest
ear = /obj/item/device/radio/headset/service

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!..()) return 0
var/obj/item/storage/box/survival/Barpack = null
Expand Down Expand Up @@ -64,6 +68,10 @@
suit = /obj/item/clothing/suit/chef
ear = /obj/item/device/radio/headset/service

put_in_backpack = list(
/obj/item/valentine
)

/datum/job/hydro
title = "Gardener"
flag = BOTANIST
Expand All @@ -89,7 +97,8 @@
messenger = /obj/item/storage/backpack/messenger/hyd

put_in_backpack = list(
/obj/item/device/analyzer/plant_analyzer
/obj/item/device/analyzer/plant_analyzer,
/obj/item/valentine
)


Expand Down Expand Up @@ -117,7 +126,9 @@
hand = /obj/item/weapon/clipboard
glasses = /obj/item/clothing/glasses/sunglasses


put_in_backpack = list(
/obj/item/valentine
)

/datum/job/cargo_tech
title = "Cargo Technician"
Expand All @@ -136,6 +147,9 @@
pda = /obj/item/device/pda/cargo
ear = /obj/item/device/radio/headset/cargo

put_in_backpack = list(
/obj/item/valentine
)

/datum/job/mining
title = "Shaft Miner"
Expand All @@ -157,7 +171,8 @@

put_in_backpack = list(
/obj/item/weapon/crowbar,
/obj/item/storage/bag/ore
/obj/item/storage/bag/ore,
/obj/item/valentine
)

/datum/job/janitor
Expand All @@ -178,7 +193,9 @@
pda = /obj/item/device/pda/janitor
ear = /obj/item/device/radio/headset/service


put_in_backpack = list(
/obj/item/valentine
)

//More or less assistants
/datum/job/librarian
Expand All @@ -199,7 +216,9 @@
pda = /obj/item/device/pda/librarian
hand = /obj/item/weapon/barcodescanner


put_in_backpack = list(
/obj/item/valentine
)

/datum/job/lawyer
title = "Internal Affairs Agent"
Expand All @@ -222,3 +241,7 @@
ear = /obj/item/device/radio/headset/ia
hand = /obj/item/storage/briefcase
glasses = /obj/item/clothing/glasses/sunglasses/big

put_in_backpack = list(
/obj/item/valentine
)
4 changes: 4 additions & 0 deletions code/game/jobs/job/civilian_chaplain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
uniform = /obj/item/clothing/under/rank/chaplain
pda = /obj/item/device/pda/chaplain

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!..()) return 0

Expand Down
16 changes: 12 additions & 4 deletions code/game/jobs/job/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
dufflebag = /obj/item/storage/backpack/dufflebag/eng
messenger = /obj/item/storage/backpack/messenger/eng



put_in_backpack = list(
/obj/item/valentine
)

/datum/job/engi/chief_engineer
title = "Chief Engineer"
Expand Down Expand Up @@ -48,7 +49,9 @@
belt = /obj/item/storage/belt/utility/full
ear = /obj/item/device/radio/headset/heads/ce


put_in_backpack = list(
/obj/item/valentine
)

/datum/job/engi/engineer
title = "Station Engineer"
Expand All @@ -70,7 +73,8 @@
belt = /obj/item/storage/belt/utility/full

put_in_backpack = list(
/obj/item/device/t_scanner
/obj/item/device/t_scanner,
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
Expand Down Expand Up @@ -105,3 +109,7 @@
uniform = /obj/item/clothing/under/rank/atmospheric_technician
pda = /obj/item/device/pda/atmos
belt = /obj/item/storage/belt/utility/atmostech

put_in_backpack = list(
/obj/item/valentine
)
25 changes: 25 additions & 0 deletions code/game/jobs/job/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
dufflebag = /obj/item/storage/backpack/dufflebag/med
messenger = /obj/item/storage/backpack/messenger/med

put_in_backpack = list(
/obj/item/valentine
)

/datum/job/medical/cmo
title = "Chief Medical Officer"
Expand Down Expand Up @@ -45,6 +48,9 @@
ear = /obj/item/device/radio/headset/heads/cmo
hand = /obj/item/storage/firstaid/adv

put_in_backpack = list(
/obj/item/valentine
)

/datum/job/medical/doctor
title = "Medical Doctor"
Expand All @@ -63,6 +69,10 @@
suit_store = /obj/item/device/flashlight/pen
hand = /obj/item/storage/firstaid/adv

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!H) return 0
if (H.mind && H.mind.role_alt_title)
Expand Down Expand Up @@ -126,6 +136,10 @@
dufflebag = /obj/item/storage/backpack/dufflebag/med
messenger = /obj/item/storage/backpack/messenger/chem

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!H) return 0
if (H.mind && H.mind.role_alt_title)
Expand Down Expand Up @@ -156,6 +170,9 @@
dufflebag = /obj/item/storage/backpack/dufflebag/med
messenger = /obj/item/storage/backpack/messenger/med

put_in_backpack = list(
/obj/item/valentine
)

/datum/job/medical/psychiatrist
title = "Psychiatrist"
Expand All @@ -173,6 +190,10 @@
suit = /obj/item/clothing/suit/storage/toggle/labcoat
suit_store = null

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!H) return 0
if (H.mind && H.mind.role_alt_title)
Expand Down Expand Up @@ -210,6 +231,10 @@
dufflebag = /obj/item/storage/backpack/dufflebag/emt
messenger = /obj/item/storage/backpack/messenger/emt

put_in_backpack = list(
/obj/item/valentine
)

equip(var/mob/living/carbon/human/H)
if(!H) return 0
if (H.mind && H.mind.role_alt_title)
Expand Down
Loading

0 comments on commit 60f97ca

Please sign in to comment.