From 1751caa64f51ddc4dc5b48e3e878fcf49e624d2c Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 20 Nov 2014 14:19:49 -0500 Subject: [PATCH] Adds skrell headtail items --- baystation12.dme | 1 + code/modules/client/preferences_gear.dm | 31 +++++++++++++++++++++ code/modules/clothing/ears/skrell.dm | 35 ++++++++++++++++++++++++ icons/mob/ears.dmi | Bin 731 -> 2849 bytes icons/obj/clothing/ears.dmi | Bin 0 -> 778 bytes 5 files changed, 67 insertions(+) create mode 100644 code/modules/clothing/ears/skrell.dm create mode 100644 icons/obj/clothing/ears.dmi diff --git a/baystation12.dme b/baystation12.dme index 85449749da3..3debd8031f6 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -772,6 +772,7 @@ #include "code\modules\client\preferences_spawnpoints.dm" #include "code\modules\client\preferences_toggles.dm" #include "code\modules\clothing\clothing.dm" +#include "code\modules\clothing\ears\skrell.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\hud.dm" #include "code\modules\clothing\gloves\boxing.dm" diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0cd4a4dd2d9..20e1bbaaa7c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -3,6 +3,7 @@ var/global/list/gear_datums = list() /hook/startup/proc/populate_gear_list() var/list/sort_categories = list( "[slot_head]" = list(), + "ears" = list(), "[slot_glasses]" = list(), "[slot_wear_mask]" = list(), "[slot_w_uniform]" = list(), @@ -771,3 +772,33 @@ var/global/list/gear_datums = list() path = /obj/item/weapon/haircomb sort_category = "misc" cost = 2 + +// Stuff worn on the ears. Items here go in the "ears" sort_category but they must not use +// the slot_r_ear or slot_l_ear as the slot, or else players will spawn with no headset. +/datum/gear/skrell_chain + display_name = "skrell headtail-wear, female, chain" + path = /obj/item/clothing/ears/skrell/chain + cost = 2 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/skrell_plate + display_name = "skrell headtail-wear, male, bands" + path = /obj/item/clothing/ears/skrell/band + cost = 2 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/skrell_cloth_male + display_name = "skrell headtail-wear, male, cloth" + path = /obj/item/clothing/ears/skrell/cloth_male + cost = 2 + sort_category = "ears" + whitelisted = "Skrell" + +/datum/gear/skrell_cloth_female + display_name = "skrell headtail-wear, female, cloth" + path = /obj/item/clothing/ears/skrell/cloth_female + cost = 2 + sort_category = "ears" + whitelisted = "Skrell" \ No newline at end of file diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm new file mode 100644 index 00000000000..986f5a02ec1 --- /dev/null +++ b/code/modules/clothing/ears/skrell.dm @@ -0,0 +1,35 @@ +/* + Skrell tentacle wear +*/ + +/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' + w_class = 1 + slot_flags = SLOT_EARS | SLOT_TWOEARS + species_restricted = list("Skrell") + +/obj/item/clothing/ears/skrell/chain + name = "skrell headtail chains" + desc = "A delicate golden chain worn by female skrell to decorate their head tails." + icon_state = "skrell_chain" + item_state = "skrell_chain" + +/obj/item/clothing/ears/skrell/band + name = "skrell headtail bands" + desc = "Golden metallic bands worn by male skrell to adorn their head tails." + icon_state = "skrell_band" + item_state = "skrell_band" + +/obj/item/clothing/ears/skrell/cloth_female + name = "skrell headtail cloth" + desc = "A cloth shawl worn by female skrell draped around their head tails." + icon_state = "skrell_cloth_female" + item_state = "skrell_cloth_female" + +/obj/item/clothing/ears/skrell/cloth_male + name = "skrell headtail cloth" + desc = "A cloth band worn by male skrell around their head tails." + icon_state = "skrell_cloth_male" + item_state = "skrell_cloth_male" \ No newline at end of file diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index c5d2440e11a2d9595c30ffa8e0e717be90a94f08..4cab7dd237e96333688d77c97e053ec4dad33c20 100644 GIT binary patch literal 2849 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 N002ovPDHLkV1lcFNy`8L diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0ffe252b6de549bc84b4914d5d80b564efa31942 GIT binary patch literal 778 zcmV+l1NHogP)O!qaPowA|j_CAhRPQcN7$?AtAXWB%2-{q#z)|Cnv!rC9onQyCfv3ARvhu z8NMYYwId^s8XAik8A%EXjT#!392}k=9{<7)>!1h!+i*QI0BBbLe`)}wiU7u?08~Z* z@5ccD*Z|C`05vQC85ID$z{;2a0004WQchCV=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sW`hRH76%NIVZm)BR)4VCsm1yGbOXA7$|4R#hF%=n41b=W7mmT(@|v2#hg7gg&Uh727CG zX7PQAiLgfOcEb2`dHbrQM3-&!7Dey-JNT|9*&~KiIE`;>h#{WAFIX^!^pIxucW-~z z|2br1WxW4YmIwSh3A>qD0+i<=B^GBX(2E?%#N=Y0=hQNpms-q=k55Wr>K<%=S$<7) z8?H6|Rehush8rd{8-cna1qOM!4b;^Hg)Aku$OfCYOFje9y8ps=u`R2|8IZY0>NoEJsjqbxarrkVaMVc+Sy#fiC6 zzb8TM