From eb2e21ef0bc3797e2d71bb6785057175a55460e0 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Sun, 10 Sep 2023 00:54:31 -0700 Subject: [PATCH] [MIRROR] Fancy... (#6950) Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: CHOMPStation2 --- code/__defines/span_vr.dm | 1 + code/modules/mob/language/animal.dm | 3 ++- .../simple_mob/subtypes/animal/alien animals/teppi.dm | 8 ++++---- code/modules/vchat/css/ss13styles.css | 4 +++- code/stylesheet.dm | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 737d1a81ad..ed4072b31f 100644 --- a/code/__defines/span_vr.dm +++ b/code/__defines/span_vr.dm @@ -73,6 +73,7 @@ #define span_interface(str) ("" + str + "") #define span_spacer(str) ("" + str + "") #define span_blob(str) ("" + str + "") +#define span_teppi(str) ("" + str + "") #define span_debug_error(str) ("" + str + "") #define span_debug_warning(str) ("" + str + "") diff --git a/code/modules/mob/language/animal.dm b/code/modules/mob/language/animal.dm index 9135babe24..4f01672cc3 100644 --- a/code/modules/mob/language/animal.dm +++ b/code/modules/mob/language/animal.dm @@ -30,4 +30,5 @@ flags = WHITELISTED machine_understands = 0 space_chance = 100 - syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh") + syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh", "groah", "gyooh", "giouh", "puff", "huff", "ghom", "gyuh", "rrrr", "ghh", "uuah", "groh", "gyaah") + colour = "teppi" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index f666cca802..5c29e68836 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -860,17 +860,17 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? affinity[person.real_name] = -100 //Don't hold a grudge though. /datum/say_list/teppi - speak = list("Gyooh~", "Gyuuuh!", "Gyuh?", "Gyaah...", "Iuuuuhh.", "Uoounh!", "GyoooOOOOoooh!", "Gyoh~", "Gyouh~") + speak = list("Gyooh~", "Gyuuuh!", "Gyuh?", "Gyaah...", "Iuuuuhh.", "Uoounh!", "GyoooOOOOoooh!", "Gyoh~", "Gyouh~","Gyuuuuh...", "Rrrr...", "Uuah~", "Groh!") emote_hear = list("puffs", "huffs", "rumbles", "gyoohs","pants", "snoofs") emote_see = list("sways its tail", "stretches", "yawns", "turns their head") - say_maybe_target = list("Gyuuh?") + say_maybe_target = list("Gyuuh?", "Rrrr!") say_got_target = list("GYOOOHHHH!!!") /datum/say_list/teppibaby - speak = list("Gyooh~", "Gyuuuh!", "Gyuh?", "Gyaah...", "Iuuuuhh.", "Uoounh!", "GyoooOOOOoooh!", "Gyoh~", "Gyouh~", "Yip!") + speak = list("Gyooh~", "Gyuuuh!", "Gyuh?", "Gyaah...", "Iuuuuhh.", "Uoounh!", "GyoooOOOOoooh!", "Gyoh~", "Gyouh~","Gyuuuuh...", "Rrrr...", "Uuah~", "Groh!", "Yip!") emote_hear = list("puffs", "huffs", "rumbles", "gyoohs","pants", "snoofs", "yips") emote_see = list("sways its tail", "stretches", "yawns", "turns their head") - say_maybe_target = list("Gyuuh?") + say_maybe_target = list("Gyuuh?", "Rrrr!") say_got_target = list("GYOOOHHHH!!!") diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index 93b181186c..82a28205e0 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -160,7 +160,8 @@ h1.alert, h2.alert {color: #000000;} .skrell {color: #00B0B3;} .skrellfar {color: #70FCFF;} .soghun {color: #50BA6C;} -.solcom {color: #3333CE;} /* VOREStation Edit */ +.solcom {color: #3333CE;} +.inverted .solcom {color: #6da6f0;} .changeling {color: #800080;} .inverted .changeling {color: #ff0084;} /* CHOMPStation Add */ .sergal {color: #0077FF;} @@ -186,6 +187,7 @@ h1.alert, h2.alert {color: #000000;} /* YW Edit End */ .spacer {color: #9c660b;} /* VOREStation Add */ .blob {color: #ff950d; font-weight: bold; font-style: italic;} +.teppi {color: #816540; word-spacing:4pt; font-family: "Segoe Script Bold","Segoe Script",sans-serif,Verdana;} .black {color: #000000;} .darkgray {color: #808080;} diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 6ef480975c..74a0412c33 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -124,6 +124,7 @@ h1.alert, h2.alert {color: #000000;} .psionic {color: #993399;} /*YWedit*/ .spacer {color: #9c660b;} /* VOREStation Add */ .blob {color: #ff950d; font-weight: bold; font-style: italic;} +.teppi {color: #816540; word-spacing:4pt; font-family: "Segoe Script Bold","Segoe Script",sans-serif,Verdana;} BIG IMG.icon {width: 32px; height: 32px;}