diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index 8ba70a6c316..61db2b548dd 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -143,4 +143,11 @@ description = "The so-called \"Deep Frontier\" accent is not truly a unified accent at all, and instead defines a broad range of accents from the more \"wild\" frontier outside of human control. \ Those with these accents are almost universally looked down upon as wild savages by their counterparts in more civilized space at best. Speakers of this accent are almost always found in lower-end \ positions in civilized space, due to the typically impoverished and anarchic nature of the Deep Frontier." - tag_icon = "deepfrontier" \ No newline at end of file + tag_icon = "deepfrontier" + +/datum/accent/fisanduh + name = ACCENT_FISANDUH + description = "While it is similar to the typical Morozian accent, to those not familiar with it; or not from the Empire of Dominia, the standard Fisanduhian accent has some variations that mark it as distinctive. \ + The accent is higher pitched than its Dominian counterpart, and has been described as more tonal. Members of the Fisanduh Freedom Front will often go to great lengths to disguise this accent, \ + though most will slip back into it when off-world." + tag_icon = "fisanduh" diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 85a7d51bf4a..7c911649698 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -72,6 +72,7 @@ #define ACCENT_EUROPA "Europan" #define ACCENT_EARTH "Earther" #define ACCENT_DEEPFRONTIER "Deep Frontier" +#define ACCENT_FISANDUH "Fisanduhian" #define ACCENT_REPUBICLANSIIK "Republican Siik'maas" #define ACCENT_NAZIRASIIK "Nazira Siik'maas" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 2eefca4ddd2..79796783d25 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -48,6 +48,11 @@ armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac gear_tweaks += new/datum/gear_tweak/path(armbands) +/datum/gear/accessory/armband_coloured + display_name = "armband (colourable)" + path = /obj/item/clothing/accessory/armband/colourable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/holster display_name = "holster selection" path = /obj/item/clothing/accessory/holster/armpit diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 938a3000888..54b7c06edc5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -18,6 +18,11 @@ slot = slot_wear_suit faction = "Idris Incorporated" +/datum/gear/faction/idris_armband + display_name = "idris armband" + path = /obj/item/clothing/head/beret/sec/idris + faction = "Idris Incorporated" + /datum/gear/faction/zavodskoi_beret display_name = "brown zavodskoi beret" path = /obj/item/clothing/head/beret/sec/zavodskoi diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 20f9498a213..658a8c55d69 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -270,3 +270,8 @@ display_name = "vysokan fur cap" path = /obj/item/clothing/head/soft/vysoka flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/buckethat + display_name = "bucket hat" + path = /obj/item/clothing/head/buckethat + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 3ffc95eb94e..a2b76e72957 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -305,10 +305,17 @@ gear_tweaks += new/datum/gear_tweak/path(cardigan) /datum/gear/suit/himeo - display_name = "himean coat" + display_name = "himean coat selection" path = /obj/item/clothing/suit/storage/toggle/himeo flags = GEAR_HAS_DESC_SELECTION +/datum/gear/suit/himeo/New() + ..() + var/coat = list() + coat["brown himean bekesha"] = /obj/item/clothing/suit/storage/toggle/himeo + coat["grey himean bekesha"] = /obj/item/clothing/suit/storage/toggle/himeo/grey + gear_tweaks += new/datum/gear_tweak/path(coat) + /datum/gear/suit/vysoka display_name = "chokha selection" description = "A selection of Vysokan chokhas." diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index baf2d11ff17..76d396032fe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -59,6 +59,8 @@ skirts["high skirt"] = /obj/item/clothing/under/skirt/high skirts["skater skirt"] = /obj/item/clothing/under/skirt/skater skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube + skirts["jumper skirt"] = /obj/item/clothing/under/skirt/jumper + skirts["jumper dress"] = /obj/item/clothing/under/skirt/jumper_highcut gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit diff --git a/code/modules/clothing/factions/himeo.dm b/code/modules/clothing/factions/himeo.dm index 8c2dd8ba97f..e07b23adf6c 100644 --- a/code/modules/clothing/factions/himeo.dm +++ b/code/modules/clothing/factions/himeo.dm @@ -7,6 +7,11 @@ item_state = "coat_himeo" contained_sprite = TRUE +/obj/item/clothing/suit/storage/toggle/himeo/grey + icon = 'icons/clothing/suits/coats/himeo_coat_grey.dmi' + icon_state = "coat_himeo_grey" + item_state = "coat_himeo_grey" + /obj/item/clothing/head/soft/himeo name = "himean cap" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8c1fe53d3fd..9027971fb5b 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -698,3 +698,8 @@ desc = "A padded skullcap for those prone to bumping their heads against hard surfaces." icon_state = "tank" flags_inv = BLOCKHEADHAIR + +/obj/item/clothing/head/buckethat + name = "bucket hat" + desc = "A hat with an all-around visor. Only slightly better than wearing an actual bucket." + icon_state = "buckethat" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 95568dcbcc0..8264dacde3e 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -60,4 +60,15 @@ /obj/item/clothing/accessory/armband/offworlder/medical name = "medical exo-stellar ribbon" desc = "Durable cloth meant to be worn over or attached to the chest pieces of the ESS modules. This one is white and green." - icon_state = "ribbon_med" \ No newline at end of file + icon_state = "ribbon_med" + +/obj/item/clothing/accessory/armband/idris + name = "\improper Idris Incorporated armband" + desc = "A armband, worn by contractors to denote which company they're from. This one shows the Idris Incorporated logo displayed on a cyan background." + icon_state = "idris_armband" + overlay_state = "idris_armband" + +/obj/item/clothing/accessory/armband/colourable + name = "armband" + desc = "An armband in 16,777,216 designer colors." + icon_state = "armband_colour" \ No newline at end of file diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index f3cb7701135..759f6413dfa 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -91,3 +91,19 @@ item_state = "crskirt" worn_state = "crskirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +/obj/item/clothing/under/skirt/jumper + name = "jumper skirt" + desc = "A short skirt with two large shoulder straps." + desc_fluff = "Too tall or too short? Too bad. These shoulder straps can't be adjusted." + icon_state = "skirt_jumper" + worn_state = "skirt_jumper" + item_state = "skirt_jumper" + +/obj/item/clothing/under/skirt/jumper_highcut + name = "jumper dress" + desc = "A garment with open sides that seems to be a cross between a dress and an apron." + desc_fluff = "You could achieve the same effect with two aprons, we're pretty sure." + icon_state = "skirt_jumper_highcut" + worn_state = "skirt_jumper_highcut" + item_state = "skirt_jumper_highcut" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 5f5e44ab7b8..c3f22a8e1a2 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -236,7 +236,7 @@ var/list/allowed_religions = list(RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_JUDAISM, RELIGION_HINDU, RELIGION_BUDDHISM, RELIGION_MOROZ, RELIGION_TRINARY, RELIGION_SCARAB, RELIGION_TAOISM) var/default_citizenship = CITIZENSHIP_BIESEL var/list/allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_MARTIAN, ACCENT_LUNA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, - ACCENT_ERIDANIDREG, ACCENT_VYSOKA, ACCENT_HIMEO, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_DOMINIA, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_DEEPFRONTIER) + ACCENT_ERIDANIDREG, ACCENT_VYSOKA, ACCENT_HIMEO, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_DOMINIA, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_DEEPFRONTIER, ACCENT_FISANDUH) var/default_accent = ACCENT_CETI var/zombie_type //What zombie species they become var/list/character_color_presets diff --git a/html/changelogs/stryker-moreclothes.yml b/html/changelogs/stryker-moreclothes.yml new file mode 100644 index 00000000000..c81fd64f40f --- /dev/null +++ b/html/changelogs/stryker-moreclothes.yml @@ -0,0 +1,44 @@ +################################ +# 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: The Stryker, Mwahahahaha + +# 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 colorable armband to the loadout by Mwahahahaha as well as an Idris armband." + - rscadd: "Adds a bucket hat, jumper dress and jumper skirt (skirt selection) with flavor text provided by NiennaB to the loadout." + - rscadd: "Adds a Fisanduh accent for humans only, description provided by NewOriginalSchwann." + - rscadd: "Adds a grey Himean coat to the loadout." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 8812f5f07ad..f0eca9c88ce 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ diff --git a/icons/clothing/suits/coats/himeo_coat_grey.dmi b/icons/clothing/suits/coats/himeo_coat_grey.dmi new file mode 100644 index 00000000000..ba7595ebe51 Binary files /dev/null and b/icons/clothing/suits/coats/himeo_coat_grey.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b9a7e714e04..09d077e3419 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 7eba28f093f..aec6492b62c 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2d21754529e..f4321277de8 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index 2094b45c4c1..2d7260d524d 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/clothing/skirts.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index e3918c60ba2..e533e001bd7 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ