diff --git a/code/modules/roguetown/roguecrafting/alchemy/ingredients.dm b/code/modules/roguetown/roguecrafting/alchemy/ingredients.dm index 68511951765..eaf61b4f552 100644 --- a/code/modules/roguetown/roguecrafting/alchemy/ingredients.dm +++ b/code/modules/roguetown/roguecrafting/alchemy/ingredients.dm @@ -1,5 +1,5 @@ /obj/item/alch - name = "dust" + name = "Any Alchemical Reagent" //Caustic Edit desc = "" icon = 'icons/roguetown/misc/alchemy.dmi' icon_state = "irondust" diff --git a/modular_causticcove/code/game/objects/items/clothes/causthats.dm b/modular_causticcove/code/game/objects/items/clothes/causthats.dm new file mode 100644 index 00000000000..b73d429366c --- /dev/null +++ b/modular_causticcove/code/game/objects/items/clothes/causthats.dm @@ -0,0 +1,111 @@ +/obj/item/clothing/head/roguetown/spellcasterhat/drifter + name = "Drifting magicians hat" + desc = "A hat treated and hardened for extended travel. Perfect for the wandering mage!" + icon = 'modular_causticcove/icons/items/hats.dmi' + bloody_icon = 'modular_causticcove/icons/effects/hat_blood.dmi' + mob_overlay_icon = 'modular_causticcove/icons/items/onmob/onmob.dmi' + bloody_icon_state = "dhat" + icon_state = "dhat" + item_state = "dhat" + prevent_crits = PREVENT_CRITS_NONE + armor = ARMOR_SPELLSINGER + sellprice = 15 + worn_x_dimension = 64 + worn_y_dimension = 68 + sewrepair = TRUE + resistance_flags = FIRE_PROOF + +/datum/crafting_recipe/roguetown/sewing/driftermagehat + name = "Drifting magicians hat" + category = "Hats" + result = list(/obj/item/clothing/head/roguetown/spellcasterhat/drifter) + reqs = list(/obj/item/natural/cloth = 1, + /obj/item/natural/fibers = 1, + /obj/item/natural/hide/cured = 2) + tools = list(/obj/item/needle) + craftdiff = 6 + sellprice = 15 + +/obj/item/clothing/head/roguetown/spellcasterhat/wbonnet + name = "Witches Bonnet" + desc = "A particularly thick, pointed hat that is tied around the chin. Great for tucking the hair away for spell casting." + icon = 'modular_causticcove/icons/items/hats.dmi' + bloody_icon = 'modular_causticcove/icons/effects/hat_blood.dmi' + mob_overlay_icon = 'modular_causticcove/icons/items/onmob/onmob.dmi' + bloody_icon_state = "witch_bonnet" + icon_state = "witch_bonnet" + item_state = "witch_bonnet" + prevent_crits = PREVENT_CRITS_NONE + armor = ARMOR_SPELLSINGER + sellprice = 18 + worn_x_dimension = 64 + worn_y_dimension = 68 + sewrepair = TRUE + resistance_flags = FIRE_PROOF + +/datum/crafting_recipe/roguetown/sewing/wbonnet + name = "Witches Bonnet" + category = "Hats" + result = list(/obj/item/clothing/head/roguetown/spellcasterhat/wbonnet) + reqs = list(/obj/item/natural/cloth = 2, + /obj/item/natural/fibers = 1, + /obj/item/natural/hide/cured = 2) + tools = list(/obj/item/needle) + craftdiff = 6 + sellprice = 18 + +/obj/item/clothing/head/roguetown/grenzelhofthat/floweredAlc + name = "Alchemist Cap" + desc = "A Hat heavily treated with various reagents to make it quite firm and protective. Fantastic for one of the most dangerous jobs in the land; picking flowers." + icon = 'modular_causticcove/icons/items/hats.dmi' + bloody_icon = 'modular_causticcove/icons/effects/hat_blood.dmi' + mob_overlay_icon = 'modular_causticcove/icons/items/onmob/onmob.dmi' + icon_state = "herb_hata" + item_state = "herb_hata" + detail_tag = "_detail" + altdetail_tag = "_detailalt" + bloody_icon_state = "herb_hat" + armor = ARMOR_PADDED_GOOD + max_integrity = ARMOR_INT_HELMET_CLOTH + 70 //its a special hat made for alchemists by alchemists and not a loadout item, should be ok for a MINOR increase + prevent_crits = list(BCLASS_BLUNT, BCLASS_SMASH) + color = "#ffffff" + detail_color = "#FFFFFF" + altdetail_color = "#ffffff" + worn_x_dimension = 64 + worn_y_dimension = 66 + +/obj/item/clothing/head/roguetown/grenzelhofthat/floweredAlc/attack_right(mob/user) + if(!picked) + var/choice = input(user, "Choose a color.", "ribbon colors") as anything in COLOR_MAP + var/playerchoice = COLOR_MAP[choice] + picked = TRUE + detail_color = playerchoice + detail_tag = "_detail" + update_icon() + if(loc == user && ishuman(user)) + var/mob/living/carbon/H = user + H.update_inv_head() + +/datum/crafting_recipe/roguetown/alchemy/floweredAlc + name = "Alchemist Cap" + category = "Hats" + result = /obj/item/clothing/head/roguetown/grenzelhofthat/floweredAlc + reqs = list(/obj/item/natural/cloth = 2, /obj/item/natural/fibers = 5, /obj/item/alch = 2) + tools = list(/obj/item/needle) + craftdiff = 6 + +/obj/item/clothing/head/roguetown/grenzelhofthat/floweredAlc/tricolor + icon = 'modular_causticcove/icons/items/hats.dmi' + bloody_icon = 'modular_causticcove/icons/effects/hat_blood.dmi' + mob_overlay_icon = 'modular_causticcove/icons/items/onmob/onmob.dmi' + icon_state = "herb_hatb" + item_state = "herb_hatb" + +/datum/crafting_recipe/roguetown/alchemy/floweredAlc/tri + name = "Alchemists Cap (tri)" + category = "Hats" + result = /obj/item/clothing/head/roguetown/grenzelhofthat/floweredAlc/tricolor + reqs = list(/obj/item/natural/cloth = 2, /obj/item/natural/fibers = 5, /obj/item/alch = 2) + tools = list(/obj/item/needle) + craftdiff = 6 + diff --git a/modular_causticcove/icons/effects/hat_blood.dmi b/modular_causticcove/icons/effects/hat_blood.dmi new file mode 100644 index 00000000000..3df94d4dbe8 Binary files /dev/null and b/modular_causticcove/icons/effects/hat_blood.dmi differ diff --git a/modular_causticcove/icons/items/hats.dmi b/modular_causticcove/icons/items/hats.dmi new file mode 100644 index 00000000000..49499d3a501 Binary files /dev/null and b/modular_causticcove/icons/items/hats.dmi differ diff --git a/modular_causticcove/icons/items/onmob/onmob.dmi b/modular_causticcove/icons/items/onmob/onmob.dmi new file mode 100644 index 00000000000..25f59fb9891 Binary files /dev/null and b/modular_causticcove/icons/items/onmob/onmob.dmi differ diff --git a/roguetown.dme b/roguetown.dme index aea436f04d4..712e5a7e941 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -3070,4 +3070,5 @@ #include "modular_causticcove\code\modules\events\adventure\random_patrols\random_patrols.dm" #include "modular_causticcove\code\modules\events\adventure\random_bosses\random_boss.dm" #include "modular_causticcove\code\modules\spells\spell_types\wizard\conjure\conjure_tool.dm" +#include "modular_causticcove\code\game\objects\items\clothes\causthats.dm" // END_INCLUDE