diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 2232f5420e5..6c7be564924 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -100,4 +100,10 @@ algae["glowing algae(stripes)"] = /obj/item/clothing/ears/skrell/goop/stripes algae["glowing algae(circles)"] = /obj/item/clothing/ears/skrell/goop/circles gear_tweaks += new/datum/gear_tweak/path(algae) - gear_tweaks += list(gear_tweak_free_color_choice) \ No newline at end of file + gear_tweaks += list(gear_tweak_free_color_choice) + +/datum/gear/mask/skrell + display_name = "skrell gill cover" + path = /obj/item/clothing/mask/breath/skrell + whitelisted = list("Skrell") + sort_category = "Xenowear - Skrell" \ No newline at end of file diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 18317fb5b46..b09a2d1e170 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -1,9 +1,10 @@ /obj/item/clothing/ears/skrell name = "skrell tentacle wear" desc = "Some stuff worn by skrell to adorn their head tentacles." - icon = 'icons/obj/clothing/ears.dmi' + icon = 'icons/obj/skrell_items.dmi' + contained_sprite = TRUE w_class = 1 - slot_flags = SLOT_EARS + slot_flags = SLOT_HEAD | SLOT_EARS species_restricted = list("Skrell") /obj/item/clothing/ears/skrell/chain diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 157fe2af0db..f9d63047afb 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -30,4 +30,14 @@ name = "jagmask" desc = "A two-piece, jagged filtering mask meant to conform to one's face comfortably." icon_state = "jagmask" - item_state = "muzzle" \ No newline at end of file + item_state = "muzzle" + +/obj/item/clothing/mask/breath/skrell + name = "skrellian gill cover" + desc = "A comfy technological piece used typically by those suffering from gill-related disorders. It goes around the neck and shoulders with a small water tank on the back, featuring a hookup for oxytanks to keep the water oxygenated." + icon = 'icons/obj/skrell_items.dmi' + icon_state = "gillcover" + item_state = "gillcover" + contained_sprite = TRUE + species_restricted = list("Skrell") + adjustable = FALSE \ No newline at end of file diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index f1d204f276f..7f9addc9860 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -138,7 +138,7 @@ /datum/language/skrell/get_random_name() var/new_name = "" var/suff = "" - var/name_pieces = list("Zish", "Kin", "Qu", "Sukak", "Shin", "Ulu", "Nini", "Nai", "Xunu", "Zix", "Ooo", "Paut", "Sulux", "Xiialt", "Riori", "Eqeq", "Xicic", "Ooin", "Kaaxi", "Nuux", "Iirun", "Akoox", "Nunuz", "Ouik", "Uptari", "Vuzu", "Weish", "Liise", "Xiiux", "Lesh", "Ezhin", "Vulun", "Ponoh", "Pish", "Nali", "Yonosh") + var/name_pieces = list("Qu", "Su", "Xu", "Xi", "Qi", "Si", "Ei", "Qui", "Iuq", "Qiu", "Kiu", "Uiu", "Eis", "Seq", "Eqa", "Uiq", "Kui", "Muu", "Muq", "Kuo", "Omq", "Xoi", "Liq", "Zuk", "Kono", "Koxi", "Auuo", "Iili", "Kesi", "Irek", "Quak", "Qoku", "Uokk", "Eeok", "Teie", "Xiou", "Xoku", "Xiru", "Qiuu", "Laqu", "Leua", "Olru", "Oquo", "Oeoo", "Isik", "Kiue", "Ruee", "Ouqu", "Kiiq", "Tesh", "Lish", "Ilin", "Shiq", "Quis", "Oquq", "Ququ", "Xoio", "Nolko", "Ruusi", "Ieliu", "Nuptu", "Eiuos", "Seiuu", "Xeriu", "Ioquk", "Teiqu", "Quoru", "Qiiuk", "Qeouu", "Quaoi", "Uieuu", "Koqun", "Nuouu", "Leuqo", "Luroq", "Urqul", "Uluqu", "Iequu", "Uiuou", "Suioq", "Urouu", "Xeouu", "Xeios", "Qarui", "Njubu", "Buquk", "Zueou", "Qosko", "Tuiru", "Tuquu", "Xorie", "Zouuo", "Euioi", "Liise", "Riori", "Iirun", "Akoox", "Nunuz", "Ezhin", "Vulun", "Ponoh", "Sulux", "Suqui", "Suqua", "Souqx", "Squix", "Quish", "Shiqu", "Jeshi", "Xushi", "Kiqui", "Liuiq", "Tuish", "Vuzuna", "Uptari", "Xiialt", "Yonosh", "Lieuqo", "Turiuu", "Utrieo", "Yutiex", "Xuitou", "Xieoru", "Xioshi", "Quisuu", "Juiqii", "Uituik", "Ruisui", "Tuisuh", "Jixktu", "Lioxui", "Shixul", "Iuoquu", "Nuitqu", "Kuixqu", "Oiquio", "Oiakuu", "Juukxu", "Iouiuu", "Tuirou", "Suahuk", "Seuaio", "Juirue", "Kioxui", "Xusuui", "Tuirul", "Luishi", "Liropo", "Lixuqe", "Urueir", "Queire", "Iuosuu", "Jaxxak", "Kqullu", "Xulluu", "Xikkuq", "Oiuqkk", "Tuiskk", "Liqukk", "Orueix", "Rkusix", "Turieu", "Kduish", "Xdurui", "Liquuq", "Shiruu", "Xuisoo", "Ooruex", "Uuooux", "Oieuix", "Laishi", "Xiaooi", "Oruexi", "Xiatal", "Xekkua") var/first_name = "[pick(name_pieces)]" name_pieces -= first_name if(prob(40)) diff --git a/html/changelogs/paradoxspace-airisnotgood.yml b/html/changelogs/paradoxspace-airisnotgood.yml new file mode 100644 index 00000000000..fff7da21035 --- /dev/null +++ b/html/changelogs/paradoxspace-airisnotgood.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace, VTCobaltblood, and Xev + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a new Skrell breath mask, sprites by Xev." + - rscadd: "You can now put headcloth/chains/etc on your head." + - rscadd: "Adds a bunch of Skrell random gen names, names by VT." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 955af18e92b..88e46fad668 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b191ac79133..4a83f4466ab 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 9c9a1ddf155..dedc50bdf09 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/skrell_items.dmi b/icons/obj/skrell_items.dmi index fecca2f14cd..044034c6b5b 100644 Binary files a/icons/obj/skrell_items.dmi and b/icons/obj/skrell_items.dmi differ