diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index ee769900a11..cdbe10bbea0 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -519,8 +519,8 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \ //Metal Hydrogen GLOBAL_LIST_INIT(metalhydrogen_recipes, list( new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=20, res_amount=1, crafting_flags = NONE, category = CAT_ROBOT), - new /datum/stack_recipe("ancient armor", /obj/item/clothing/suit/armor/elder_atmosian, req_amount = 5, res_amount = 1, crafting_flags = NONE, category = CAT_CLOTHING), - new /datum/stack_recipe("ancient helmet", /obj/item/clothing/head/helmet/elder_atmosian, req_amount = 3, res_amount = 1, crafting_flags = NONE, category = CAT_CLOTHING), + //new /datum/stack_recipe("ancient armor", /obj/item/clothing/suit/armor/elder_atmosian, req_amount = 5, res_amount = 1, crafting_flags = NONE, category = CAT_CLOTHING), BUBBER REMOVE + //new /datum/stack_recipe("ancient helmet", /obj/item/clothing/head/helmet/elder_atmosian, req_amount = 3, res_amount = 1, crafting_flags = NONE, category = CAT_CLOTHING), BUBBER REMOVE new /datum/stack_recipe("metallic hydrogen axe", /obj/item/fireaxe/metal_h2_axe, req_amount = 15, res_amount = 1, crafting_flags = NONE, category = CAT_WEAPON_MELEE), new /datum/stack_recipe("metallic hydrogen bolts", /obj/item/ammo_casing/rebar/hydrogen, req_amount = 1, res_amount = 1, crafting_flags = NONE, category = CAT_WEAPON_AMMO), )) diff --git a/modular_zubbers/code/datums/components/crafting/tailoring.dm b/modular_zubbers/code/datums/components/crafting/tailoring.dm index 8c100f899ac..081466265ab 100644 --- a/modular_zubbers/code/datums/components/crafting/tailoring.dm +++ b/modular_zubbers/code/datums/components/crafting/tailoring.dm @@ -77,3 +77,22 @@ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) reqs = list(/obj/item/clothing/glasses/hud/civilian/sunglasses = 1) category = CAT_EQUIPMENT + +// Metal H2 Rework by Xiska + +/datum/crafting_recipe/atmos_armor_crafting + name = "Elder Atmosian Armor" + result = /obj/item/clothing/suit/armor/elder_atmosian + time = 40 SECONDS + reqs = list(/obj/item/stack/sheet/mineral/metal_hydrogen = 5, + /obj/item/clothing/suit/utility/fire/atmos = 1) + category = CAT_CLOTHING + + +/datum/crafting_recipe/atmos_helmet_crafting + name = "Elder Atmosian Helmet" + result = /obj/item/clothing/head/helmet/elder_atmosian + time = 40 SECONDS + reqs = list(/obj/item/stack/sheet/mineral/metal_hydrogen = 3, + /obj/item/clothing/head/utility/hardhat/welding/atmos = 1) + category = CAT_CLOTHING diff --git a/modular_zubbers/code/game/Items/metal_h2_fireaxe.dm b/modular_zubbers/code/game/Items/metal_h2_fireaxe.dm new file mode 100644 index 00000000000..552ca4dff14 --- /dev/null +++ b/modular_zubbers/code/game/Items/metal_h2_fireaxe.dm @@ -0,0 +1,4 @@ +/obj/item/fireaxe/metal_h2_axe + desc = "A lightweight crowbar with an extremely sharp fire axe head attached. It trades its heft as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack." + force_wielded = 20 + wound_bonus = -10 diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index 02936cda9a9..2d8154d805d 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -660,3 +660,27 @@ ) // END HATS ADDED BY APRIL + +/obj/item/clothing/head/helmet/elder_atmosian + desc = "The pinnacle of atmospherics equipment, an expensive modified atmospherics fire helmet plated in one of the most luxurous and durable metals known to man. Providing full atmos coverage without the heavy materials to slow the user down, it also offers far greater protection to most sources of damage, even offering great protection against gases, and other nasty things that try to get into your face." + icon = 'modular_zubbers/icons/obj/clothing/head/helmet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi' + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | STACKABLE_HELMET_EXEMPT | SNUG_FIT | HEADINTERNALS + heat_protection = HEAD + cold_protection = HEAD + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + resistance_flags = FIRE_PROOF + flags_inv = HIDEFACE | HIDEFACIALHAIR | HIDEHAIR | HIDEMASK | HIDEEYES | HIDEEARS + +/datum/armor/helmet_elder_atmosian + melee = 40 + bullet = 30 + laser = 40 + energy = 40 + bomb = 100 + bio = 50 + fire = 100 + acid = 50 + wound = 25 diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm index 972e2d0b757..8cadbf0944a 100644 --- a/modular_zubbers/code/modules/clothing/suits/armor.dm +++ b/modular_zubbers/code/modules/clothing/suits/armor.dm @@ -105,3 +105,32 @@ /obj/item/clothing/suit/armor/vest/maid/Initialize(mapload) . = ..() allowed += GLOB.security_vest_allowed + +/obj/item/clothing/suit/armor/elder_atmosian + desc = "The pinnacle of atmospherics equipment, an expensive modified atmospherics firesuit plated in one of the most luxurious and durable metals known to man. Providing full atmos coverage without the heavy materials of the firesuit to slow the user down, it also offers far greater protection to most sources of damage." + icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi' + worn_icon_teshari = 'modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi' + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + resistance_flags = FIRE_PROOF + flags_inv = HIDEJUMPSUIT | HIDESHOES | HIDEGLOVES | HIDETAIL + +/obj/item/clothing/suit/armor/elder_atmosian/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/fireaxe/metal_h2_axe, + ) + +/datum/armor/armor_elder_atmosian + melee = 40 + bullet = 30 + laser = 40 + energy = 40 + bomb = 100 + bio = 50 + fire = 100 + acid = 50 + wound = 25 diff --git a/modular_zubbers/icons/mob/clothing/head/helmet.dmi b/modular_zubbers/icons/mob/clothing/head/helmet.dmi index be3eeb2c975..08250d6ba75 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/helmet.dmi and b/modular_zubbers/icons/mob/clothing/head/helmet.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi b/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi new file mode 100644 index 00000000000..39eeba0d961 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/head/helmet_teshari.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor.dmi b/modular_zubbers/icons/mob/clothing/suits/armor.dmi index b28e4a5e846..3114e62e15e 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi b/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi index 931b7af4543..4f17c935b6e 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor_digi.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi index 24e3325ec6a..9641ada8da8 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor_teshari.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/head/helmet.dmi b/modular_zubbers/icons/obj/clothing/head/helmet.dmi index 1a1a4ac1dc0..875152e0fa6 100644 Binary files a/modular_zubbers/icons/obj/clothing/head/helmet.dmi and b/modular_zubbers/icons/obj/clothing/head/helmet.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/suits/armor.dmi b/modular_zubbers/icons/obj/clothing/suits/armor.dmi index ec91e8f3fbc..18f3e9e06c5 100644 Binary files a/modular_zubbers/icons/obj/clothing/suits/armor.dmi and b/modular_zubbers/icons/obj/clothing/suits/armor.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 52c6b3fbca6..4092d7524b3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8998,6 +8998,7 @@ #include "modular_zubbers\code\game\Items\big_bertha_shield.dm" #include "modular_zubbers\code\game\Items\coins.dm" #include "modular_zubbers\code\game\Items\lipstick.dm" +#include "modular_zubbers\code\game\Items\metal_h2_fireaxe.dm" #include "modular_zubbers\code\game\Items\nerdcrowbar.dm" #include "modular_zubbers\code\game\Items\plushes.dm" #include "modular_zubbers\code\game\Items\storage\backpack.dm"