diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 6813b0862a2..f0b998cfc5a 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -187,3 +187,56 @@ A.dropInto(loc) user.visible_message("[user] pours \the [A] out from \the [src].", "You pour \the [A] out from \the [src].") desc = "A vase used to store the ashes of the deceased." + +/obj/item/assunzioneorb + name = "warding sphere" + desc = "A religious artefact commonly associated with Luceism, this transparent globe gives off a faint ghostly white light at all times." + desc_fluff = "Luceian warding spheres are made on the planet of Assunzione in the great domed city of Guelma, and are carried by followers of the faith heading abroad. \ + Constructed out of glass and a luce vine bulb these spheres can burn for years upon years, and it is said that the lights in the truly faithful's warding sphere will always \ + point towards Assunzione. It is considered extremely bad luck to have one's warding sphere break, to extinguish its flame, or to relinquish it (permanently) to an unbeliever." + icon = 'icons/obj/weapons.dmi' + icon_state = "assunzioneorb" + item_state = "assunzioneorb" + throwforce = 5 + force = 5 + light_range = 1.4 + light_power = 1.4 + light_color = LIGHT_COLOR_BLUE + w_class = ITEMSIZE_SMALL + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/assunzioneorb/proc/shatter() + visible_message(SPAN_WARNING("\The [src] shatters!"), SPAN_WARNING("You hear a small glass object shatter!")) + playsound(get_turf(src), 'sound/effects/glass_hit.ogg', 75, TRUE) + new /obj/item/material/shard(get_turf(src)) + qdel(src) + +/obj/item/assunzioneorb/throw_impact(atom/hit_atom) + ..() + shatter() + +/obj/item/assunzioneorb/afterattack(atom/target, mob/user, proximity) + if(!proximity) + return + if(user.a_intent != I_HURT) + return + + shatter() + +/obj/item/storage/assunzionesheath + name = "warding sphere casing" + desc = "A small metal shell designed to protect the warding sphere inside. The all-seeing eye of Ennoia, a common symbol of Luceism, is engraved upon the front of the casing." + icon = 'icons/obj/weapons.dmi' + icon_state = "assunzionesheath_empty" + can_hold = list(/obj/item/assunzioneorb) + storage_slots = 1 + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' + +/obj/item/storage/assunzionesheath/update_icon() + if(contents.len) + icon_state = "assunzionesheath" + else + icon_state = "assunzionesheath_empty" + diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d6843a059d3..17ffe1b8904 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -800,6 +800,58 @@ name = "Large Stellar Corporate Conglomerate flag" flag_size = 1 +/obj/item/flag/fisanduh + name = "Confederated States of Fisanduh flag" + desc = "A flag of the fallen Confederated States of Fisanduh." + desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \ + subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people." + flag_path = "fisanduh" + +/obj/structure/sign/flag/fisanduh + name = "Confederated States of Fisanduh flag" + desc = "A flag of the fallen Confederated States of Fisanduh." + desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \ + subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people." + icon_state = "fisanduh" + +/obj/item/flag/fisanduh/l + name = "large Confederated States of Fisanduh flag" + flag_size = 1 + +/obj/structure/sign/flag/fisanduh/left + icon_state = "fisanduh_l" + +/obj/structure/sign/flag/fisanduh/right + icon_state = "fisanduh_r" + +/obj/item/flag/gadpathur + name = "United Planetary Defense Council of Gadpathur flag" + desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \ + It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment." + desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \ + Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \ + these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall." + flag_path = "gadpathur" + +/obj/structure/sign/flag/gadpathur + name = "United Planetary Defense Council of Gadpathur flag" + desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \ + It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment." + desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \ + Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \ + these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall." + icon_state = "gadpathur" + +/obj/item/flag/gadpathur/l + name = "large United Planetary Defense Council of Gadpathur flag" + flag_size = 1 + +/obj/structure/sign/flag/gadpathur/left + icon_state = "gadpathur_l" + +/obj/structure/sign/flag/gadpathur/right + icon_state = "gadpathur_r" + /obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams) if (!adjacent) return diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index c726affd49f..3c0c047d3e0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -182,6 +182,8 @@ shirt["t-shirt"] = /obj/item/clothing/accessory/tshirt shirt["t-shirt, cropped"] = /obj/item/clothing/accessory/tshirt_crop shirt["blouse"] = /obj/item/clothing/accessory/blouse + shirt["long-sleeved blouse"] = /obj/item/clothing/accessory/longblouse + shirt["puffy blouse"] = /obj/item/clothing/accessory/puffyblouse gear_tweaks += new/datum/gear_tweak/path(shirt) /datum/gear/accessory/silversun diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index e6b958f796c..0189fc00c5e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -120,6 +120,8 @@ banners["banner, Zenghu Pharmaceuticals"] = /obj/item/flag/zenghu banners["banner, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition + banners["banner, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh + banners["banner, Gadpathur"] = /obj/item/flag/gadpathur gear_tweaks += new/datum/gear_tweak/path(banners) /datum/gear/standard @@ -165,6 +167,8 @@ flags["flag, Zeng-Hu Pharmaceuticals"] = /obj/item/flag/zenghu/l flags["flag, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi/l flags["flag, Coalition of Colonies"] = /obj/item/flag/coalition/l + flags["flag, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh/l + flags["flag, Gadpathur"] = /obj/item/flag/gadpathur/l gear_tweaks += new/datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 1760898d05e..256630da567 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -64,3 +64,17 @@ /datum/gear/religion/dominia/accessory display_name = "tribunal necklace" path = "/obj/item/clothing/accessory/dominia" + +/datum/gear/religion/assunzione/accessory + display_name = "luceian amulet" + path = "/obj/item/clothing/accessory/assunzione" + +/datum/gear/religion/assunzioneorb + display_name = "assunzione warding sphere" + description = "A religious artefact commonly associated with Luceism." + path = "/obj/item/assunzioneorb" + +/datum/gear/religion/assunzionesheath + display_name = "assunzione warding sphere sheath" + description = "A small metal shell designed to hold a warding sphere." + path = "/obj/item/storage/assunzionesheath" \ 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 7bdedaf1a7d..3e5acbfd269 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -372,6 +372,11 @@ cardigan["argyle cardigan"] = /obj/item/clothing/suit/storage/toggle/cardigan/argyle gear_tweaks += new/datum/gear_tweak/path(cardigan) +/datum/gear/suit/asymmetriccoat + display_name = "asymmetric coat" + path = /obj/item/clothing/suit/storage/toggle/asymmetriccoat + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/suit/himeo display_name = "himean coat selection" path = /obj/item/clothing/suit/storage/toggle/himeo diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 10fd18a55a8..b4bc0e60b05 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -465,6 +465,13 @@ icon_state = "peacoat" item_state = "peacoat" +/obj/item/clothing/suit/storage/toggle/asymmetriccoat + name = "asymmetric coat" + desc = "A solid sleeveless coat that only covers the upper body and the back of the legs." + icon_state = "asymmetriccoat" + item_state = "asymmetriccoat" + body_parts_covered = UPPER_TORSO + /* * Department Jackets */ diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 6c606f447f6..af0595626c7 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -178,7 +178,7 @@ name = "tie with a gold clip" build_from_parts = TRUE worn_overlay = "clip" - + /obj/item/clothing/accessory/tie/colourable/clip/silver name = "tie with a silver clip" worn_overlay = "sclip" @@ -221,6 +221,16 @@ drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' +/obj/item/clothing/accessory/assunzione + name = "luceian amulent" + desc = "A common symbol of the Luceian faith abroad this amulet featuring the religion's all-seeing eye and eight-pointed crest \ + seems to be made of real gold and gemstones. While not as critical to faithful abroad as a warding sphere, it is considered good form \ + to ensure one's amulet is well-maintained." + icon = 'icons/clothing/accessories/assunzione_amulet.dmi' + item_state = "assunzione_amulet" + icon_state = "assunzione_amulet" + contained_sprite = TRUE + /obj/item/clothing/accessory/suspenders name = "suspenders" desc = "They suspend the illusion of the mime's play." diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index 31086c0f6cb..43f66700766 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -84,6 +84,18 @@ icon_state = "blouse" item_state = "blouse" +/obj/item/clothing/accessory/longblouse + name = "long-sleeved blouse" + desc = "A long-sleeved, loose fitting garment." + icon_state = "longblouse" + item_state = "longblouse" + +/obj/item/clothing/accessory/puffyblouse + name = "puffy blouse" + desc = "A loose fitting garment with plenty of material around the arms." + icon_state = "puffyblouse" + item_state = "puffyblouse" + //Legacy /obj/item/clothing/accessory/wcoat name = "waistcoat" diff --git a/html/changelogs/stryker-loadoutpragain.yml b/html/changelogs/stryker-loadoutpragain.yml new file mode 100644 index 00000000000..3e04bb0ae12 --- /dev/null +++ b/html/changelogs/stryker-loadoutpragain.yml @@ -0,0 +1,45 @@ +################################ +# 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: Stryker, NewOriginalSchwann, Pretzel + +# 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 an asymmetric coat to the suits tab in the loadout." + - rscadd: "Adds Gadpathur and Fisanduhian flags with FTs by Schwann." + - rscadd: "Adds an Assunzione Warding Sphere and sheath to the religion tab in the loadout. FTs by Schwann." + - rscadd: "Adds an Assunzione amulet by Pretzel. FT by Schwann." + - rscadd: "Adds puffy and long sleeved blouses to the shirts tab in the loadout." diff --git a/icons/clothing/accessories/assunzione_amulet.dmi b/icons/clothing/accessories/assunzione_amulet.dmi new file mode 100644 index 00000000000..1925e31b0ce Binary files /dev/null and b/icons/clothing/accessories/assunzione_amulet.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 794f4abb3da..bdc3e0ba4ab 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 5d80a11149f..3a71e963ddf 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 7a05b797e51..d3c49178539 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 7a8d5ccd008..9db4c016256 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 09398da1e40..62ea41e3573 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 520da344d1a..7c820208058 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ