diff --git a/baystation12.dme b/baystation12.dme index ec152e6857..57a993230e 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -35,6 +35,7 @@ #define FILE_DIR "icons/Testing" #define FILE_DIR "icons/turf" #define FILE_DIR "icons/vending_icons" +#define FILE_DIR "icons/xenoarch_icons" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm index 8caf519dff..e600cbc037 100644 --- a/code/modules/events/money_spam.dm +++ b/code/modules/events/money_spam.dm @@ -36,7 +36,7 @@ var/sender var/message - switch(pick(1,2,3,4,5)) + switch(pick(1,2,3,4,5,6)) if(1) sender = pick("MaxBet","MaxBet Online Casino","There is no better time to register","I'm excited for you to join us") message = pick("Triple deposits are waiting for you at MaxBet Online when you register to play with us.",\ @@ -73,6 +73,12 @@ "Dear fund beneficiary, We have please to inform you that overdue funds payment has finally been approved and released for payment",\ "Due to my lack of agents I require an off-world financial account to immediately deposit the sum of 1 POINT FIVE MILLION credits.",\ "Greetings sir, I regretfully to inform you that as I lay dying here due to my lack ofheirs I have chosen you to recieve the full sum of my lifetime savings of 1.5 billion credits") + if(6) + sender = pick("NanoTrasen Morale Divison","Feeling Lonely?","Bored?","www.wetskrell.nt") + message = pick("The NanoTrasen Morale Division wishes to provide you with quality entertainment sites.",\ + "WetSkrell.nt is a xenophillic website endorsed by NT for the use of male crewmembers among it's many stations and outposts.",\ + "Wetskrell.nt only provides the higest quality of male entertaiment to NanoTrasen Employees.",\ + "Simply enter your NanoTrasen Bank account system number and pin. With three easy steps this service could be yours!") useMS.send_pda_message("[P.owner]", sender, message) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index dd5ade5fe4..627df7c6dd 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -6,7 +6,7 @@ mob/living/carbon/proc/dream() "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", "a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights", "a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect", - "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying" + "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs" ) spawn(0) for(var/i = rand(1,4),i > 0, i--)