diff --git a/mods/tajara/code/clothing/accessories.dm b/mods/tajara/code/clothing/accessories.dm index 8f688b5ad6010..2e11a76b5aa06 100644 --- a/mods/tajara/code/clothing/accessories.dm +++ b/mods/tajara/code/clothing/accessories.dm @@ -340,6 +340,8 @@ /datum/gear/suit/tajara display_name = "(Tajara) vintage tajaran overcoat" path = /obj/item/clothing/suit/storage/taj_overcoat + whitelisted = list(SPECIES_TAJARA) + sort_category = "Xenowear" /datum/gear/shoes/tajara display_name = "(Tajara) vintage boots" diff --git a/mods/tajara/code/posters.dm b/mods/tajara/code/posters.dm index 128b8d8263881..7f7825d7450b1 100644 --- a/mods/tajara/code/posters.dm +++ b/mods/tajara/code/posters.dm @@ -13,93 +13,93 @@ poster_type = pick(subtypesof(/singleton/poster/tjpost)) ..() /* -/obj/structure/sign/poster/tjpost/tj_1 +/obj/structure/sign/poster/tjpost/tposter_1 icon_state = "tposter_1" - poster_type = /singleton/poster/tjpost/tj_1 + poster_type = /singleton/poster/tjpost/tposter_1 */ -/obj/structure/sign/poster/tjpost/tj_2 +/obj/structure/sign/poster/tjpost/tposter_2 icon_state = "tposter_2" - poster_type = /singleton/poster/tjpost/tj_2 + poster_type = /singleton/poster/tjpost/tposter_2 -/obj/structure/sign/poster/tjpost/tj_3 +/obj/structure/sign/poster/tjpost/tposter_3 icon_state = "tposter_3" - poster_type = /singleton/poster/tjpost/tj_3 + poster_type = /singleton/poster/tjpost/tposter_3 -/obj/structure/sign/poster/tjpost/tj_4 +/obj/structure/sign/poster/tjpost/tposter_4 icon_state = "tposter_4" - poster_type = /singleton/poster/tjpost/tj_4 + poster_type = /singleton/poster/tjpost/tposter_4 -/obj/structure/sign/poster/tjpost/tj_5 +/obj/structure/sign/poster/tjpost/tposter_5 icon_state = "tposter_5" - poster_type = /singleton/poster/tjpost/tj_5 + poster_type = /singleton/poster/tjpost/tposter_5 -/obj/structure/sign/poster/tjpost/tj_6 +/obj/structure/sign/poster/tjpost/tposter_6 icon_state = "tposter_6" - poster_type = /singleton/poster/tjpost/tj_6 + poster_type = /singleton/poster/tjpost/tposter_6 -/obj/structure/sign/poster/tjpost/tj_7 +/obj/structure/sign/poster/tjpost/tposter_7 icon_state = "tposter_7" - poster_type = /singleton/poster/tjpost/tj_7 + poster_type = /singleton/poster/tjpost/tposter_7 -/obj/structure/sign/poster/tjpost/tj_8 +/obj/structure/sign/poster/tjpost/tposter_8 icon_state = "tposter_8" - poster_type = /singleton/poster/tjpost/tj_8 + poster_type = /singleton/poster/tjpost/tposter_8 -/obj/structure/sign/poster/tjpost/tj_9 +/obj/structure/sign/poster/tjpost/tposter_9 icon_state = "tposter_9" - poster_type = /singleton/poster/tjpost/tj_9 + poster_type = /singleton/poster/tjpost/tposter_9 -/obj/structure/sign/poster/tjpost/tj_10 +/obj/structure/sign/poster/tjpost/tposter_10 icon_state = "tposter_10" - poster_type = /singleton/poster/tjpost/tj_10 + poster_type = /singleton/poster/tjpost/tposter_10 -/obj/structure/sign/poster/tjpost/tj_11 +/obj/structure/sign/poster/tjpost/tposter_11 icon_state = "tposter_11" - poster_type = /singleton/poster/tjpost/tj_11 + poster_type = /singleton/poster/tjpost/tposter_11 -/obj/structure/sign/poster/tjpost/tj_12 +/obj/structure/sign/poster/tjpost/tposter_12 icon_state = "tposter_12" - poster_type = /singleton/poster/tjpost/tj_12 + poster_type = /singleton/poster/tjpost/tposter_12 -/obj/structure/sign/poster/tjpost/tj_13 +/obj/structure/sign/poster/tjpost/tposter_13 icon_state = "tposter_13" - poster_type = /singleton/poster/tjpost/tj_13 + poster_type = /singleton/poster/tjpost/tposter_13 -/obj/structure/sign/poster/tjpost/tj_14 +/obj/structure/sign/poster/tjpost/tposter_14 icon_state = "tposter_14" - poster_type = /singleton/poster/tjpost/tj_14 + poster_type = /singleton/poster/tjpost/tposter_14 -/obj/structure/sign/poster/tjpost/tj_15 +/obj/structure/sign/poster/tjpost/tposter_15 icon_state = "tposter_15" - poster_type = /singleton/poster/tjpost/tj_15 + poster_type = /singleton/poster/tjpost/tposter_15 -/obj/structure/sign/poster/tjpost/tj_16 +/obj/structure/sign/poster/tjpost/tposter_16 icon_state = "tposter_16" - poster_type = /singleton/poster/tjpost/tj_16 + poster_type = /singleton/poster/tjpost/tposter_16 -/obj/structure/sign/poster/tjpost/tj_17 +/obj/structure/sign/poster/tjpost/tposter_17 icon_state = "tposter_17" - poster_type = /singleton/poster/tjpost/tj_17 + poster_type = /singleton/poster/tjpost/tposter_17 -/obj/structure/sign/poster/tjpost/tj_18 +/obj/structure/sign/poster/tjpost/tposter_18 icon_state = "tposter_18" - poster_type = /singleton/poster/tjpost/tj_18 + poster_type = /singleton/poster/tjpost/tposter_18 -/obj/structure/sign/poster/tjpost/tj_19 +/obj/structure/sign/poster/tjpost/tposter_19 icon_state = "tposter_19" - poster_type = /singleton/poster/tjpost/tj_19 + poster_type = /singleton/poster/tjpost/tposter_19 -/obj/structure/sign/poster/tjpost/tj_20 +/obj/structure/sign/poster/tjpost/tposter_20 icon_state = "tposter_20" - poster_type = /singleton/poster/tjpost/tj_20 + poster_type = /singleton/poster/tjpost/tposter_20 -/obj/structure/sign/poster/tjpost/tj_21 +/obj/structure/sign/poster/tjpost/tposter_21 icon_state = "tposter_21" - poster_type = /singleton/poster/tjpost/tj_21 + poster_type = /singleton/poster/tjpost/tposter_21 -/obj/structure/sign/poster/tjpost/tj_22 +/obj/structure/sign/poster/tjpost/tposter_22 icon_state = "tposter_22" - poster_type = /singleton/poster/tjpost/tj_22 + poster_type = /singleton/poster/tjpost/tposter_22 /singleton/poster/tjpost icon_state = "tposter" @@ -107,121 +107,121 @@ desc = "A memorable photo, which depicted how the soldiers of the Kaytam clan raise their flag \ over the overseer citadel in Naliar. Looks like one of CCA posters..." /* let's try to not use posters of specific groups, like governments or corporations -/singleton/poster/tjpost/tj_1 +/singleton/poster/tjpost/tposter_1 icon_state = "tposter_1" name = "CCA emblem" desc = "A poster with an emblem of CCA." */ -/singleton/poster/tjpost/tj_2 +/singleton/poster/tjpost/tposter_2 icon_state = "tposter_2" name = "Patriotic poster" desc = "It reminds you that the galaxy around is not very friendly, and you should watch your safety yourself." -/singleton/poster/tjpost/tj_3 +/singleton/poster/tjpost/tposter_3 icon_state = "tposter_3" name = "Technical poster" desc = "It is a guide on how to use the carabiner TV-3C, there is detailed \ information about assembly, disassembly, and maintenance, but one of the written dialects of Ahdomai. \ An another one of CCA posters." -/singleton/poster/tjpost/tj_4 +/singleton/poster/tjpost/tposter_4 icon_state = "tposter_4" name = "Jet poster" desc = "It shows one of the most common fighter-interceptor FLA. An image at port shows CCA insignia." -/singleton/poster/tjpost/tj_5 +/singleton/poster/tjpost/tposter_5 icon_state = "tposter_5" name = "Heli-poster" desc = "It shows transport helicopters flying over the ruins of the suburbs of Naliar. \ The photo was taken shortly before the final assault, and saw him every tajaran. \ An another one historian posters of CCA." -/singleton/poster/tjpost/tj_6 +/singleton/poster/tjpost/tposter_6 icon_state = "tposter_6" name = "FLA MBT-86" desc = "It shows one of the FLA MBT used by the eastern forces at the end of the Conflict. \ An another one historian posters of CCA." -/singleton/poster/tjpost/tj_7 +/singleton/poster/tjpost/tposter_7 icon_state = "tposter_7" name = "Sa'a poster" desc = "It offers views of the mountains of Sa'a, Ahdomai." -/singleton/poster/tjpost/tj_8 +/singleton/poster/tjpost/tposter_8 icon_state = "tposter_8" name = "First mech poster" desc = "It shows the first combat mech created by the Kaytam clan used in urban combat in Naliar. \ No CCA symbol, hm..." -/singleton/poster/tjpost/tj_9 +/singleton/poster/tjpost/tposter_9 icon_state = "tposter_9" name = "CCA Army" desc = "It shows one of the tanks of Zhan-Hazan, and behind him you can see the attack helicopter." -/singleton/poster/tjpost/tj_10 +/singleton/poster/tjpost/tposter_10 icon_state = "tposter_10" name = "Assault Drones" desc = "This poster depicts the flying combat drones times of Ahdomai Conflict." -/singleton/poster/tjpost/tj_11 +/singleton/poster/tjpost/tposter_11 icon_state = "tposter_11" name = "Sunrise on S'Randjiir" desc = "The picture was taken from the dome of one of the gas producing factories on it." -/singleton/poster/tjpost/tj_12 +/singleton/poster/tjpost/tposter_12 icon_state = "tposter_12" name = "Ir-Shira class station" desc = "One of the mobile station class of Ir-Shira, descended from the shipyards over \ Adamem to gateway in the neighboring system. CCA insignia at hull." -/singleton/poster/tjpost/tj_13 +/singleton/poster/tjpost/tposter_13 icon_state = "tposter_13" name = "109 year" desc = "Each tajaran knows what happened in the 109 year. The first satellite was launched into Ahdomai orbit." -/singleton/poster/tjpost/tj_14 +/singleton/poster/tjpost/tposter_14 icon_state = "tposter_14" name = "298 year" desc = "First crew change in orbit of the first space station of Ahdomai." -/singleton/poster/tjpost/tj_15 +/singleton/poster/tjpost/tposter_15 icon_state = "tposter_15" name = "Winter night" desc = "You see one of the quiet winter nights of Ahdomai, \ it becomes easier from the memories of the beauty of your home. Even if you aren't tajara." -/singleton/poster/tjpost/tj_16 +/singleton/poster/tjpost/tposter_16 icon_state = "tposter_16" name = "Ta'Apa Charka" desc = "One of the icebergs on the holy land for tajaran." -/singleton/poster/tjpost/tj_17 +/singleton/poster/tjpost/tposter_17 icon_state = "tposter_17" name = "Maya'Thcha mountaints" desc = "Mountains Maya'Thcha in its beauty, Ahdomai." -/singleton/poster/tjpost/tj_18 +/singleton/poster/tjpost/tposter_18 icon_state = "tposter_18" name = "Sunrise in the forest" desc = "Sunrise in one of the forests. Nice and simple. Naturally. Corporative woodchoppers will be there soon..." -/singleton/poster/tjpost/tj_19 +/singleton/poster/tjpost/tposter_19 icon_state = "tposter_19" name = "Bayan" desc = "The Bayan village in the winter. Looks like some old wooden town at hill..." -/singleton/poster/tjpost/tj_20 +/singleton/poster/tjpost/tposter_20 icon_state = "tposter_20" name = "Mirr-Shorrkra" desc = "View of Mirr-Shorrkra from the Naff'Yark, Ahdomai." -/singleton/poster/tjpost/tj_21 +/singleton/poster/tjpost/tposter_21 icon_state = "tposter_21" name = "Unknown liberator" desc = "You can see the beautiful spokeswoman of tajara that fought for the liberation of Ahdomai \ during a long war." -/singleton/poster/tjpost/tj_22 +/singleton/poster/tjpost/tposter_22 icon_state = "tposter_22" name = "Mryarov Mraporting" desc = "There is a drone blimp-bomber of the Kaytam clan." diff --git a/mods/tajara/code/robolimbs.dm b/mods/tajara/code/robolimbs.dm index a7cbab7214ff9..215353d6d82fc 100644 --- a/mods/tajara/code/robolimbs.dm +++ b/mods/tajara/code/robolimbs.dm @@ -16,9 +16,12 @@ Robolimbs for robocats - Restricted roster of prosthetics for tajara desc = "A lightweight prosthesis that claims to imitate the curves of a cat-like body" icon = 'mods/tajara/icons/tajara_body/dyson.dmi' +/* +Waiting for sprites instead of plaseholders /datum/robolimb/tajara/dyson/expensive company = "Dyson-Rhyn'yai Premium Series" desc = "This high quality limb is nearly indistinguishable from an tajara one." icon = 'mods/tajara/icons/tajara_body/dyson-expensive.dmi' applies_to_part = BP_ALL_LIMBS can_eat = 1 +*/