diff --git a/code/modules/mining/lavaland/mining_loot/berserker.dm b/code/modules/mining/lavaland/mining_loot/berserker.dm index 2d84e7941cc..cc3a2d74a7f 100644 --- a/code/modules/mining/lavaland/mining_loot/berserker.dm +++ b/code/modules/mining/lavaland/mining_loot/berserker.dm @@ -13,7 +13,7 @@ icon_state = "berserker" icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' - worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // SKYRAT EDIT - DIGIS + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // BUBBER EDIT - DIGIS hoodtype = /obj/item/clothing/head/hooded/berserker armor_type = /datum/armor/hooded_berserker cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index 3713e036f54..bd8ffab6fa6 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -37,6 +37,11 @@ uses_advanced_reskins = FALSE resistance_flags = INDESTRUCTIBLE +/obj/item/clothing/neck/warrior_cape/loadout //Subtype for loadout item so i can make it not "indestructible" + name = "tattered cloak" + desc = "A cloak from a once feared foe now worn by those that have faced death in the eyes and prevailed, it looks rather worn as not as pristine as it used to be" + resistance_flags = FIRE_PROOF + /obj/item/clothing/neck/warrior_cape/examine() . = ..() . += span_warning("Struggle against the tide, no matter how strong it may be.") @@ -62,7 +67,7 @@ bio = 70 fire = 100 acid = 100 - + /datum/armor/drake_empowerment //Modular Override: nerfs beserker armour so I can keep this armour balanced laser = 10 energy = 0 @@ -235,6 +240,22 @@ new /obj/item/clothing/neck/warrior_cape(src) new /obj/item/crusher_trophy/gladiator(src) +// Bubber Edit and alt varient for berserker suit + +/obj/item/clothing/suit/hooded/berserker/gladiator + desc = "A suit of ancient body armor imbued with potent spiritual magnetism, capable of massively boosting a wearer's close combat skills at the cost of ravaging their mind and overexerting their body." + icon_state = "berk_suit" + icon = 'modular_skyrat/modules/gladiator/icons/berserk_icons.dmi' + worn_icon = 'modular_skyrat/modules/gladiator/icons/berserk_suit.dmi' + worn_icon_digi = 'modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi' + hoodtype = /obj/item/clothing/head/hooded/berserker/gladiator + +/obj/item/clothing/head/hooded/berserker/gladiator + desc = "A uniquely styled helmet with ghastly red eyes that seals it's user inside." + icon_state = "berk_helm" + icon = 'modular_skyrat/modules/gladiator/icons/berserk_icons.dmi' + worn_icon = 'modular_skyrat/modules/gladiator/icons/berserk_suit.dmi' + #undef BERSERK_MAX_CHARGE #undef PROJECTILE_HIT_MULTIPLIER #undef DAMAGE_TO_CHARGE_SCALE diff --git a/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi b/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi index 5e6edb50257..3ca6b6e654a 100644 Binary files a/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi and b/modular_skyrat/modules/gladiator/icons/berserk_suit_digi.dmi differ diff --git a/modular_zubbers/code/datums/components/crafting/tailoring.dm b/modular_zubbers/code/datums/components/crafting/tailoring.dm index e5e6b2c76f2..0c6b966acd0 100644 --- a/modular_zubbers/code/datums/components/crafting/tailoring.dm +++ b/modular_zubbers/code/datums/components/crafting/tailoring.dm @@ -59,3 +59,12 @@ /datum/crafting_recipe/modulator_gasmask/New() ..() blacklist += subtypesof(/obj/item/clothing/mask/gas) + +/datum/crafting_recipe/berserker_reskin + name = "Marked One Grafting" + result = /obj/item/clothing/suit/hooded/berserker/gladiator + reqs = list(/obj/item/clothing/suit/hooded/berserker = 1, + /obj/item/stack/ore/glass/basalt = 5, + /obj/item/stack/ore/titanium =5) + time = 5 SECONDS + category = CAT_CLOTHING diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm index 8e289d0e62f..2a251433f81 100644 --- a/modular_zubbers/code/modules/loadout/categories/neck.dm +++ b/modular_zubbers/code/modules/loadout/categories/neck.dm @@ -70,3 +70,7 @@ name = "Detective's Holobadge" item_path = /obj/item/clothing/accessory/badge/holo/detective restricted_roles = list(JOB_DETECTIVE) + +/datum/loadout_item/neck/warrior_cape_worn + name = "tattered cloak" + item_path = /obj/item/clothing/neck/warrior_cape/loadout