diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1ace53303a2..754d55ebea2 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -294,10 +294,37 @@ icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" +/* + * Comic books + */ +/obj/item/toy/comic + name = "comic book" + desc = "A magazine presenting a fictional story through a sequence of images. Perfect for those long, boring shifts." + icon = 'icons/obj/toy.dmi' + icon_state = "comic" + item_state = "comic" + +/obj/item/toy/comic/inspector + name = "inspector 404 manga" + desc = "Inspector 404 follows the adventures of the titular I404, a shell inspector from Konyang. This issue, #67, follows the \ + 404, also known as Kyung-Sun's quest to bring down the corrupt Superintendent Hayashi." + icon_state = "comicinspector" + item_state = "comicinspector" + +/obj/item/toy/comic/stormman + name = "stormman manga" + desc = "Stormman, often stylized as STORMMAN! is one of Konyang's most beloved anime series, following a masked superhero named Stormman \ + who has the power to harness the weather to defend his homeworld while keeping his secret identity. Since its release, all kinds of merchandise \ + have been made, including a conversion of the show to a paperback manga." + icon_state = "comicstormman" + item_state = "comicstormman" + + /* * Toy crossbow */ + /obj/item/toy/crossbow name = "foam dart crossbow" desc = "A weapon favored by many overactive children. Ages 8 and up." diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index 6ecb13d18bc..d2ee03de19c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm @@ -13,6 +13,18 @@ display_name = "headphones" path = /obj/item/clothing/ears/earmuffs/headphones +/datum/gear/ears/double/earphones + display_name = "earphones selection" + description = "A selection of earphones." + path = /obj/item/clothing/ears/earmuffs/headphones/earphones + +/datum/gear/ears/double/earphones/New() + ..() + var/list/earphones = list() + earphones["earphones"] = /obj/item/clothing/ears/earmuffs/headphones/earphones + earphones["blue earphones"] = /obj/item/clothing/ears/earmuffs/headphones/earphones/blue + gear_tweaks += new /datum/gear_tweak/path(earphones) + /datum/gear/ears/earrings display_name = "earring selection" description = "A selection of eye-catching earrings." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 1b10208278a..205603fa07a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -276,6 +276,19 @@ plushies["plushie, Aphy"] = /obj/item/toy/plushie/ipc gear_tweaks += new /datum/gear_tweak/path(plushies) +/datum/gear/comic + display_name = "comic selection" + description = "A selection of comics and manga from across the Spur." + path = /obj/item/toy/comic + +/datum/gear/comic/New() + ..() + var/list/comics = list() + comics["comic book"] = /obj/item/toy/comic + comics["comic book"] = /obj/item/toy/comic/inspector + comics["comic book"] = /obj/item/toy/comic/stormman + gear_tweaks += new /datum/gear_tweak/path(comics) + /datum/gear/toothpaste display_name = "toothpaste and toothbrush" path = /obj/item/storage/box/toothpaste diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index feed856e1a0..4f6cc8a82e2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -273,6 +273,10 @@ display_name = "non la hat" path = /obj/item/clothing/head/nonla +/datum/gear/head/konyang + display_name = "gat" + path = /obj/item/clothing/head/konyang + /datum/gear/head/iac display_name = "IAC headgear selection" description = "A selection of hats worn by Interstellar Aid Corps volunteers." diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 1c263992817..b01c079b591 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -70,6 +70,19 @@ cape["tribunalist surcoat"] = /obj/item/clothing/accessory/poncho/dominia/red/surcoat gear_tweaks += new /datum/gear_tweak/path(cape) +/datum/gear/religion/assunzione/robe + display_name = "assunzione robe selection" + description = "A selection of robes worn by adherents to Luceism." + path = /obj/item/clothing/accessory/poncho/assunzione + +/datum/gear/religion/assunzione/robe/New() + ..() + var/list/assunzionerobe = list() + assunzionerobe["assunzione robe"] = /obj/item/clothing/accessory/poncho/assunzione + assunzionerobe["assunzione vine-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/vine + assunzionerobe["assunzione gold-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/gold + gear_tweaks += new /datum/gear_tweak/path(assunzionerobe) + /datum/gear/religion/dominia/accessory display_name = "tribunal necklace" path = /obj/item/clothing/accessory/dominia diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 718c11f5e5d..9504b26fa45 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -134,7 +134,7 @@ datum/gear/suit/colorvest iac_outerwear["IAC vest"] = /obj/item/clothing/suit/storage/iacvest iac_outerwear["IAC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/iac gear_tweaks += new /datum/gear_tweak/path(iac_outerwear) - + /datum/gear/suit/poncho display_name = "poncho selection" path = /obj/item/clothing/accessory/poncho @@ -439,6 +439,23 @@ datum/gear/suit/colorvest path = /obj/item/clothing/suit/storage/toggle/overlay/submariner flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/suit/konyang + display_name = "konyanger outerwear selection" + description = "A selection of jackets and coats from the wind-beaten shores of Konyang." + path = /obj/item/clothing/suit/storage/hooded/wintercoat/konyang + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/konyang/New() + ..() + var/list/konyangcoat = list() + konyangcoat["konyang village coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/konyang + konyangcoat["red konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang + konyangcoat["red short-sleeved konyanger jacket"] = /obj/item/clothing/suit/storage/toggle/konyang/akira + konyangcoat["red konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/pants + konyangcoat["orange konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/orange + konyangcoat["blue konyanger jumpjacket"] = /obj/item/clothing/suit/storage/toggle/konyang/blue + gear_tweaks += new /datum/gear_tweak/path(konyangcoat) + /datum/gear/suit/gadpathur display_name = "gadpathurian coat selection" path = /obj/item/clothing/suit/storage/gadpathur diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 546b4b4d2f1..42103710bb9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -364,8 +364,19 @@ var/list/hanbok = list() hanbok["magenta-blue hanbok"] = /obj/item/clothing/under/konyang hanbok["white-pink hanbok"] = /obj/item/clothing/under/konyang/pink + hanbok["male hanbok"] = /obj/item/clothing/under/konyang/male gear_tweaks += new /datum/gear_tweak/path(hanbok) +/datum/gear/uniform/konyang + display_name = "konyanger dress" + path = /obj/item/clothing/under/konyangdress + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/uniform/zhongshan + display_name = "zhongshan suit" + path = /obj/item/clothing/under/zhongshan + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + /datum/gear/uniform/gadpathur display_name = "gadpathurian fatigues" path = /obj/item/clothing/under/uniform/gadpathur diff --git a/code/modules/clothing/ears/earmuffs.dm b/code/modules/clothing/ears/earmuffs.dm index c3925077b24..b092251897b 100644 --- a/code/modules/clothing/ears/earmuffs.dm +++ b/code/modules/clothing/ears/earmuffs.dm @@ -11,7 +11,7 @@ name = "headphones" desc = "Unce unce unce unce." var/headphones_on = 0 - icon_state = "headphones_off" + icon_state = "headphones" item_state = "headphones" /obj/item/clothing/ears/earmuffs/headphones/attack_self(mob/user) @@ -27,12 +27,22 @@ return if(headphones_on) - icon_state = "headphones_off" + icon_state = initial(icon_state) headphones_on = 0 - to_chat(usr, "You turn the music off.") + to_chat(usr, SPAN_NOTICE("You turn the music off.")) else - icon_state = "headphones_on" + icon_state = "[initial(icon_state)]_on" headphones_on = 1 - to_chat(usr, "You turn the music on.") + to_chat(usr, SPAN_NOTICE("You turn the music on.")) - update_clothing_icon() \ No newline at end of file + update_clothing_icon() + +/obj/item/clothing/ears/earmuffs/headphones/earphones + name = "earphones" + icon_state = "earphones" + item_state = "earphones" + +/obj/item/clothing/ears/earmuffs/headphones/earphones/blue + name = "blue earphones" + icon_state = "earphones_blue" + item_state = "earphones_blue" diff --git a/code/modules/clothing/factions/konyang.dm b/code/modules/clothing/factions/konyang.dm index 680a4f50dd8..669aec304b3 100644 --- a/code/modules/clothing/factions/konyang.dm +++ b/code/modules/clothing/factions/konyang.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/konyang name = "hanbok" - desc = "A traditional Konyang hanbok." + desc = "A traditional Konyanger hanbok." desc_fluff = "An ancient form of dress carried over from Earth by the initial Konyang colonists; the hanbok has since become a symbol of Konyang and its most iconic formalwear." icon_state = "hanbok" worn_state = "hanbok" @@ -9,8 +9,67 @@ /obj/item/clothing/under/konyang/pink name = "pink hanbok" - desc = "A traditional Konyang hanbok. This one is pink and white." + desc = "A traditional Konyanger hanbok. This one is pink and white." icon_state = "hanbok_pink" worn_state = "hanbok_pink" item_state = "hanbok_pink" slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING + +/obj/item/clothing/under/konyang/male + desc = "A traditional Konyanger hanbok tailored for men." + icon_state = "hanbok_male" + worn_state = "hanbok_male" + item_state = "hanbok_male" + slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING + +/obj/item/clothing/suit/storage/toggle/konyang + name = "konyanger jacket" + desc = "A remarkably breathable yet water-resistant jacket from Konyang." + icon = 'icons/clothing/suits/konyang_jacket.dmi' + icon_state = "konyang_jacket" + item_state = "konyang_jacket" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/konyang/akira + icon_state = "konyang_jacket_akira" + item_state = "konyang_jacket_akira" + +/obj/item/clothing/suit/storage/toggle/konyang/pants + name = "konyanger jumpjacket" + desc = "A remarkably breathable yet water-resistant jacket from Konyang. This one comes with pant legs to keep water out." + icon_state = "konyang_jacket_pants" + item_state = "konyang_jacket_pants" + +/obj/item/clothing/suit/storage/toggle/konyang/orange + name = "konyanger jumpjacket" + desc = "A remarkably breathable yet water-resistant jacket from Konyang. This one comes with pant legs to keep water out." + icon_state = "konyang_jacket_orange" + item_state = "konyang_jacket_orange" + +/obj/item/clothing/suit/storage/toggle/konyang/blue + name = "konyanger jumpjacket" + desc = "A remarkably breathable yet water-resistant jacket from Konyang. This one comes with pant legs to keep water out." + icon_state = "konyang_jacket_blue" + item_state = "konyang_jacket_blue" + +/obj/item/clothing/head/konyang + name = "gat" + desc = "A traditional hat worn on Konyang and originating on Earth." + desc_fluff = "Although traditionally made from horsehair, many different types of fabrics, including water-resistant fibres from feathers are now used." + icon = 'icons/clothing/head/konyang_gat.dmi' + icon_state = "konyang_gat" + item_state = "konyang_gat" + contained_sprite = TRUE + +/obj/item/clothing/under/konyangdress + name = "konyanger dress" + desc = "A loose-fitting and modern Konyanger dress designed to beat the heat while remaining water-resistant." + desc_fluff = "Konyanger clothes are often designed to remain both water-resistant and breathable, made of light fabrics that can \ + only be sourced on the planet. Not all clothes are made equal, however, and plant-derived plastics and cloth have found just as much use as the \ + 'miracle weave' in an attempt to keep costs down." + icon = 'icons/clothing/under/uniforms/konyang_dress.dmi' + icon_state = "konyang_dress" + worn_state = "konyang_dress" + item_state = "konyang_dress" + slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 4512f077813..d448ab75a42 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -250,6 +250,17 @@ icon_state = "hoodie_sleeveless" item_state = "hoodie_sleeveless" +/obj/item/clothing/suit/storage/hooded/wintercoat/konyang + name = "konyang village coat" + desc = "A highly prized hooded coat with unmatched breathability and insulation. Imported from Konyang, this garment is made with a weave derived from the feathers of indigenous birds." + icon_state = "konyang_village" + item_state = "konyang_village" + hoodtype = /obj/item/clothing/head/winterhood/konyang + +/obj/item/clothing/head/winterhood/konyang + name = "konyang village hood" + desc = "A light, waterproof hood attached to a Konyanger coat." + /obj/item/clothing/suit/storage/hooded/wintercoat/mars name = "martian hoodie" desc = "An orange hoodie jacket featuring the face of Warrant Officer August 'Gus' Maldarth, typically worn as a symbol of both solidarity with Mars, and a sign of protest against the Sol Alliance government. \ @@ -274,4 +285,4 @@ /obj/item/clothing/head/winterhood/colorable/update_icon(mob/user) . = ..() - \ No newline at end of file + diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 4a5334508e9..f29fec3f134 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -607,6 +607,30 @@ item_state = "trinary_shouldercape" overlay_state = "trinary_shouldercape" +/obj/item/clothing/accessory/poncho/assunzione + name = "assunzione robe" + desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione." + icon = 'icons/clothing/suits/capes/assunzione_robe.dmi' + icon_override = null + icon_state = "assunzione_robe" + item_state = "assunzione_robe" + overlay_state = "assunzione_robe" + contained_sprite = TRUE + +/obj/item/clothing/accessory/poncho/assunzione/vine + desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione. This one features a lux vine \ + inlay that allows the symbol of the Luceian Square to be faintly seen, even in darkness." + icon_state = "assunzione_robe_vine" + item_state = "assunzione_robe_vine" + overlay_state = "assunzione_robe_vine" + +/obj/item/clothing/accessory/poncho/assunzione/gold + desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione. The Luceian Square, Luceism's \ + holy symbol is present on the back in gold fabric." + icon_state = "assunzione_robe_gold" + item_state = "assunzione_robe_gold" + overlay_state = "assunzione_robe_gold" + //tau ceti legion ribbons /obj/item/clothing/accessory/legion name = "seniority ribbons" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b0aa7609f62..56c0ad399c0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -469,6 +469,12 @@ icon_state = "swim_red" siemens_coefficient = 1 +/obj/item/clothing/under/zhongshan + name = "zhongshan" + desc = "A type of tunic suit popular in Earth's Federal Republic of China." + icon_state = "zhongshan" + item_state = "zhongshan" + /obj/item/clothing/under/kimono name = "kimono" desc = "A traditional Japanese kimono." diff --git a/html/changelogs/Stryker-Loadout11.yml b/html/changelogs/Stryker-Loadout11.yml new file mode 100644 index 00000000000..01f2578a49b --- /dev/null +++ b/html/changelogs/Stryker-Loadout11.yml @@ -0,0 +1,46 @@ +################################ +# 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, Kyres1, The Lancer + +# 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 earphones to the loadout in the loadout Earwear tab." + - rscadd: "Added Konyanger jackets (blue, orange, and red with variants) and a Konyanger overcoat to the loadout suits and overwear tab." + - rscadd: "Added a male hanbok to the hanbok selection and a Konyanger dress to the uniform tab." + - rscadd: "Adds a gat to the loadout hat tab." + - rscadd: "Added Assunzione robes to the loadout Religion tab." + - rscadd: "Added comic books and manga to the loadout general tab." diff --git a/icons/clothing/head/konyang_gat.dmi b/icons/clothing/head/konyang_gat.dmi new file mode 100644 index 00000000000..dbe3d5bf17d Binary files /dev/null and b/icons/clothing/head/konyang_gat.dmi differ diff --git a/icons/clothing/suits/capes/assunzione_robe.dmi b/icons/clothing/suits/capes/assunzione_robe.dmi new file mode 100644 index 00000000000..1d09e53cfef Binary files /dev/null and b/icons/clothing/suits/capes/assunzione_robe.dmi differ diff --git a/icons/clothing/suits/konyang_jacket.dmi b/icons/clothing/suits/konyang_jacket.dmi new file mode 100644 index 00000000000..8e74560789e Binary files /dev/null and b/icons/clothing/suits/konyang_jacket.dmi differ diff --git a/icons/clothing/under/uniforms/konyang_dress.dmi b/icons/clothing/under/uniforms/konyang_dress.dmi new file mode 100644 index 00000000000..5ab87840534 Binary files /dev/null and b/icons/clothing/under/uniforms/konyang_dress.dmi differ diff --git a/icons/mob/items/lefthand_toy.dmi b/icons/mob/items/lefthand_toy.dmi index 83716d0ca64..cb5561cede2 100644 Binary files a/icons/mob/items/lefthand_toy.dmi and b/icons/mob/items/lefthand_toy.dmi differ diff --git a/icons/mob/items/righthand_books.dmi b/icons/mob/items/righthand_books.dmi index fbe07da54f3..130c86a08cd 100644 Binary files a/icons/mob/items/righthand_books.dmi and b/icons/mob/items/righthand_books.dmi differ diff --git a/icons/mob/items/righthand_toy.dmi b/icons/mob/items/righthand_toy.dmi index 5e0760a66de..a34ef7e54ee 100644 Binary files a/icons/mob/items/righthand_toy.dmi and b/icons/mob/items/righthand_toy.dmi differ diff --git a/icons/mob/l_ear.dmi b/icons/mob/l_ear.dmi index 6beb206d86a..b8d3171996c 100644 Binary files a/icons/mob/l_ear.dmi and b/icons/mob/l_ear.dmi differ diff --git a/icons/mob/r_ear.dmi b/icons/mob/r_ear.dmi index 86bf4927a4e..cfe4201a358 100644 Binary files a/icons/mob/r_ear.dmi and b/icons/mob/r_ear.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d7ead7aa9c0..636f1a66e3d 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 5ed115a66d7..44c574b5174 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index f3a457ba434..0c6b6734582 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index f805103f909..428cc9b8b38 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/hoodies.dmi b/icons/obj/hoodies.dmi index a9aa59b5cb1..51eb73489ec 100644 Binary files a/icons/obj/hoodies.dmi and b/icons/obj/hoodies.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 4bf772d2e8c..c1b13d4ec74 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 298bcb7c435..64b4383122a 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ