From 5a341ff38e8daf36681b47c4bd4122b237df0de0 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 31 Mar 2017 17:52:15 +0100 Subject: [PATCH 1/2] Fixes a bug with some languages --- code/stylesheet.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index d3b29e26e41..0e9f5f87b7b 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -93,8 +93,8 @@ h1.alert, h2.alert {color: #000000;} .sergal {color: #0077FF;} .birdsongc {color: #CC9900;} .vulpkanin {color: #B97A57;} -.enochian {color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family:lucida sans unicode, lucida grande, sans-serif;} -.daemon {color: #5E339E; letter-spacing:-1pt; word-spacing:0pt; font-family:courier new, courier, monospace;} +.enochian {color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;} +.daemon {color: #5E339E; letter-spacing:-1pt; word-spacing:0pt; font-family: "Courier New", Courier, monospace;} .vox {color: #AA00AA;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;} From 7e27405e6c200a33703fdb5e5c1347ec89c349bc Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 31 Mar 2017 17:52:32 +0100 Subject: [PATCH 2/2] Adds whitelist + custom item stuff --- .../vore/appearance/sprite_accessories_vr.dm | 6 ++++++ config/alienwhitelist.txt | 1 + icons/mob/vore/tails_vr.dmi | Bin 49454 -> 51106 bytes 3 files changed, 7 insertions(+) diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index a9917a9b7e6..a5ebc0dfa1f 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -518,6 +518,12 @@ icon_state = "aronai" ckeys_allowed = list("arokha") +/datum/sprite_accessory/tail/sepulchre + name = "demon wings (Sepulchre)" + desc = "" + icon_state = "sepulchre_wings" + ckeys_allowed = list("sepulchre") + /datum/sprite_accessory/tail/feathered name = "feathered wings, colorable" desc = "" diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index f01d3f05424..fe556e05742 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -4,5 +4,6 @@ bothnevarbackwards - Diona jemli - Gutterband xioen - Xenomorph Hybrid sepulchre - Vox +sepulchre - Daemon zammyman215 - Vox hawkerthegreat - Vox \ No newline at end of file diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index 21af3935a829847fcb5287102078d7b03c110519..fc842db879d114d0cd29cbc9f4aee9d768b77a5d 100644 GIT binary patch delta 3100 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