diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 117b8ec2f..1e7e63895 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -73,6 +73,7 @@ #define CLOTHING_WHITE "#ffffff" #define CLOTHING_ORANGE "#bd6606" #define CLOTHING_MAJENTA "#962e5c" +#define CLOTHING_AZURE "#007fff" #define CLOTHING_WET "#bbbbbb" @@ -102,3 +103,5 @@ return CLOTHING_ORANGE if("Majenta") return CLOTHING_MAJENTA + if("Azure") + return CLOTHING_AZURE diff --git a/code/modules/clothing/rogueclothes/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks.dm index 12d7c11ab..5bee8d32f 100644 --- a/code/modules/clothing/rogueclothes/cloaks.dm +++ b/code/modules/clothing/rogueclothes/cloaks.dm @@ -8,7 +8,6 @@ equip_delay_self = 10 bloody_icon_state = "bodyblood" sewrepair = TRUE //Vrell - AFAIK, all cloaks are cloth ATM. Technically semi-less future-proof, but it removes a line of code from every subtype, which is worth it IMO. - flags_inv = HIDETAIL ////////////////////////// @@ -17,7 +16,7 @@ /obj/item/clothing/cloak/tabard name = "tabard" - desc = "A hooded vest meant for knights." + desc = "A long vest meant for knights." color = null icon_state = "tabard" item_state = "tabard" @@ -106,8 +105,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/tabard/knight/Destroy() GLOB.lordcolor -= src @@ -230,9 +228,9 @@ /obj/item/clothing/cloak/tabard/knight/guard desc = "A tabard with the lord's heraldic colors." - color = CLOTHING_RED + color = CLOTHING_AZURE detail_tag = "_spl" - detail_color = CLOTHING_PURPLE + detail_color = CLOTHING_WHITE /obj/item/clothing/cloak/tabard/knight/guard/attack_right(mob/user) if(picked) @@ -269,8 +267,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/tabard/knight/guard/update_icon() cut_overlays() @@ -361,9 +358,9 @@ /obj/item/clothing/cloak/stabard/guard name = "guard tabard" desc = "A tabard with the lord's heraldic colors." - color = CLOTHING_RED + color = CLOTHING_AZURE detail_tag = "_spl" - detail_color = CLOTHING_PURPLE + detail_color = CLOTHING_WHITE /obj/item/clothing/cloak/stabard/guard/attack_right(mob/user) if(picked) @@ -400,8 +397,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/stabard/guard/update_icon() cut_overlays() @@ -525,9 +521,9 @@ /obj/item/clothing/cloak/stabard/surcoat/guard desc = "A surcoat with the lord's heraldic colors." - color = CLOTHING_RED + color = CLOTHING_AZURE detail_tag = "_quad" - detail_color = CLOTHING_PURPLE + detail_color = CLOTHING_WHITE /obj/item/clothing/cloak/stabard/surcoat/guard/attack_right(mob/user) if(picked) @@ -564,8 +560,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/stabard/surcoat/guard/lordcolor(primary,secondary) color = primary @@ -595,7 +590,7 @@ // allowed_sex = list(MALE) allowed_race = NON_DWARVEN_RACE_TYPES detail_tag = "_det" - detail_color = CLOTHING_PURPLE + detail_color = CLOTHING_AZURE /obj/item/clothing/cloak/lordcloak/update_icon() cut_overlays() @@ -617,8 +612,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/lordcloak/Destroy() GLOB.lordcolor -= src @@ -819,7 +813,7 @@ dynamic_hair_suffix = "" edelay_type = 1 body_parts_covered = HEAD - flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDETAIL block2add = FOV_BEHIND /obj/item/clothing/head/hooded/equipped(mob/user, slot) @@ -872,17 +866,17 @@ slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK /obj/item/clothing/cloak/cape/knight - color = CLOTHING_PURPLE + color = CLOTHING_WHITE /obj/item/clothing/cloak/cape/guard - color = CLOTHING_RED + color = CLOTHING_AZURE /obj/item/clothing/cloak/cape/guard/Initialize() . = ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src + /obj/item/clothing/cloak/cape/guard/lordcolor(primary,secondary) color = secondary update_icon() @@ -1002,10 +996,18 @@ /obj/item/clothing/cloak/half/orange color = CLOTHING_ORANGE +/obj/item/clothing/cloak/half/rider + name = "rider cloak" + icon_state = "guardcloak" + color = CLOTHING_AZURE + allowed_sex = list(MALE, FEMALE) + allowed_race = NON_DWARVEN_RACE_TYPES + inhand_mod = FALSE + /obj/item/clothing/cloak/half/vet name = "town watch cloak" icon_state = "guardcloak" - color = CLOTHING_RED + color = CLOTHING_AZURE allowed_sex = list(MALE, FEMALE) allowed_race = NON_DWARVEN_RACE_TYPES inhand_mod = FALSE @@ -1014,13 +1016,166 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/half/vet/Destroy() GLOB.lordcolor -= src return ..() +/obj/item/clothing/cloak/templar/psydon + name = "psydon tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Psydon on it." + icon_state = "tabard_weeping" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/astrata + name = "astratan tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Astrata on it." + icon_state = "tabard_astrata_alt" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/noc + name = "noc tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Noc on it." + icon_state = "tabard_noc" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/dendor + name = "dendor tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Dendor on it." + icon_state = "tabard_dendor" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/necra + name = "necra tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Necra on it." + icon_state = "tabard_necra" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/abyssor + name = "abyssor tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Abyssor on it." + icon_state = "tabard_abyssor" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/malum + name = "malum tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Malum on it." + icon_state = "tabard_malum" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/eora + name = "eora tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Eora on it." + icon_state = "tabard_eora" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/pestra + name = "pestra tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Pestra on it." + icon_state = "tabard_pestra" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/ravox + name = "ravox tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Ravox on it." + icon_state = "tabard_ravox" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + +/obj/item/clothing/cloak/templar/xylix + name = "xylix tabard" + desc = "A medieval overcoat meant to be used over the armor. This one has the symbol of Xylix on it." + icon_state = "tabard_xylix" + alternate_worn_layer = TABARD_LAYER + body_parts_covered = CHEST|GROIN + boobed = TRUE + mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleevetype = "shirt" + nodismemsleeves = TRUE + slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK + flags_inv = HIDECROTCH|HIDEBOOB + // Dumping old black knight stuff here /obj/item/clothing/cloak/cape/blkknight name = "blood cape" @@ -1128,9 +1283,9 @@ /obj/item/clothing/cloak/stabard/guardhood name = "guard hood" desc = "A hood with the lord's heraldic colors." - color = CLOTHING_RED + color = CLOTHING_AZURE detail_tag = "_spl" - detail_color = CLOTHING_PURPLE + detail_color = CLOTHING_WHITE icon_state = "guard_hood" body_parts_covered = CHEST @@ -1163,8 +1318,7 @@ ..() if(GLOB.lordprimary) lordcolor(GLOB.lordprimary,GLOB.lordsecondary) - else - GLOB.lordcolor += src + GLOB.lordcolor += src /obj/item/clothing/cloak/stabard/guardhood/update_icon() cut_overlays() diff --git a/code/modules/roguetown/roguecrafting/sewing.dm b/code/modules/roguetown/roguecrafting/sewing.dm index e02dc4fe3..8d1e0183a 100644 --- a/code/modules/roguetown/roguecrafting/sewing.dm +++ b/code/modules/roguetown/roguecrafting/sewing.dm @@ -166,6 +166,83 @@ /obj/item/natural/fibers = 1) craftdiff = 3 +/datum/crafting_recipe/roguetown/sewing/psydon + name = "psydon tabard" + result = list(/obj/item/clothing/cloak/templar/psydon) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/astrata + name = "astrata tabard" + result = list(/obj/item/clothing/cloak/templar/astrata) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/noc + name = "noc tabard" + result = list(/obj/item/clothing/cloak/templar/noc) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/dendor + name = "dendor tabard" + result = list(/obj/item/clothing/cloak/templar/dendor) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/necra + name = "necra tabard" + result = list(/obj/item/clothing/cloak/templar/necra) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/abyssor + name = "abyssor tabard" + result = list(/obj/item/clothing/cloak/templar/abyssor) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/malum + name = "malum tabard" + result = list(/obj/item/clothing/cloak/templar/malum) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/eora + name = "eora tabard" + result = list(/obj/item/clothing/cloak/templar/eora) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/pestra + name = "pestra tabard" + result = list(/obj/item/clothing/cloak/templar/pestra) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/ravox + name = "ravox tabard" + result = list(/obj/item/clothing/cloak/templar/ravox) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + +/datum/crafting_recipe/roguetown/sewing/xylix + name = "xylix tabard" + result = list(/obj/item/clothing/cloak/templar/xylix) + reqs = list(/obj/item/natural/cloth = 3, + /obj/item/natural/fibers = 1) + craftdiff = 3 + /datum/crafting_recipe/roguetown/sewing/stabard/guard name = "guard surcoat" result = list(/obj/item/clothing/cloak/stabard/guard) diff --git a/icons/roguetown/clothing/cloaks.dmi b/icons/roguetown/clothing/cloaks.dmi index 91bfde70b..b4d78800b 100644 Binary files a/icons/roguetown/clothing/cloaks.dmi and b/icons/roguetown/clothing/cloaks.dmi differ diff --git a/icons/roguetown/clothing/onmob/detailed/tabards.dmi b/icons/roguetown/clothing/onmob/detailed/tabards.dmi index 02d92ce8b..fe2de7f59 100644 Binary files a/icons/roguetown/clothing/onmob/detailed/tabards.dmi and b/icons/roguetown/clothing/onmob/detailed/tabards.dmi differ