From 76c66b1a94b3d1bf9e50bd640771077ae039bed1 Mon Sep 17 00:00:00 2001 From: atteria <86520558+atteria@users.noreply.github.com> Date: Sun, 4 Sep 2022 03:38:50 -0700 Subject: [PATCH] Adds Antillean dresses to the loadout (#14748) --- aurorastation.dme | 1 + .../loadout/loadout_uniform.dm | 13 ++++++ .../modules/clothing/factions/portantillia.dm | 14 ++++++ html/changelogs/atteria-antillean-dress.yml | 41 ++++++++++++++++++ .../clothing/under/uniforms/port_antillia.dmi | Bin 0 -> 1099 bytes 5 files changed, 69 insertions(+) create mode 100644 code/modules/clothing/factions/portantillia.dm create mode 100644 html/changelogs/atteria-antillean-dress.yml create mode 100644 icons/clothing/under/uniforms/port_antillia.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 649f9911526..4e68ef78809 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1564,6 +1564,7 @@ #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\nralakk.dm" #include "code\modules\clothing\factions\pmcg.dm" +#include "code\modules\clothing\factions\portantillia.dm" #include "code\modules\clothing\factions\scc.dm" #include "code\modules\clothing\factions\vysoka.dm" #include "code\modules\clothing\glasses\glasses.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 735b5ceef93..d1613e36a79 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -366,3 +366,16 @@ qipao["qipao"] = /obj/item/clothing/under/qipao qipao["slim qipao"] = /obj/item/clothing/under/qipao2 gear_tweaks += new /datum/gear_tweak/path(qipao) + +/datum/gear/uniform/miscellaneous/fetil_dress + display_name = "fetil dress" + description = "A flowing dress from the Fetil islands on Port Antillia, usually in either white or muted dark shades. Great for dancing." + path = /obj/item/clothing/under/antillean + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/uniform/miscellaneous/fetil_dress/New() + ..() + var/list/fetil_dress = list() + fetil_dress["fetil dress, red flairs"] = /obj/item/clothing/under/antillean + fetil_dress["fetil dress, gold flairs"] = /obj/item/clothing/under/antillean/goldflair + gear_tweaks += new /datum/gear_tweak/path(fetil_dress) diff --git a/code/modules/clothing/factions/portantillia.dm b/code/modules/clothing/factions/portantillia.dm new file mode 100644 index 00000000000..812afcf7f8b --- /dev/null +++ b/code/modules/clothing/factions/portantillia.dm @@ -0,0 +1,14 @@ +/obj/item/clothing/under/antillean + name = "fetil dress" + desc = "A flowing dress from the Fetil islands on Port Antillia. Great for dancing." + icon = 'icons/clothing/under/uniforms/port_antillia.dmi' + icon_state = "fetil_dress" + worn_state = "fetil_dress" + item_state = "fetil_dress" + slot_flags = SLOT_ICLOTHING + contained_sprite = TRUE + build_from_parts = TRUE + worn_overlay = "rflairs" + +/obj/item/clothing/under/antillean/goldflair + worn_overlay = "gflairs" diff --git a/html/changelogs/atteria-antillean-dress.yml b/html/changelogs/atteria-antillean-dress.yml new file mode 100644 index 00000000000..96d854143f3 --- /dev/null +++ b/html/changelogs/atteria-antillean-dress.yml @@ -0,0 +1,41 @@ +################################ +# 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: atteria + +# 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: "Added dresses from Port Antillia." diff --git a/icons/clothing/under/uniforms/port_antillia.dmi b/icons/clothing/under/uniforms/port_antillia.dmi new file mode 100644 index 0000000000000000000000000000000000000000..dc1cf9cb38d4e4623df713fd4742ffa0f682e8cf GIT binary patch literal 1099 zcmV-R1ho5!P)005u_0{{R3dEt5<0000aP)t-sz`($x zu(FMsqIVV|tbI9ee2dWE-mWk|&zd}YRx^8ulfb~hn>gr200001bW%=J06^y0W&i*H zn0i!LbVOxyV{&P5bZKvH004NLQ&wC9|j)C~C;XnO2mTn+joL zQyX8DmXionOp=~-GW3+@A(WdCR-ThVlJX+bl$YjV`kOdy7+y!!rmW!V=K_vD0F+CN za1zNfVgLXGF-b&0RA_H0koATR$rdcRbI9O1QiiTK zbm?|uJLW&FA*t~*hJ#R5mGXW^qkp z`T9VJy$^Ogbz9G|+dM_9-;dX%Xb1&6Vnf&=wN3Zu>qd}_H-Wyej}{nipTC8Erzqzdl1#LE(br0HuBt#`G#BQ6 zIC2ct>VpQ9sZ>}KW*qbV270E9Q9vNHUSt^Q*-I77fFsMLRAfG}p1srx8VV@|nGaP` zhx$y^3jETTS$4>^7Fq-+u`O$GQr#RcILV~a!pO3(rE-?#h>1GvV}4UBio4GRle+`F{4 z%FyLGkde7O zV5OHJS_N~&TnLAAsDzH@&}G!up52;4CBCIH4Bc)i75!7A;x05-Z-zM>o9b{5rg}S4 zw`53-U9=Q?^_iYS1VIo4`4FVi9q;dKkL14z#U>&5>2EauO(-@Axlezi`ENo&6Y