diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 7fb20ce5db5e..f0085bea260b 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -40,7 +40,9 @@ /obj/item/stamp, // [CELADON-ADD] - CELADON_QOL - Добавляем ключи и нож для писем /obj/item/kitchen/knife/letter_opener, - /obj/item/key), + /obj/item/key, + /obj/item/clothing/gloves/ring/silver, + /obj/item/clothing/gloves/ring/diamond), // [/CELADON-ADD] list(/obj/item/screwdriver/power)) diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm index eca967546e95..b3b4da604bfc 100644 --- a/code/modules/overmap/objects/outpost/outpost.dm +++ b/code/modules/overmap/objects/outpost/outpost.dm @@ -123,7 +123,7 @@ else // [CELADON-EDIT] - TAJARA // switch(rand(1, 4)) // CELADON-EDIT - ORIGINAL - switch(rand(1, 5)) + switch(rand(1, 4)) // [/CELADON-EDIT] if(1) person_name = pick(prob(50) ? GLOB.lizard_names_male : GLOB.lizard_names_female) @@ -133,9 +133,9 @@ person_name = kepori_name() if(4) person_name = vox_name() - // [CELADON-ADD] - TAJARA - Я не уверен что оно вообще надо, но пусть будет - if(5) - person_name = pick(prob(50) ? GLOB.tajara_names_male : GLOB.tajara_names_female) + // [CELADON-ADD] - TAJARA - Я не уверен что оно вообще надо, но пусть будет - TODO найти списки имен таяр + // if(5) + // person_name = pick(prob(50) ? GLOB.tajara_names_male : GLOB.tajara_names_female) // [/CELADON-ADD] return "[person_name] [pick(GLOB.station_suffixes)]" diff --git a/mod_celadon/cargo_items/_cargo_items.dme b/mod_celadon/cargo_items/_cargo_items.dme index 5eb03ceef1c6..fe7e82f768c6 100644 --- a/mod_celadon/cargo_items/_cargo_items.dme +++ b/mod_celadon/cargo_items/_cargo_items.dme @@ -6,5 +6,6 @@ #include "code/vendor_refill.dm" #include "code/packs/mechs.dm" +#include "code/packs/costumes_toys.dm" #endif diff --git a/mod_celadon/cargo_items/code/packs/costumes_toys.dm b/mod_celadon/cargo_items/code/packs/costumes_toys.dm new file mode 100644 index 000000000000..446632d1187d --- /dev/null +++ b/mod_celadon/cargo_items/code/packs/costumes_toys.dm @@ -0,0 +1,31 @@ +/datum/supply_pack/costumes_toys/wedding + name = "Wedding Crate" + desc = "Tie the knot IN SPACE! Hold your own extravagant wedding with this crate of suits and bridal gowns. Complete with champagne, cake, and the luxurious cost you would expect for an event to remember." + cost = 10000 // weddings are absurdly expensive and so is this crate + contains = list(/obj/item/clothing/under/suit/black_really, //we don't actually need suits since you can vend them but the crate should feel "complete" + /obj/item/clothing/under/suit/black_really, + /obj/item/clothing/under/suit/charcoal, + /obj/item/clothing/under/suit/charcoal, + /obj/item/clothing/under/suit/navy, + /obj/item/clothing/under/suit/navy, + /obj/item/clothing/under/suit/burgundy, + /obj/item/clothing/under/suit/burgundy, // A pair of each "fancy suit" color for variety + /obj/item/clothing/under/suit/white, + /obj/item/clothing/under/suit/white, // white is a weird color for a groom but some people are weird + /obj/item/clothing/under/dress/wedding, + /obj/item/clothing/under/dress/wedding, // this is what you actually bought the crate for. You can't get these anywhere else. + /obj/item/clothing/under/dress/wedding/orange, + /obj/item/clothing/under/dress/wedding/orange, + /obj/item/clothing/under/dress/wedding/purple, + /obj/item/clothing/under/dress/wedding/purple, + /obj/item/clothing/under/dress/wedding/blue, + /obj/item/clothing/under/dress/wedding/blue, + /obj/item/clothing/under/dress/wedding/red, + /obj/item/clothing/under/dress/wedding/red, // two of each + /obj/item/reagent_containers/food/drinks/bottle/champagne, //appropriate booze for a wedding + /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake, // we don't have a full wedding cake but this will do + // /obj/item/storage/fancy/ringbox/silver, + // /obj/item/storage/fancy/ringbox/silver немного текстурка пошла по одному месту, но работает + /obj/item/clothing/gloves/ring/diamond, + /obj/item/clothing/gloves/ring/silver) //diamond rings cost the same price as this crate via cargo so we're not giving you two for free. Wedding rings are traditionally less valuable anyway. + crate_name = "wedding crate" diff --git a/mod_celadon/items/_items.dme b/mod_celadon/items/_items.dme index d99b1d791d9f..b0b59749b73b 100644 --- a/mod_celadon/items/_items.dme +++ b/mod_celadon/items/_items.dme @@ -11,14 +11,9 @@ #include "code/items.dm" #include "code/toggles.dm" #include "code/weapons.dm" +#include "code/cloaks.dm" +#include "code/dress.dm" +#include "code/rings.dm" +#include "code/centcom.dm" #endif -// BEGIN_INTERNALS -// END_INTERNALS -// BEGIN_FILE_DIR -#define FILE_DIR . -// END_FILE_DIR -// BEGIN_PREFERENCES -// END_PREFERENCES -// BEGIN_INCLUDE -// END_INCLUDE diff --git a/mod_celadon/items/code/centcom.dm b/mod_celadon/items/code/centcom.dm new file mode 100644 index 000000000000..a4e6e6161ff0 --- /dev/null +++ b/mod_celadon/items/code/centcom.dm @@ -0,0 +1,49 @@ + +/obj/item/clothing/suit/armor/vest/capcarapace/syndievest + icon = 'mod_celadon/items/icons/obj/suits/suits.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/suits.dmi' + name = "captain's parade coat" + desc = "For when an armoured vest isn't fashionable enough." + icon_state = "syndievest" + item_state = "syndievest" + body_parts_covered = CHEST | GROIN | ARMS + supports_variations = DIGITIGRADE_VARIATION + +/obj/item/clothing/suit/toggle/armor/centcom_formal + icon = 'mod_celadon/items/icons/obj/suits/suits.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/suits.dmi' + name = "\improper CentCom formal coat" + desc = "A stylish coat given to CentCom Commanders. Perfect for sending ERTs to suicide missions with style!" + icon_state = "centcom_formal" + item_state = "centcom_formal" + pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large + body_parts_covered = CHEST | GROIN | ARMS + supports_variations = DIGITIGRADE_VARIATION + armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60) + togglename = "centcom" + +/obj/item/clothing/suit/toggle/armor/hos_formal + icon = 'mod_celadon/items/icons/obj/suits/suits.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/suits.dmi' + name = "\improper Head of Security's parade jacket" + desc = "For when an armoured vest isn't fashionable enough." + icon_state = "hosformal" + item_state = "hosformal" + body_parts_covered = CHEST | GROIN | ARMS + supports_variations = DIGITIGRADE_VARIATION + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90) + togglename = "hosformal" + +/obj/item/clothing/suit/toggle/armor/captains_formal + icon = 'mod_celadon/items/icons/obj/suits/suits.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/suits.dmi' + name = "\improper Head of Security's parade jacket" + desc = "captain's parade coat" + desc = "For when an armoured vest isn't fashionable enough." + icon_state = "capformal" + item_state = "capformal" + body_parts_covered = CHEST | GROIN | ARMS + supports_variations = DIGITIGRADE_VARIATION + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + togglename = "capformal" + diff --git a/mod_celadon/items/code/cloaks.dm b/mod_celadon/items/code/cloaks.dm new file mode 100644 index 000000000000..c07380ebd8df --- /dev/null +++ b/mod_celadon/items/code/cloaks.dm @@ -0,0 +1,9 @@ +/obj/item/clothing/suit/armor/hos/trenchcoat/cloak + icon = 'mod_celadon/items/icons/obj/suits/cloaks.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/cloaks.dmi' + slot_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_NECK + name = "armored trenchcloak" + desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." + icon_state = "trenchcloak" + item_state = "trenchcloak" + body_parts_covered = CHEST | ARMS | LEGS diff --git a/mod_celadon/items/code/dress.dm b/mod_celadon/items/code/dress.dm new file mode 100644 index 000000000000..616288392b31 --- /dev/null +++ b/mod_celadon/items/code/dress.dm @@ -0,0 +1,42 @@ +/obj/item/clothing/under/dress/flower + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/dress.dmi' + icon = 'mod_celadon/items/icons/obj/suits/dress.dmi' + name = "flower dress" + desc = "Lovely dress." + icon_state = "flower_dress" + item_state = "flower_dress" + body_parts_covered = CHEST | GROIN | LEGS + can_adjust = FALSE + +/obj/item/clothing/under/dress/wedding + mob_overlay_icon = 'mod_celadon/items/icons/mob/suits/dress.dmi' + icon = 'mod_celadon/items/icons/obj/suits/dress.dmi' + name = "white wedding dress" + desc = "A white wedding gown made from the finest silk." + icon_state = "bride_white" + item_state = "bride_white" + can_adjust = FALSE + +/obj/item/clothing/under/dress/wedding/orange + name = "orange wedding dress" + desc = "A big and puffy orange dress." + icon_state = "bride_orange" + item_state = "bride_orange" + +/obj/item/clothing/under/dress/wedding/purple + name = "purple wedding dress" + desc = "A big and puffy purple dress." + icon_state = "bride_purple" + item_state = "bride_purple" + +/obj/item/clothing/under/dress/wedding/blue + name = "blue wedding dress" + desc = "A big and puffy blue dress." + icon_state = "bride_blue" + item_state = "bride_blue" + +/obj/item/clothing/under/dress/wedding/red + name = "red wedding dress" + desc = "A big and puffy red dress." + icon_state = "bride_red" + item_state = "bride_red" diff --git a/mod_celadon/items/code/items.dm b/mod_celadon/items/code/items.dm index c80af170dfb1..54236d6091d3 100644 --- a/mod_celadon/items/code/items.dm +++ b/mod_celadon/items/code/items.dm @@ -372,3 +372,18 @@ adhomian_day = FLOOR(current_day / 2, 1) to_chat(usr, "You check your [src.name], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is the '[adhomian_day]th day of [adhomian_month], [adhomian_year]'.") +// Rings +/obj/item/clothing/gloves/ring/diamond + name = "diamond ring" + desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." + icon_state = "ringdiamond" + item_state = "dring" + +/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) + to_chat(usr, "The [usr.name] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") + +/obj/item/clothing/gloves/ring/silver + name = "silver ring" + desc = "A tiny silver ring, sized to wrap around a finger." + icon_state = "ringsilver" + item_state = "sring" diff --git a/mod_celadon/items/code/rings.dm b/mod_celadon/items/code/rings.dm new file mode 100644 index 000000000000..4076c2809484 --- /dev/null +++ b/mod_celadon/items/code/rings.dm @@ -0,0 +1,60 @@ +/obj/item/proc/suicide_act(mob/living/user) + return + +/obj/item/clothing/gloves/ring + icon = 'mod_celadon/items/icons/obj/ring.dmi' + mob_overlay_icon = 'mod_celadon/items/icons/mob/inhands/hands.dmi' + name = "gold ring" + desc = "A tiny gold ring, sized to wrap around a finger." + gender = NEUTER + w_class = WEIGHT_CLASS_TINY + icon_state = "ringgold" + item_state = "gring" + // body_parts_covered = 0 + strip_delay = 4 SECONDS + +/obj/item/clothing/gloves/ring/suicide_act(mob/living/carbon/user) + user.visible_message(span_suicide("\[user] is putting the [src] in [user.p_their()] mouth! It looks like [user] is trying to choke on the [src]!")) + return OXY + + +/obj/item/clothing/gloves/ring/diamond + name = "diamond ring" + desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." + icon_state = "ringdiamond" + item_state = "dring" + +/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) + user.visible_message(span_warning("\The [user] gets down on one knee, presenting \the [src]."),span_warning("You get down on one knee, presenting \the [src].")) + +/obj/item/clothing/gloves/ring/silver + name = "silver ring" + desc = "A tiny silver ring, sized to wrap around a finger." + icon_state = "ringsilver" + item_state = "sring" + +/* + * Ring Box + */ + +/obj/item/storage/fancy/ringbox + name = "ring box" + desc = "A tiny box covered in soft red felt made for holding rings." + icon = 'mod_celadon/items/icons/obj/ring.dmi' + icon_state = "gold ringbox" + w_class = WEIGHT_CLASS_TINY + spawn_type = /obj/item/clothing/gloves/ring + // spawn_count = 1 + +/obj/item/storage/fancy/ringbox/Initialize(mapload) + . = ..() + // atom_storage.max_slots = 1 + // atom_storage.can_hold = typecacheof(list(/obj/item/clothing/gloves/ring)) + +/obj/item/storage/fancy/ringbox/diamond + icon_state = "diamond ringbox" + spawn_type = /obj/item/clothing/gloves/ring/diamond + +/obj/item/storage/fancy/ringbox/silver + icon_state = "silver ringbox" + spawn_type = /obj/item/clothing/gloves/ring/silver diff --git a/mod_celadon/items/code/under.dm b/mod_celadon/items/code/under.dm new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/mod_celadon/items/icons/mob/inhands/hands.dmi b/mod_celadon/items/icons/mob/inhands/hands.dmi new file mode 100644 index 000000000000..acc0efab98e9 Binary files /dev/null and b/mod_celadon/items/icons/mob/inhands/hands.dmi differ diff --git a/mod_celadon/items/icons/mob/suits/cloaks.dmi b/mod_celadon/items/icons/mob/suits/cloaks.dmi new file mode 100644 index 000000000000..9130009dacc0 Binary files /dev/null and b/mod_celadon/items/icons/mob/suits/cloaks.dmi differ diff --git a/mod_celadon/items/icons/mob/suits/dress.dmi b/mod_celadon/items/icons/mob/suits/dress.dmi new file mode 100644 index 000000000000..ed65c2c4453d Binary files /dev/null and b/mod_celadon/items/icons/mob/suits/dress.dmi differ diff --git a/mod_celadon/items/icons/mob/suits/galaxy.dmi b/mod_celadon/items/icons/mob/suits/galaxy.dmi new file mode 100644 index 000000000000..3ac017b6ab73 Binary files /dev/null and b/mod_celadon/items/icons/mob/suits/galaxy.dmi differ diff --git a/mod_celadon/items/icons/mob/suits/suits.dmi b/mod_celadon/items/icons/mob/suits/suits.dmi new file mode 100644 index 000000000000..5bc37857e437 Binary files /dev/null and b/mod_celadon/items/icons/mob/suits/suits.dmi differ diff --git a/mod_celadon/items/icons/obj/ring.dmi b/mod_celadon/items/icons/obj/ring.dmi new file mode 100644 index 000000000000..e13cc7cd23fe Binary files /dev/null and b/mod_celadon/items/icons/obj/ring.dmi differ diff --git a/mod_celadon/items/icons/obj/suits/cloaks.dmi b/mod_celadon/items/icons/obj/suits/cloaks.dmi new file mode 100644 index 000000000000..3d1f83b1787b Binary files /dev/null and b/mod_celadon/items/icons/obj/suits/cloaks.dmi differ diff --git a/mod_celadon/items/icons/obj/suits/costume.dmi b/mod_celadon/items/icons/obj/suits/costume.dmi index 0bae97805b78..f25da395c4e9 100644 Binary files a/mod_celadon/items/icons/obj/suits/costume.dmi and b/mod_celadon/items/icons/obj/suits/costume.dmi differ diff --git a/mod_celadon/items/icons/obj/suits/dress.dmi b/mod_celadon/items/icons/obj/suits/dress.dmi new file mode 100644 index 000000000000..aeb1adb39203 Binary files /dev/null and b/mod_celadon/items/icons/obj/suits/dress.dmi differ diff --git a/mod_celadon/items/icons/obj/suits/galaxy.dmi b/mod_celadon/items/icons/obj/suits/galaxy.dmi new file mode 100644 index 000000000000..89a0b6649766 Binary files /dev/null and b/mod_celadon/items/icons/obj/suits/galaxy.dmi differ diff --git a/mod_celadon/items/icons/obj/suits/suits.dmi b/mod_celadon/items/icons/obj/suits/suits.dmi new file mode 100644 index 000000000000..8b0e2abd3cfd Binary files /dev/null and b/mod_celadon/items/icons/obj/suits/suits.dmi differ diff --git a/mod_celadon/loadout/_loadout.dme b/mod_celadon/loadout/_loadout.dme index 27705140ec7c..0fbc57fd1b41 100644 --- a/mod_celadon/loadout/_loadout.dme +++ b/mod_celadon/loadout/_loadout.dme @@ -13,5 +13,7 @@ #include "code/uniform.dm" #include "code/gloves.dm" #include "code/glasses.dm" +#include "code/cloaks.dm" +#include "code/dress.dm" #endif diff --git a/mod_celadon/loadout/code/cloaks.dm b/mod_celadon/loadout/code/cloaks.dm new file mode 100644 index 000000000000..8cf652dc1259 --- /dev/null +++ b/mod_celadon/loadout/code/cloaks.dm @@ -0,0 +1,4 @@ +/datum/gear/accessory/suit/armor/hos/trenchcoat/cloak + display_name = "armored trenchcloak" + description = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.." + path = /obj/item/clothing/suit/armor/hos/trenchcoat/cloak diff --git a/mod_celadon/loadout/code/dress.dm b/mod_celadon/loadout/code/dress.dm new file mode 100644 index 000000000000..f10f6766cf90 --- /dev/null +++ b/mod_celadon/loadout/code/dress.dm @@ -0,0 +1,61 @@ +/datum/gear/uniform/dress/wedding + subtype_path = /datum/gear/uniform/dress/wedding + +/datum/gear/uniform/dress/wedding/orange + display_name = "orange wedding dress" + description = "A big and puffy orange dress." + path = /obj/item/clothing/under/dress/wedding/orange + +/datum/gear/uniform/dress/wedding/purple + display_name = "purple wedding dress" + description = "A big and puffy purple dress." + path = /obj/item/clothing/under/dress/wedding/purple + +/datum/gear/uniform/dress/wedding/blue + display_name = "blue wedding dress" + description = "A big and puffy blue dress." + path = /obj/item/clothing/under/dress/wedding/blue + +/datum/gear/uniform/dress/wedding/red + display_name = "red wedding dress" + description = "A big and puffy red dress." + path = /obj/item/clothing/under/dress/wedding/red + +/datum/gear/uniform/dress/flower + display_name = "flower dress" + description = "Lovely dress." + path = /obj/item/clothing/under/dress/flower + +// dress +/datum/gear/uniform/dress/tajaran + subtype_path = /datum/gear/uniform/dress/tajaran + +/datum/gear/uniform/dress/tajaran/white + display_name = "fancy adhomian dress, white" + description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts." + path = /obj/item/clothing/under/dress/tajaran + +/datum/gear/uniform/dress/tajaran/blue + display_name = "fancy adhomian dress, blue" + description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is blue." + path = /obj/item/clothing/under/dress/tajaran/blue + +/datum/gear/uniform/dress/tajaran/green + display_name = "fancy adhomian dress, green" + description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is green." + path = /obj/item/clothing/under/dress/tajaran/green + +/datum/gear/uniform/dress/tajaran/red + display_name = "fancy adhomian dress, red" + description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is red." + path = /obj/item/clothing/under/dress/tajaran/red + +/datum/gear/uniform/dress/tajaran/black + display_name = "fancy adhomian dress, black" + description = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is dark black." + path = /obj/item/clothing/under/dress/tajaran/fancy/black + +/datum/gear/uniform/dress/tajaran/noble + display_name = "noble adhomian dress" + description = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is crimson red." + path = /obj/item/clothing/under/dress/tajaran/fancy diff --git a/mod_celadon/loadout/code/gloves.dm b/mod_celadon/loadout/code/gloves.dm index b4045b957519..f2dd6001e610 100644 --- a/mod_celadon/loadout/code/gloves.dm +++ b/mod_celadon/loadout/code/gloves.dm @@ -2,3 +2,19 @@ display_name = "maid armcovers" description = "Cylindrical looking tubes that go over your arm, weird." path = /obj/item/clothing/gloves/maid + +/* +* RINGS +*/ + +/datum/gear/accessory/gloves/silverring + display_name = "Silver Ring" + path = /obj/item/clothing/gloves/ring/silver + +/datum/gear/accessory/gloves/goldring + display_name = "Gold Ring" + path = /obj/item/clothing/gloves/ring + +/datum/gear/accessory/gloves/diamondring + display_name = "Diamond Ring" + path = /obj/item/clothing/gloves/ring/diamond diff --git a/mod_celadon/loadout/code/uniform.dm b/mod_celadon/loadout/code/uniform.dm index ff3c8a02cb94..745514731e1d 100644 --- a/mod_celadon/loadout/code/uniform.dm +++ b/mod_celadon/loadout/code/uniform.dm @@ -3,78 +3,45 @@ description = "maid in China." path = /obj/item/clothing/under/costume/maid -/datum/gear/iniform/tajaran/consular - subtype_path = /datum/gear/iniform/tajaran/consular +/datum/gear/uniform/tajaran/consular + subtype_path = /datum/gear/uniform/tajaran/consular -/datum/gear/iniform/tajaran/consular/male +/datum/gear/uniform/tajaran/consular/male display_name = "male republic consular uniform" description = "An olive uniform used by the diplomatic service of the People's Republic of Adhomai." path = /obj/item/clothing/under/tajaran -/datum/gear/iniform/tajaran/consular/female +/datum/gear/uniform/tajaran/consular/female display_name = "female republic consular uniform" description = "An olive uniform used by the diplomatic service of the People's Republic of Adhomai." path = /obj/item/clothing/under/tajaran/consular/female -/datum/gear/iniform/tajaran/consular/dpra - display_name = "democratic people's republic consular uniform" +/datum/gear/uniform/tajaran/consular/dpra + display_name = "democratic peoples republic consular uniform" description = "A grey uniform used by the diplomatic service of the Democratic People's Republic of Adhomai." path = /obj/item/clothing/under/tajaran/consular/dpra -/datum/gear/iniform/tajaran - subtype_path = /datum/gear/iniform/tajaran +/datum/gear/uniform/tajaran + subtype_path = /datum/gear/uniform/tajaran -/datum/gear/iniform/tajaran/laborer +/datum/gear/uniform/tajaran/laborer display_name = "laborer clothes" description = "A rough but thin outfit, providing air flow but also protection from working hazards." path = /obj/item/clothing/under/tajaran/laborer -/datum/gear/iniform/tajaran/pra_uniform +/datum/gear/uniform/tajaran/pra_uniform display_name = "republican army uniform" description = "A military uniform used by the forces of Grand People's Army." path = /obj/item/clothing/under/tajaran/pra_uniform -/datum/gear/iniform/tajaran/fancy +/datum/gear/uniform/tajaran/fancy display_name = "fancy uniform" description = "Worn by princes, barons and lords of Adhomai, now in stores near you!" path = /obj/item/clothing/under/tajaran/fancy // Adhomian Evening Suit -/datum/gear/iniform/tajaran/evening_suit +/datum/gear/uniform/tajaran/evening_suit display_name = "adhomian evening suit" description = "A rich purple evening suit meant for lounging or other luxury." path = /obj/item/clothing/under/tajaran/fancy/evening_suit -// dress -/datum/gear/iniform/dress/tajaran - subtype_path = /datum/gear/iniform/dress/tajaran - -/datum/gear/iniform/dress/tajaran/white - display_name = "fancy adhomian dress" - description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts." - path = /obj/item/clothing/under/dress/tajaran - -/datum/gear/iniform/dress/tajaran/blue - display_name = "fancy adhomian dress" - description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is blue." - path = /obj/item/clothing/under/dress/tajaran/blue - -/datum/gear/iniform/dress/tajaran - display_name = "fancy adhomian dress" - description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is green." - path = /obj/item/clothing/under/dress/tajaran/green - -/datum/gear/iniform/dress/tajaran/red - display_name = "fancy adhomian dress" - description = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is red." - path = /obj/item/clothing/under/dress/tajaran/red - -/datum/gear/iniform/dress/tajaran/black - display_name = "fancy adhomian dress" - description = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is dark black." - path = /obj/item/clothing/under/dress/tajaran/fancy/black - -/datum/gear/iniform/dress/tajaran/fancy - display_name = "noble adhomian dress" - description = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is crimson red." - path = /obj/item/clothing/under/dress/tajaran/fancy diff --git a/mod_celadon/tajara/icons/tajara_bodyparts.dmi b/mod_celadon/tajara/icons/tajara_bodyparts.dmi index ba4d55136fcf..37a37f779b82 100644 Binary files a/mod_celadon/tajara/icons/tajara_bodyparts.dmi and b/mod_celadon/tajara/icons/tajara_bodyparts.dmi differ diff --git a/mod_celadon/tajara/icons/tajara_tail.dmi b/mod_celadon/tajara/icons/tajara_tail.dmi index bcdfdaf2ccb0..4db2843ed4fd 100644 Binary files a/mod_celadon/tajara/icons/tajara_tail.dmi and b/mod_celadon/tajara/icons/tajara_tail.dmi differ