From 4191e1f7fd3cd68f50b380a97d9e79205d6e9e53 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Wed, 24 May 2017 05:54:42 -0500
Subject: [PATCH 1/2] Adds the Beach Bum Language

---
 code/__DEFINES/DNA.dm                         |   1 +
 code/datums/mutations.dm                      |  17 ++++++++++++++
 code/modules/awaymissions/corpse.dm           |   4 ++++
 code/modules/language/beachbum.dm             |  22 ++++++++++++++++++
 .../mob/living/carbon/human/status_procs.dm   |  13 +++++++++++
 code/modules/surgery/organs/tongue.dm.rej     |   9 +++++++
 icons/misc/language.dmi                       | Bin 1675 -> 2383 bytes
 tgstation.dme.rej                             |   9 +++++++
 8 files changed, 75 insertions(+)
 create mode 100644 code/modules/language/beachbum.dm
 create mode 100644 code/modules/surgery/organs/tongue.dm.rej
 create mode 100644 tgstation.dme.rej

diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 4a3618e941..9a2b6473af 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -23,6 +23,7 @@
 #define WACKY		"Wacky"
 #define MUT_MUTE	"Mute"
 #define SMILE		"Smile"
+#define STONER		"Stoner"
 #define UNINTELLIGABLE		"Unintelligable"
 #define SWEDISH		"Swedish"
 #define CHAV		"Chav"
diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm
index caab422e8b..05e4f4d458 100644
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations.dm
@@ -608,6 +608,23 @@ GLOBAL_LIST_EMPTY(mutations_list)
 		message = replacetext(message," muh valids "," getting my kicks ")
 	return trim(message)
 
+/datum/mutation/human/stoner
+	name = "Stoner"
+	quality = NEGATIVE
+	dna_block = NON_SCANNABLE
+	text_gain_indication = "<span class='notice'>You feel...totally chill, man!</span>"
+	text_lose_indication = "<span class='notice'>You feel like you have a better sense of time.</span>"
+
+/datum/mutation/human/stoner/on_acquiring(mob/living/carbon/human/owner)
+	..()
+	owner.grant_language(/datum/language/beachbum)
+	owner.remove_language(/datum/language/common)
+
+/datum/mutation/human/stoner/on_losing(mob/living/carbon/human/owner)
+	..()
+	owner.grant_language(/datum/language/common)
+	owner.remove_language(/datum/language/beachbum)
+
 /datum/mutation/human/laser_eyes
 	name = "Laser Eyes"
 	quality = POSITIVE
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 6100b296ed..0bda03c667 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -377,6 +377,10 @@
 	icon_state = "sleeper"
 	flavour_text = "You are a beach bum!"
 
+/obj/effect/mob_spawn/human/beach/equip(mob/living/carbon/human/H)
+	..()
+	H.dna.add_mutation(STONER)
+
 /////////////////Officers+Nanotrasen Security//////////////////////
 
 /obj/effect/mob_spawn/human/bridgeofficer
diff --git a/code/modules/language/beachbum.dm b/code/modules/language/beachbum.dm
new file mode 100644
index 0000000000..84c75c9ca4
--- /dev/null
+++ b/code/modules/language/beachbum.dm
@@ -0,0 +1,22 @@
+/datum/language/beachbum
+	name = "Beach Bumbian"
+	desc = "For when you're too toasted to speak normally."
+	speech_verb = "mumbles"
+	ask_verb = "grills"
+	exclaim_verb = "hollers"
+	key = "u"
+	space_chance = 85
+	default_priority = 90
+	syllables = list("cowabunga", "rad", "radical", "dudes", "bogus", "weeed", "every",
+					"dee", "dah", "woah", "surf", "blazed", "high", "heinous", "day",
+					"brah", "bro", "blown", "catch", "body", "beach", "oooo", "twenty",
+					"shiz", "phiz", "wizz", "pop", "chill", "awesome", "dude", "it",
+					"wax", "stoked", "yes", "ding", "way", "no", "wicked", "aaaa",
+					"cool", "hoo", "wah", "wee", "man", "maaaaaan", "mate", "wick",
+					"oh", "ocean", "up", "out", "rip", "slide", "big", "stomp",
+					"weed", "pot", "smoke", "four-twenty", "shove", "wacky", "hah",
+					"sick", "slash", "spit", "stoked", "shallow", "gun", "party",
+					"heavy", "stellar", "excellent", "triumphant", "babe", "four",
+					"tail", "trim", "tube", "wobble", "roll", "gnarly", "epic")
+
+	icon_state = "beach"
diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm
index 4e80477e6b..f1ff497a2a 100644
--- a/code/modules/mob/living/carbon/human/status_procs.dm
+++ b/code/modules/mob/living/carbon/human/status_procs.dm
@@ -20,3 +20,16 @@
 	. = ..()
 	if(.)
 		update_hair()
+
+/mob/living/carbon/human/set_drugginess(amount)
+	..()
+	if(!amount)
+		remove_language(/datum/language/beachbum)
+
+/mob/living/carbon/human/adjust_drugginess(amount)
+	..()
+	if(!dna.check_mutation(STONER))
+		if(druggy)
+			grant_language(/datum/language/beachbum)
+		else
+			remove_language(/datum/language/beachbum)
diff --git a/code/modules/surgery/organs/tongue.dm.rej b/code/modules/surgery/organs/tongue.dm.rej
new file mode 100644
index 0000000000..11c501c6f6
--- /dev/null
+++ b/code/modules/surgery/organs/tongue.dm.rej
@@ -0,0 +1,9 @@
+diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm	(rejected hunks)
+@@ -17,6 +17,7 @@
+ 		/datum/language/codespeak,
+ 		/datum/language/monkey,
+ 		/datum/language/narsie,
++		/datum/language/beachbum,
+ 		/datum/language/ratvar
+ 	))
+ 
diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi
index 081bbf1aa3c0ef6f7e6b3989e29cd5314bddbcb3..f4894c2b90c0d864e1a2a80f2457ed507ebaba17 100644
GIT binary patch
delta 2020
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
CB>?3B

delta 1307
zcmV+$1?2kA5{nIx7Y;B80{{R3mX(Yx0004Nu_bQ-f9e-iVgLXD0d!JMQvg8b*k%9#
z0J3^iSad{Xb7OL8aCB*JZU6vyoQ=}K3c@f92H<o16lJ@Mf_U>H8?wXp4q=U3v28|L
zHu3454!lXcCFJ9Wkd)?9Uz^TUZKG%8<S3f6IqvpaEzag~Z4M``Ms&lNw<cxCxRwQi
zFSN3bf75%Q)r}$GR)5U{BZ&y23x8xW<QZ6G$-98ET7Uz}X_hI<X+2p?6T)4T6HPsF
z6x{&6ryw%#p1@XQ5!TcGT%$B~SAAaK1)<B7CHykzod5s?5J^NqR7i=PmWhAjL>Pt#
zmLx6RkYb=|i&cw4&@^7bTS>j*k=<2cao6n{e+2Kv`~LHN=bOxtE~~r!CUa5VXTD?d
zql{h5YBja2qhB)S`w-)4G-|YfuFiFr)GW-h_#@4>ZR(}osR;mIh?7aE0T6Flcnm$6
z)HfV-8i;TgfUCD*mO)^);X$(jJqV2^>4ooV24I`?9AN}*L;*t6ahgJ3O`rhmY;W&a
ze-@uC9fKT^f3C09h)}C0kV4?c?^pt487U|MHS)ejxoGfIn(-@uIN74vwl#rr=xBiB
zYyxa;ZEXfH6@mljn~n&fl0YiLW%sfPV1@^_DrB=+7O|SZy0}DAzhfj(1Grw4QCtJV
z{d!#%4G^tY1(5nCqM*UNNHP~CfGWw(e*xr0l2^HDUgau4#i6f}HY$OmUnZTvx{l%h
z%y^wIV67G&-Y=}bo8ZA7L@(3|;CZ{S|3tJa09FM+{?INV)R%nUuc+Idwqj`KOMq9(
zC85jpT~6qh`c8W<*y9YH0>hMke}A6{2VMWrKS1vuNPRDOIOtUfEfXN+FaU7&f6<}u
z`iDpGLlAn81ZX{#hn9)(cK5X&E_8haa0CyaXM)fU9;H@IWJ_gW-!zW`FLNN05OloY
zF*L6euycq_fUa*;fjkI;PCM8O+MOU^M($-Yy^8+WV?L!$3`7Zf0WT!YCV)v74EZrt
z!NovbQ~@psKv2=?1#a;%nY_+!e|dtOSzwI%9+<`Sya#w0TH5YYaZiHrS)cX$?mZP7
z?C~eeU4P)Z19xa3LNvp|vP&Crz({Qe!zYIW7nH$M@}mgN(DO~C2q(-Q#qr3-Lg=3!
zKJ%>moZBDvpO=axO7w}?ae(*)qLCesUwCmG+aubtmtKD5)z@BsW5P{3e~_XnKq8h=
zBF;aBG=>3lN<O^#*4yvAn`PO1?|<-NsZa7KFJ(L(X^4pU$bGmHUmahIKRSu8jjzU6
z_%}ZOB+I5~*<?l@gkh2bkR~Dd3|*c;o#bG^|MBVdIG)?~JdUrQj(H|Oo!z*3^Tup8
z`|Q?)%hNp1L$o|kIRaype@6*A{=(SV?KvCG`A^k+#OAlp0GQx#*!1(sE%G3O<p=^s
z4iO<CJ$Q32DeU=~U0`uG=YT9*WQzqt$iCq6G)WS8fHCC=$iqlHJcOcHGPYb5%N3uC
zf&hyJoLEdJ*_Xlt#2@iIh%}~Y1TXS1N>hIL30ty)tyUP8?4+o8fAH1UWff2Y_^fXd
zg&>woK0sTrLT)G76l!?z&9~oeyayZ*D&F^utr)3Sv{4>R@2r1VD?yZ30Ox>A5K5c;
z_|wn7-1+sl-`8ucsJsh!8KS82cJb4-{qg5tfB&;y8~XDA)Uv8)>K~4O0fjE41Fm8L
R6#xJL07*qoM6N<$0fMd^ZcYFI

diff --git a/tgstation.dme.rej b/tgstation.dme.rej
new file mode 100644
index 0000000000..6f5a5fec15
--- /dev/null
+++ b/tgstation.dme.rej
@@ -0,0 +1,9 @@
+diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
+@@ -1390,6 +1390,7 @@
+ #include "code\modules\jobs\job_types\security.dm"
+ #include "code\modules\jobs\job_types\silicon.dm"
+ #include "code\modules\jobs\map_changes\map_changes.dm"
++#include "code\modules\language\beachbum.dm"
+ #include "code\modules\language\codespeak.dm"
+ #include "code\modules\language\common.dm"
+ #include "code\modules\language\draconic.dm"

From a29e0c45ae4628f25fb8d4420d913629a5102af3 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 28 May 2017 21:54:10 -0500
Subject: [PATCH 2/2] BEACHBUMBS!

---
 code/modules/surgery/organs/tongue.dm | 1 +
 tgstation.dme                         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 5a3555c8f9..5f23b1ef7d 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -15,6 +15,7 @@
 		/datum/language/common,
 		/datum/language/draconic,
 		/datum/language/monkey,
+		/datum/language/beachbum,
 		/datum/language/narsie,
 	))
 
diff --git a/tgstation.dme b/tgstation.dme
index 53723583d2..7c1d803849 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1439,6 +1439,7 @@
 #include "code\modules\jobs\job_types\science.dm"
 #include "code\modules\jobs\job_types\security.dm"
 #include "code\modules\jobs\job_types\silicon.dm"
+#include "code\modules\language\beachbum.dm"
 #include "code\modules\language\common.dm"
 #include "code\modules\language\draconic.dm"
 #include "code\modules\language\drone.dm"