diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index c49cda07381..fa9dee96139 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -146,6 +146,21 @@ averagetypes[initial(average.name)] = average gear_tweaks += new/datum/gear_tweak/path(sortAssoc(averagetypes)) +/datum/gear/accessory/capes + display_name = "shoulder capes (Skrell)" + path = /obj/item/clothing/accessory/poncho/shouldercape + whitelisted = list("Skrell") + sort_category = "Xenowear - Skrell" + +/datum/gear/accessory/capes/New() + ..() + var/capes = list() + capes["star cape"] = /obj/item/clothing/accessory/poncho/shouldercape/star + capes["nebula cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nebula + capes["nova cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nova + capes["galaxy cape"] = /obj/item/clothing/accessory/poncho/shouldercape/galaxy + gear_tweaks += new/datum/gear_tweak/path(capes) + //vaurca items /datum/gear/eyes/blindfold @@ -380,6 +395,23 @@ sort_category = "Xenowear" whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") +/datum/gear/shoes/caligae + display_name = "caligae" + path = /obj/item/clothing/shoes/caligae + whitelisted = list("Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + sort_category = "Xenowear" + +/datum/gear/shoes/caligae/New() + ..() + var/caligae = list() + caligae["no sock"] = /obj/item/clothing/shoes/caligae + caligae["black sock"] = /obj/item/clothing/shoes/caligae/black + caligae["grey sock"] = /obj/item/clothing/shoes/caligae/grey + caligae["white sock"] = /obj/item/clothing/shoes/caligae/white + gear_tweaks += new/datum/gear_tweak/path(caligae) + +//ipc stuff + /datum/gear/head/goldenchains display_name = "golden deep headchains (Machine)" path = /obj/item/clothing/head/headchain diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 2e504248462..d31805967b7 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -179,4 +179,33 @@ max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0) siemens_coefficient = 0.9 - can_hold_knife = 1 \ No newline at end of file + can_hold_knife = 1 + +/obj/item/clothing/shoes/caligae + name = "caligae" + desc = "The standard Unathi marching footwear loosly resembles the Roman Caligae. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection." + description_fluff = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. Originally used for warriors, they became widespread for their comfort and durability. Some are worn with socks, for warmth. Although made for the Unathi anatomy, they have picked up popularity among other species." + icon_state = "caligae" + item_state = "caligae" + force = 5 + armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + body_parts_covered = FEET|LEGS + species_restricted = null + +/obj/item/clothing/shoes/caligae/white + name = "white caligae" + desc = "The standard Unathi marching footwear loosly resembles the Roman caligae. Made of leather and rubber, their unique design allows for improved traction and protection. /This one has a white covering." + icon_state = "whitecaligae" + item_state = "whitecaligae" + +/obj/item/clothing/shoes/caligae/grey + name = "grey caligae" + desc = "The standard Unathi marching footwear loosly resembles the Roman caligae. Made of leather and rubber, their unique design allows for improved traction and protection. /This one has a grey covering." + icon_state = "greycaligae" + item_state = "greycaligae" + +/obj/item/clothing/shoes/caligae/black + name = "black caligae" + desc = "The standard Unathi marching footwear loosly resembles the Roman caligae. Made of leather and rubber, their unique design allows for improved traction and protection. /This one has a black covering." + icon_state = "blackcaligae" + item_state = "blackcaligae" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index c2c55c85b2c..4273593bebd 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -263,11 +263,10 @@ item_state = "suspenders" /obj/item/clothing/accessory/scarf - name = "scarf" + name = "white scarf" desc = "A simple scarf, to protect your neck from the cold of space." icon_state = "whitescarf" item_state = "whitescarf" - slot = "over" /obj/item/clothing/accessory/scarf/yellow name = "yellow scarf" @@ -502,8 +501,38 @@ icon_state = "seccloak" item_state = "seccloak" -//tau ceti legion ribbons +/obj/item/clothing/accessory/poncho/shouldercape + name = "shoulder cape" + desc = "A simple shoulder cape." + description_fluff = "In Skrellian tradition, the length of cape typically signifies experience in various fields." + icon_state = "starcape" + item_state = "starcape" +/obj/item/clothing/accessory/poncho/shouldercape/star + name = "star cape" + desc = "A simple looking cape with a couple of runes woven into the fabric." + icon_state = "starcape" + item_state = "starcape" + +/obj/item/clothing/accessory/poncho/shouldercape/nebula + name = "nebula cape" + desc = "A decorated cape. Starry patterns have been woven into the fabric." + icon_state = "nebulacape" + item_state = "nebulacape" + +/obj/item/clothing/accessory/poncho/shouldercape/nova + name = "nova cape" + desc = "A heavily decorated cape with emblems on the shoulders. An ornate starry design has been woven into the fabric of it" + icon_state = "novacape" + item_state = "novacape" + +/obj/item/clothing/accessory/poncho/shouldercape/galaxy + name = "galaxy cape" + desc = "An extremely decorated cape with an intricately made design has been woven into the fabric of this cape with great care." + icon_state = "galaxycape" + item_state = "galaxycape" + +//tau ceti legion ribbons /obj/item/clothing/accessory/legion name = "seniority ribbons" desc = "A ribbon meant to attach to the chest and sling around the shoulder accompanied by two medallions, marking seniority in a Tau Ceti Foreign Legion." @@ -515,4 +544,4 @@ name = "specialist medallion" desc = "Two small medallions, one worn on the shoulder and the other worn on the chest. Meant to display the rank of specialist troops in a Tau Ceti Foreign Legion." icon_state = "specialist_medallion" - item_state = "specialist_medallion" \ No newline at end of file + item_state = "specialist_medallion" diff --git a/html/changelogs/paradoxspace-romulus.yml b/html/changelogs/paradoxspace-romulus.yml new file mode 100644 index 00000000000..73fa3e457e3 --- /dev/null +++ b/html/changelogs/paradoxspace-romulus.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: ParadoxSpace + +# 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: "Imports some more durable sandals for clawed species, and shoulder capes from the Jargon Federation." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index fa032f547cf..4658227809d 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 0cac2a71596..9326d2e30d3 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 300dba9d9fb..617c5a3fc4e 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index b0a03cbc05c..827f6ed5966 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ