From 69215c63f516b38636b06fd3f4ed4e5b00839b19 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Sat, 6 Jun 2020 23:33:55 +0800 Subject: [PATCH] Makes skirt outlines more obvious, adds pleated skirt (#9030) --- .../loadout/loadout_uniform.dm | 1 + code/modules/clothing/under/skirts.dm | 20 +++++--- html/changelogs/wezzy_skirt_outlines.yml | 43 ++++++++++++++++++ icons/obj/clothing/skirts.dmi | Bin 1639 -> 2893 bytes 4 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/wezzy_skirt_outlines.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 27f162cd3ed..b1821c2f058 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -63,6 +63,7 @@ skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept skirts["plaid skirt"] = /obj/item/clothing/under/skirt/plaid + skirts["pleated skirt"] = /obj/item/clothing/under/skirt/pleated gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 15f2e132489..c1ec49469fe 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -3,7 +3,7 @@ /obj/item/clothing/under/skirt name = "casual skirt" desc = "A short, colorful skirt." - desc_info = "Not to be mistaken with the similarly named cut of steak." + desc_fluff = "Not to be mistaken with the similarly named cut of steak." icon = 'icons/obj/clothing/skirts.dmi' icon_state = "skirt_casual" item_state = "skirt_casual" @@ -15,7 +15,7 @@ /obj/item/clothing/under/skirt/puffy name = "puffy skirt" desc = "A short, puffy skirt." - desc_info = "When you've got too much air in your head and need to put it somewhere else." + desc_fluff = "When you've got too much air in your head and need to put it somewhere else." icon_state = "skirt_puffy" item_state = "skirt_puffy" worn_state = "skirt_puffy" @@ -23,7 +23,7 @@ /obj/item/clothing/under/skirt/long name = "long skirt" desc = "A long, modest skirt." - desc_info = "Long enough to do a curtsy, if you're into that sort of thing." + desc_fluff = "Long enough to do a curtsy, if you're into that sort of thing." icon_state = "skirt_long" item_state = "skirt_long" worn_state = "skirt_long" @@ -31,7 +31,7 @@ /obj/item/clothing/under/skirt/pencil name = "pencil skirt" desc = "A professional-looking pencil skirt." - desc_info = "Revel in how professional you are. Realize that you'll never pick up anything from the floor without compromising yourself." + desc_fluff = "Revel in how professional you are. Realize that you'll never pick up anything from the floor without compromising yourself." icon_state = "skirt_pencil" item_state = "skirt_pencil" worn_state = "skirt_pencil" @@ -39,7 +39,7 @@ /obj/item/clothing/under/skirt/swept name = "swept skirt" desc = "A skirt that is swept to one side." - desc_info = "When you want a little more skirt, but not too much." + desc_fluff = "When you want a little more skirt, but not too much." icon_state = "skirt_swept" item_state = "skirt_swept" worn_state = "skirt_swept" @@ -47,11 +47,19 @@ /obj/item/clothing/under/skirt/plaid name = "plaid skirt" desc = "A preppy plaid skirt." - desc_info = "Stick it to gender stereotypes and be the lumberjack you've always been! Avoid doing physical labor anyway on account of the skirt being several lengths too short!" + desc_fluff = "Stick it to gender stereotypes and be the lumberjack you've always been! Avoid doing physical labor anyway on account of the skirt being several lengths too short!" icon_state = "skirt_plaid" item_state = "skirt_plaid" worn_state = "skirt_plaid" +/obj/item/clothing/under/skirt/pleated + name = "pleated skirt" + desc = "A sharp-looking knife-pleated skirt." + desc_fluff = "Would go great with a sailor uniform." + icon_state = "skirt_pleated" + item_state = "skirt_pleated" + worn_state = "skirt_pleated" + /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." diff --git a/html/changelogs/wezzy_skirt_outlines.yml b/html/changelogs/wezzy_skirt_outlines.yml new file mode 100644 index 00000000000..abcf73e6ac8 --- /dev/null +++ b/html/changelogs/wezzy_skirt_outlines.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: Wowzewow (Wezzy) + +# 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 pleated skirts to the loadout." + - rscadd: "Adds skirt inhands." + - tweak: "Skirts have more well-defined outlines to stand out more." diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index a07480aa1983dff048e8a94213ae3dce3124987b..479d50a4d0ab3b418ca635831afd8e1bba8d122d 100644 GIT binary patch literal 2893 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 literal 1639 zcmV-t2AKJYP)CdV($dAn#oyoG^Yion|Nq3q#K6G7yu7^h^z_Wk z%w1hwY;0`6z`!XfDPCS)IyyQ_OG`dJK6Z9?XlQ7pz|sf+0004WQchCV=-0C=30lFJH%Fc3x8$yWs3mpqbtR3h0ah z0000000000z;1sij>TcW+e+sz$Actu#NjvvK2jXZZ!h1ZWZ@^mi-0HKu9n zN?M<1;K8jBQGIXglQzNj1{!t!Xn;b}5mhr9kPLo^0WrONMApExzHp4*OV_r5GQll> z$-&1M5alsKo}iixJf{LTSxz9cf(ZuF()|KL30LZdFG1QVGA95400000000000Q`m2 zR~G8o{(DyEFF#&Nv43BbFF&Th2Xf8Z8Qtkj|2?O(pf>-wcUyB0ZyN)vC#b8Y%^PT& zw1N6={!~Ctf4YHO`#jrTUp>K;el=lS;f>Is_cYgnTJDL}2?41M(k!GN|v zFrWnh0000000000008jEWc%;T`Fvg|Zcf$4&fj;b^%s&m{XB_Do=KbnAKCiz33&q- zV=g%Z93upb@9mXef5_|V`;zYrq&Ly|LiuG4oPIvZKouJ2N(rX?FPHQTmy7OTV*}j$ z9t{W)lL27@GZ{$BV}8=;tj-a^ff5j3#1aVx6x{>^f))?3JT|At1+)@uO#Fn;a(zVq z6wa2^ne=k{gu2TB00000000000KmTo_uaV#FGn1U!!@A@-;0ASXuAD`I(0000000000008(W`Q-h78qE3aeu)v> zUNuH~`*d??i&N1ar2g<)eNO@f$nEEb)WS6Ty%;gJR|Nxf1Ye6+^$4%j_f(@-`G1Jm zy;A-5`069AohimV#jvabI+`0mW3P2T5(xVD+36zL7lt2)h-T2r@ z9|M&1;&A+Sd;kCd0D!*{Yww@F9=0s)?dc0*yUse}`03fHEW>(F4s7SWU?8`}>=khd zm*1Y24&pMbcaC!R{FGcKx5Y>pksW5YCr2#Y03mf}U9gc{{kFv;5=CzP=FJcpJ)1uQl|$8dO~NBa2La+tQ*kTejspbuM6 zFwl2{RNoj7Chz*C73j;Zd+WL~HGv(5-i%w!^uzG~5XwL3F6e0owi{@7xwN}D37zE} zwA6s(J>Xr^K-Y)MOc^dR{lgm8_tRyF^z<(52I&O4MzFr6fw;wF1CuTq2oX{SarjaL zbmol)Qs*EWn6{W;pnnS)y!Eny-tZh!3OqUO&+QCcDGd!l?J(qV; z{y77*_RWBK*kxDU3;H!?hJp0pIS#CHFJR;R(ct*+2c2a8lhUs-@{LM}pl=hx;5pdw zGAJxgax}mJ2?N2OA04LVh{H1#2rDc!VDx*j{}@Owe>0H6#r)Op1Hr*!13Ky!o1y3L zR`a*B>+l^NJnK5YP!D&!xtlrRR`^}`@&>|98sD@@I$wb3QY3F-zGYQ6xRdT=--WMk zfUXX~09{NZJs6O56ED=V8kgA20H;sa2g^6asT?{t8BFSo6Gz`IvC%~|X70kz1nD0s l?+hy6N`%pOOZ-^{egg^loN*)u@0|bu002ovPDHLkV1m}G0bKw9