From 39a114c7ece541448bad58aa7e3a554c3a525f08 Mon Sep 17 00:00:00 2001 From: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com> Date: Mon, 23 May 2022 11:43:07 +0100 Subject: [PATCH] Adds Srom masks, renames Dreamer mantle (#14024) --- aurorastation.dme | 1 + .../loadout/loadout_xeno/skrell.dm | 21 ++++++++- code/modules/clothing/head/xenos/skrell.dm | 4 +- code/modules/clothing/masks/xeno/skrell.dm | 41 ++++++++++++++++++ html/changelogs/llywelwyn-srommasks.yml | 7 +++ .../obj/contained_items/skrell/srom_masks.dmi | Bin 0 -> 1128 bytes 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 code/modules/clothing/masks/xeno/skrell.dm create mode 100644 html/changelogs/llywelwyn-srommasks.yml create mode 100644 icons/obj/contained_items/skrell/srom_masks.dmi diff --git a/aurorastation.dme b/aurorastation.dme index c2f28f2e3c7..d9482d17fe6 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1576,6 +1576,7 @@ #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\miscellaneous.dm" #include "code\modules\clothing\masks\voice.dm" +#include "code\modules\clothing\masks\xeno\skrell.dm" #include "code\modules\clothing\masks\xeno\tajara.dm" #include "code\modules\clothing\masks\xeno\unathi.dm" #include "code\modules\clothing\rings\material.dm" 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 1977a8f1082..e393da3f54c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -95,7 +95,7 @@ flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/skrell - display_name = "zipluax mantle" + display_name = "skrell mantle" path = /obj/item/clothing/head/skrell whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Skrell" @@ -151,6 +151,25 @@ whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Skrell" +/datum/gear/mask/skrell/srom + display_name = "srom masks" + path = /obj/item/clothing/mask/skrell + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/mask/skrell/srom/New() + ..() + var/list/mask = list() + mask["pinhole mask"] = /obj/item/clothing/mask/skrell + mask["skull mask"] = /obj/item/clothing/mask/skrell/skull + mask["weeping mask"] = /obj/item/clothing/mask/skrell/weeping + mask["watcher mask"] = /obj/item/clothing/mask/skrell/watcher + mask["third eye mask"] = /obj/item/clothing/mask/skrell/thirdeye + mask["half mask"] = /obj/item/clothing/mask/skrell/half + mask["horned mask"] = /obj/item/clothing/mask/skrell/horned + gear_tweaks += new /datum/gear_tweak/path(mask) + /datum/gear/ears/skrell/scrunchy display_name = "tentacle tie" path = /obj/item/clothing/ears/skrell/scrunchy diff --git a/code/modules/clothing/head/xenos/skrell.dm b/code/modules/clothing/head/xenos/skrell.dm index 187fc655a34..eed215e4001 100644 --- a/code/modules/clothing/head/xenos/skrell.dm +++ b/code/modules/clothing/head/xenos/skrell.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/skrell - name = "zi'pluax mantle" - desc = "A mantle used to cover the headtails of members of the Zi'Pluax generational fleet." + name = "skrell mantle" + desc = "A mantle used to cover the headtails of a Skrell." icon = 'icons/obj/contained_items/skrell/dreamer_mantle.dmi' item_state = "dreamer_mantle" icon_state = "dreamer_mantle" diff --git a/code/modules/clothing/masks/xeno/skrell.dm b/code/modules/clothing/masks/xeno/skrell.dm new file mode 100644 index 00000000000..8baab7197c5 --- /dev/null +++ b/code/modules/clothing/masks/xeno/skrell.dm @@ -0,0 +1,41 @@ +/obj/item/clothing/mask/skrell + name = "pinhole mask" + desc = "Masks used within the Srom to hide the face, whether for cultural or personal reasons." + icon = 'icons/obj/contained_items/skrell/srom_masks.dmi' + icon_state = "pinhole" + item_state = "pinhole" + contained_sprite = TRUE + body_parts_covered = FACE + item_flags = FLEXIBLEMATERIAL + flags_inv = HIDEFACE + sprite_sheets = null + +/obj/item/clothing/mask/skrell/skull + name = "skull mask" + icon_state = "skull" + item_state = "skull" + +/obj/item/clothing/mask/skrell/weeping + name = "weeping mask" + icon_state = "weeping" + item_state = "weeping" + +/obj/item/clothing/mask/skrell/watcher + name = "watcher mask" + icon_state = "watcher" + item_state = "watcher" + +/obj/item/clothing/mask/skrell/thirdeye + name = "third eye mask" + icon_state = "third_eye" + item_state = "third_eye" + +/obj/item/clothing/mask/skrell/half + name = "half mask" + icon_state = "half" + item_state = "half" + +/obj/item/clothing/mask/skrell/horned + name = "horned mask" + icon_state = "horned" + item_state = "horned" \ No newline at end of file diff --git a/html/changelogs/llywelwyn-srommasks.yml b/html/changelogs/llywelwyn-srommasks.yml new file mode 100644 index 00000000000..0338a3b758c --- /dev/null +++ b/html/changelogs/llywelwyn-srommasks.yml @@ -0,0 +1,7 @@ +author: Llywelwyn, RyverStyx + +delete-after: True + +changes: + - rscadd: "Added srom masks to the Skrell loadout." + - tweak: "Dreamer mantle is renamed to 'skrell mantle', and is no longer specific to the Zi'Pluax genner vessel." diff --git a/icons/obj/contained_items/skrell/srom_masks.dmi b/icons/obj/contained_items/skrell/srom_masks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..81dc00d4d11b86b658a628e1d4b016f34f8b0d1e GIT binary patch literal 1128 zcmV-u1eg1XP)aw!3-QC?ODJcjD2*AL=@sH?=omwCO0004WQchCV=-0C=2@l1&Q2Fc3!9$tgm+7prdFNQ-n~uTX-Sc7kalNwj!-(^hn$lI-S# zHxK3~XNT%oH>^C>^bXcZquHMAR%=Q|DLjU--B5xcd-O|io_h#oc9j~9f_C5;B|=&^ zbyCtT4iM&c=4awZ(S1TDB3_Hn^NyqR=Y>3;zB36!s(RW4u^x!u+Hl&HBx*0~&jtKOBcS zli>|gNCKBSzdIa2g&2*%{|pk0rv1-OhESLy;Q{}}X;A4sd8=!Qm>$pf|g6@jLqDofCKRq9tn^8@`k zxI@t>)DfB=m}f`<1tR|IM@O_V+9cW-Z4zyaHjNfWo47#det>SYX>{)g*l05h!(0W> zZVW7+Kgz-R#0^GZepl{o)%_`_=JflgCHNQapTy|lx3YN_o72ueNav{mQpgLDT!mmvw@eBIOa zgBaLoTY`?Nf{nH%*l1gVjkYb=Xfq7MFxP;sA3(Sv^aG(7O{mW(3{#XcOvPw{ z_D3a7Vsw8%ejfq&3ynHSK;u;>*)ixB)N6+4EFebY1-t~9wniZ>KyEaru(6W_pQ!U+ z9$Z*<^I@Y+Ln~Blv}tICij6i6tx&PirlHjlHrkd8V53b#FVsuF0D%jYVHk$FMtVMc zb=5x|ok5rvASINZp^CuUy&BU5o#Uo*v%4cMP#ks{QV4B=cTn#SAP$ZP8t{WLWEgw! uk-!psB(MY@2`s@!0!#3bfMFQsL-QA(c6v*#b?tHh0000