diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index e10277435f2..727b4256196 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -45,12 +45,12 @@ /// Breakdown flags used when exporting materials. #define BREAKDOWN_FLAGS_EXPORT (NONE) +/// Whether a material's mechanical effects should apply to the atom. This is necessary for other flags to work. +#define MATERIAL_EFFECTS (1<<0) /// Applies the material color to the atom's color. Deprecated, use MATERIAL_GREYSCALE instead -#define MATERIAL_COLOR (1<<0) +#define MATERIAL_COLOR (1<<1) /// Whether a prefix describing the material should be added to the name -#define MATERIAL_ADD_PREFIX (1<<1) -/// Whether a material's mechanical effects should apply to the atom -#define MATERIAL_NO_EFFECTS (1<<2) +#define MATERIAL_ADD_PREFIX (1<<2) /// Whether a material should affect the stats of the atom #define MATERIAL_AFFECT_STATISTICS (1<<3) /// Applies the material greyscale color to the atom's greyscale color. diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm index e2b00fd34e7..960e6e57b11 100644 --- a/code/datums/materials/meat.dm +++ b/code/datums/materials/meat.dm @@ -17,8 +17,6 @@ /datum/material/meat/on_removed(atom/source, amount, material_flags) . = ..() - if(material_flags & MATERIAL_NO_EFFECTS) - return qdel(source.GetComponent(/datum/component/edible)) /datum/material/meat/on_applied_obj(obj/O, amount, material_flags) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 19a4ec41872..37af3a34832 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1735,7 +1735,7 @@ /// Sets the custom materials for an item. /atom/proc/set_custom_materials(list/materials, multiplier = 1) - if(custom_materials) //Only runs if custom materials existed at first. Should usually be the case but check anyways + if(custom_materials && material_flags & MATERIAL_EFFECTS) //Only runs if custom materials existed at first and affected src. for(var/i in custom_materials) var/datum/material/custom_material = GET_MATERIAL_REF(i) custom_material.on_removed(src, custom_materials[i] * material_modifier, material_flags) //Remove the current materials @@ -1744,7 +1744,7 @@ custom_materials = null return - if(!(material_flags & MATERIAL_NO_EFFECTS)) + if(material_flags & MATERIAL_EFFECTS) for(var/x in materials) var/datum/material/custom_material = GET_MATERIAL_REF(x) custom_material.on_applied(src, materials[x] * multiplier * material_modifier, material_flags) diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index 74b2a679dd4..a5ba8f9ff97 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -9,7 +9,6 @@ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' obj_flags = UNIQUE_RENAME - material_flags = MATERIAL_NO_EFFECTS grind_results = list() ///List of reagents this food gets on creation var/list/food_reagents diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 162c888fd79..245db54e609 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -692,7 +692,7 @@ greyscale_config_worn = /datum/greyscale_config/cleric_mace greyscale_colors = "#FFFFFF" - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color. + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color. custom_materials = list(/datum/material/iron = 12000) //Defaults to an Iron Mace. slot_flags = ITEM_SLOT_BELT force = 14 diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index cde1b0ac4a7..c75cb5c2b73 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -26,7 +26,6 @@ var/cooldown = 0 //shield bash cooldown. based on world.time transparent = TRUE max_integrity = 75 - material_flags = MATERIAL_NO_EFFECTS /obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(transparent && (hitby.pass_flags & PASSGLASS)) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index b896660737e..bfc85de45bc 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plasmaglass grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10) - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE /obj/item/stack/sheet/plasmaglass/fifty amount = 50 @@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \ mats_per_unit = list(/datum/material/alloy/plasmaglass=MINERAL_MATERIAL_AMOUNT, /datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.5) armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100) resistance_flags = ACID_PROOF - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE merge_type = /obj/item/stack/sheet/plasmarglass grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10, /datum/reagent/iron = 10) point_value = 23 @@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( mats_per_unit = list(/datum/material/alloy/plastitaniumglass=MINERAL_MATERIAL_AMOUNT) material_type = /datum/material/alloy/plastitaniumglass armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100) - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plastitaniumglass diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index a12719a3750..55418217cfc 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \ point_value = 45 material_type = /datum/material/alloy/plastitanium merge_type = /obj/item/stack/sheet/mineral/plastitanium - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE walltype = /turf/closed/wall/mineral/plastitanium GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 77351a4228d..8c2fff419b2 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \ grind_results = list(/datum/reagent/iron = 20, /datum/reagent/toxin/plasma = 20) point_value = 23 tableVariant = /obj/structure/table/reinforced - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE matter_amount = 12 /obj/item/stack/sheet/plasteel/get_main_recipes() @@ -716,7 +716,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra desc = "Something's bloody meat compressed into a nice solid sheet." singular_name = "meat sheet" icon_state = "sheet-meat" - material_flags = MATERIAL_COLOR + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/meat material_type = /datum/material/meat @@ -769,7 +769,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra desc = "These sheets seem cursed." singular_name = "haunted sheet" icon_state = "sheet-meat" - material_flags = MATERIAL_COLOR + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/hauntium = MINERAL_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/hauntium material_type = /datum/material/hauntium diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index c9b6c04f0b1..176a33688d4 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -11,6 +11,7 @@ attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes") attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash") novariants = FALSE + material_flags = MATERIAL_EFFECTS var/sheettype = null //this is used for girders in the creation of walls/false walls var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity. ///What type of wall does this sheet spawn diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 828a9cb7c52..77bd8e50ffa 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -101,7 +101,7 @@ turf_type = /turf/open/floor/mineral/bananium mineralType = "bananium" mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT*0.25) - material_flags = MATERIAL_NO_EFFECTS //The slippery comp makes it unpractical for good clown decor. The material tiles should still slip. + material_flags = NONE //The slippery comp makes it unpractical for good clown decor. The material tiles should still slip. merge_type = /obj/item/stack/tile/mineral/bananium /obj/item/stack/tile/mineral/abductor diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 3e030502209..8b570242ba3 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -12,6 +12,7 @@ throw_range = 7 max_amount = 60 novariants = TRUE + material_flags = MATERIAL_EFFECTS /// What type of turf does this tile produce. var/turf_type = null /// What dir will the turf have? @@ -1016,7 +1017,7 @@ throwforce = 10 icon_state = "material_tile" turf_type = /turf/open/floor/material - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS merge_type = /obj/item/stack/tile/material /obj/item/stack/tile/material/place_tile(turf/open/T) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 1e1ccd58a0f..f745a364386 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -17,7 +17,7 @@ hitsound = 'sound/weapons/smash.ogg' drop_sound = 'sound/items/handling/toolbox_drop.ogg' pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' - material_flags = MATERIAL_COLOR + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR var/latches = "single_latch" var/has_latches = TRUE wound_bonus = 5 diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 880f201dff8..81786dc9e3c 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -142,7 +142,7 @@ ///Material chair /obj/structure/chair/greyscale - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS item_chair = /obj/item/chair/greyscale buildstacktype = null //Custom mats handle this @@ -398,7 +398,7 @@ smash(user) /obj/item/chair/greyscale - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS origin_type = /obj/structure/chair/greyscale /obj/item/chair/stool diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index ebae84216ba..111e02ef155 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -8,7 +8,7 @@ max_integrity = 100 CanAtmosPass = ATMOS_PASS_DENSITY material_modifier = 0.5 - material_flags = MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS blocks_emissive = EMISSIVE_BLOCK_UNIQUE /// Beauty component mood modifier var/impressiveness = 15 @@ -427,7 +427,7 @@ Moving interrupts desc = "ready for sculpting." icon = 'icons/obj/statue.dmi' icon_state = "block" - material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS | MATERIAL_ADD_PREFIX + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS | MATERIAL_ADD_PREFIX density = TRUE material_modifier = 0.5 //50% effectiveness of materials @@ -551,7 +551,7 @@ Moving interrupts icon_state = "base" obj_flags = CAN_BE_HIT | UNIQUE_RENAME appearance_flags = TILE_BOUND | PIXEL_SCALE | KEEP_TOGETHER //Added keep together in case targets has weird layering - material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS /// primary statue overlay var/mutable_appearance/content_ma var/static/list/greyscale_with_value_bump = list(0,0,0, 0,0,0, 0,0,1, 0,0,-0.05) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 0262b0c3ec5..8a90532b0bc 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -263,7 +263,7 @@ icon = 'icons/obj/smooth_structures/table_greyscale.dmi' icon_state = "table_greyscale-0" base_icon_state = "table_greyscale" - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS buildstack = null //No buildstack, so generate from mat datums ///Table on wheels diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a2c3f481bb5..7f09ebf2f93 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -146,7 +146,7 @@ contents += secret /obj/structure/toilet/greyscale - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS buildstacktype = null /obj/structure/urinal @@ -459,7 +459,7 @@ /obj/structure/sink/greyscale icon_state = "sink_greyscale" - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS buildstacktype = null /obj/structure/sinkframe @@ -468,7 +468,7 @@ icon_state = "sink_frame" desc = "A sink frame, that needs a water recycler to finish construction." anchored = FALSE - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS /obj/structure/sinkframe/ComponentInitialize() . = ..() diff --git a/code/game/turfs/closed/wall/material_walls.dm b/code/game/turfs/closed/wall/material_walls.dm index b4eab49124e..e1de7f8a98d 100644 --- a/code/game/turfs/closed/wall/material_walls.dm +++ b/code/game/turfs/closed/wall/material_walls.dm @@ -8,7 +8,7 @@ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MATERIAL_WALLS) canSmoothWith = list(SMOOTH_GROUP_MATERIAL_WALLS) rcd_memory = null - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS /turf/closed/wall/material/break_wall() for(var/i in custom_materials) diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index b9bab486663..c06416c4530 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -5,6 +5,7 @@ smoothing_flags = SMOOTH_BITMASK canSmoothWith = null rcd_memory = null + material_flags = MATERIAL_EFFECTS var/last_event = 0 var/active = null diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 74f9876d7d6..d9efc7bb5af 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -346,7 +346,7 @@ /turf/open/floor/material name = "floor" icon_state = "materialfloor" - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS floor_tile = /obj/item/stack/tile/material /turf/open/floor/material/has_tile() diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index ae4eaad12b1..79a623c4f44 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -12,6 +12,7 @@ /turf/open/floor/mineral name = "mineral floor" icon_state = "" + material_flags = MATERIAL_EFFECTS var/list/icons tiled_dirt = FALSE @@ -200,7 +201,7 @@ floor_tile = /obj/item/stack/tile/mineral/bananium icons = list("bananium","bananium_dam") custom_materials = list(/datum/material/bananium = 500) - material_flags = MATERIAL_NO_EFFECTS //The slippery comp makes it unpractical for good clown decor. The custom mat one should still slip. + material_flags = NONE //The slippery comp makes it unpractical for good clown decor. The custom mat one should still slip. var/sound_cooldown = 0 /turf/open/floor/mineral/bananium/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm index 4d6e994614f..09ef3fd25f7 100644 --- a/code/modules/atmospherics/machinery/components/tank.dm +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -11,7 +11,7 @@ layer = ABOVE_WINDOW_LAYER custom_materials = list(/datum/material/iron=20000) // plasteel is not a material to prevent two bugs: one where the default pressure is 1.5 times higher as plasteel's material modifier is added, and a second one where the tank names could be "plasteel plasteel" tanks - material_flags = MATERIAL_GREYSCALE | MATERIAL_ADD_PREFIX | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_GREYSCALE | MATERIAL_ADD_PREFIX | MATERIAL_AFFECT_STATISTICS pipe_flags = PIPING_ONE_PER_TURF device_type = QUATERNARY diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index bb4a5068774..ef267565cd3 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -349,7 +349,7 @@ icon_state = "knight_greyscale" inhand_icon_state = "knight_greyscale" armor = list(MELEE = 35, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, RAD = 10, FIRE = 40, ACID = 40) - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Can change color and add prefix + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Can change color and add prefix /obj/item/clothing/head/helmet/skull name = "skull helmet" @@ -406,7 +406,7 @@ icon_state = "h2helmet" inhand_icon_state = "h2helmet" armor = list(MELEE = 25, BULLET = 20, LASER = 30, ENERGY = 30, BOMB = 85, BIO = 10, RAD = 50, FIRE = 65, ACID = 40, WOUND = 15) - material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Can change color and add prefix + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Can change color and add prefix flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 8eeb1f27bac..735496e5968 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -313,7 +313,7 @@ desc = "A classic suit of armour, able to be made from many different materials." icon_state = "knight_greyscale" inhand_icon_state = "knight_greyscale" - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS//Can change color and add prefix + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS//Can change color and add prefix armor = list(MELEE = 35, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, RAD = 10, FIRE = 40, ACID = 40, WOUND = 15) /obj/item/clothing/suit/armor/vest/durathread @@ -349,7 +349,7 @@ desc = "A superb armor made with the toughest and rarest materials available to man." icon_state = "h2armor" inhand_icon_state = "h2armor" - material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS//Can change color and add prefix + material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS//Can change color and add prefix armor = list(MELEE = 25, BULLET = 20, LASER = 30, ENERGY = 30, BOMB = 85, BIO = 10, RAD = 50, FIRE = 65, ACID = 40, WOUND = 15) body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 5c67a8252f5..706a5da66d9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -553,7 +553,6 @@ throwforce = 8 w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT - material_flags = MATERIAL_NO_EFFECTS custom_materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/gold=500) attack_verb_continuous = list("slashes", "slices", "cuts") attack_verb_simple = list("slash", "slice", "cut") diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 34fb1021883..2abca494e9b 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -14,6 +14,7 @@ inhand_icon_state = "ore" full_w_class = WEIGHT_CLASS_BULKY singular_name = "ore chunk" + material_flags = MATERIAL_EFFECTS var/points = 0 //How many points this ore gets you from the ore redemption machine var/refined_type = null //What this ore defaults to being refined into var/mine_experience = 5 //How much experience do you get for mining this ore? @@ -75,7 +76,7 @@ inhand_icon_state = "Uranium ore" singular_name = "uranium ore chunk" points = 30 - material_flags = MATERIAL_NO_EFFECTS + material_flags = NONE mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/uranium mine_experience = 6 @@ -352,7 +353,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ throwforce = 2 w_class = WEIGHT_CLASS_TINY custom_materials = list(/datum/material/iron = 400) - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS var/string_attached var/list/sideslist = list("heads","tails") var/cooldown = 0 diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index 6ca2582ca1c..a1716fb46a4 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -10,7 +10,6 @@ resistance_flags = FLAMMABLE max_integrity = 50 grind_results = list(/datum/reagent/iodine = 4) - material_flags = MATERIAL_NO_EFFECTS var/datum/picture/picture var/scribble //Scribble on the back. diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 592cd058531..657ff2e8f47 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2581,7 +2581,7 @@ taste_mult = 0 // oderless and tasteless chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /// The material flags used to apply the transmuted materials - var/applied_material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR + var/applied_material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR /// The amount of materials to apply to the transmuted objects if they don't contain materials var/default_material_amount = 100 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index eac8125c18e..357ed276df3 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -191,7 +191,6 @@ icon_state = "beakerbluespace" custom_materials = list(/datum/material/glass = 5000, /datum/material/plasma = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) volume = 300 - material_flags = MATERIAL_NO_EFFECTS amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 17a8326f67a..dc413ff91e4 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -77,10 +77,7 @@ investigate_log("[key_name(usr)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH) message_admins("[ADMIN_LOOKUPFLW(usr)] has built [amount] of [path] at \a [src]([type]).") for(var/i in 1 to amount) - var/obj/item/I = new path(get_turf(src)) - if(efficient_with(I.type)) - I.material_flags |= MATERIAL_NO_EFFECTS //Find a better way to do this. - I.set_custom_materials(matlist) + new path(get_turf(src)) SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]")) /** diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index d0ab4d7ae02..d5d3c66282b 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -515,7 +515,6 @@ ///The medical gun doing the actual healing. yes its wierd but its better than copypasting the entire thing var/obj/item/gun/medbeam/mech/medigun custom_materials = list(/datum/material/iron = 15000, /datum/material/glass = 8000, /datum/material/plasma = 3000, /datum/material/gold = 8000, /datum/material/diamond = 2000) - material_flags = MATERIAL_NO_EFFECTS /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/Initialize() . = ..() diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index 13c9c84c894..fe1a6440c7a 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -319,8 +319,6 @@ */ /obj/machinery/mecha_part_fabricator/proc/dispense_built_part(datum/design/D) var/obj/item/I = new D.build_path(src) - I.material_flags |= MATERIAL_NO_EFFECTS //Find a better way to do this. - I.set_custom_materials(build_materials) being_built = null diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 594dc2a2278..32ef043b974 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -78,7 +78,7 @@ AddElement(/datum/element/ridable, /datum/component/riding/vehicle/wheelchair/hand) /obj/vehicle/ridden/wheelchair/gold - material_flags = MATERIAL_ADD_PREFIX | MATERIAL_AFFECT_STATISTICS + material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_AFFECT_STATISTICS desc = "Damn, he's been through a lot." icon_state = "gold_wheelchair" overlay_icon = "gold_wheelchair_overlay"