diff --git a/nsv13/code/game/objects/items/custom_materials.dm b/nsv13/code/game/objects/items/custom_materials.dm index 6b2dea5879a..8110773c570 100644 --- a/nsv13/code/game/objects/items/custom_materials.dm +++ b/nsv13/code/game/objects/items/custom_materials.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(duranium_recipes, list ( \ icon_state = "sheet-duranium" item_state = "sheet-duranium" sheettype = "duranium" - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*7/40, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT/20, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*3/20, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*5/8) + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.175, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT*0.05, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.625) throwforce = 10 flags_1 = CONDUCT_1 resistance_flags = FIRE_PROOF @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(durasteel_recipes, list ( \ icon_state = "sheet-durasteel" item_state = "sheet-durasteel" sheettype = "durasteel" - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT/5, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*3/20, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*12/20) + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.2, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.65) throwforce = 10 flags_1 = CONDUCT_1 resistance_flags = FIRE_PROOF diff --git a/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm b/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm index fff6ffc5fa9..cfc05bf8b0f 100644 --- a/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm @@ -24,7 +24,7 @@ icon = 'nsv13/icons/obj/custom_tiles.dmi' icon_state = "durasteel_tile" force = 6 - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT/20, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*3/80, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*13/80) + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.2*0.25, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15*0.25, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.65*0.25) throwforce = 10 flags_1 = CONDUCT_1 turf_type = /turf/open/floor/durasteel @@ -135,6 +135,7 @@ icon = 'nsv13/icons/turf/dark_carpet.dmi' icon_state = "dark_carpet_tile" resistance_flags = FLAMMABLE + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.2*0.25, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15*0.25, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.65*0.25) turf_type = /turf/open/floor/carpet/ship /obj/item/stack/tile/carpet/ship/blue diff --git a/nsv13/code/modules/research/designs/smelting_designs.dm b/nsv13/code/modules/research/designs/smelting_designs.dm index 713590f5448..c998ffb364f 100644 --- a/nsv13/code/modules/research/designs/smelting_designs.dm +++ b/nsv13/code/modules/research/designs/smelting_designs.dm @@ -12,7 +12,7 @@ name = "Durasteel alloy" id = "durasteel" build_type = SMELTER | PROTOLATHE - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/silver = MINERAL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.2, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.65) build_path = /obj/item/stack/sheet/durasteel category = list("initial", "Stock Parts") departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING @@ -22,7 +22,7 @@ name = "Duranium alloy" id = "duranium" build_type = SMELTER | PROTOLATHE - materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT/2, /datum/material/silver = MINERAL_MATERIAL_AMOUNT/2) + materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT*0.175, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT*0.05, /datum/material/silver = MINERAL_MATERIAL_AMOUNT*0.15, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT*0.625) build_path = /obj/item/stack/sheet/duranium category = list("initial", "Stock Parts") departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING