diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index b9471113d83..e60b6bce5a4 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -60,8 +60,7 @@ inhand_icon_state = "sabre" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - obj_flags = CONDUCTS_ELECTRICITY - obj_flags = UNIQUE_RENAME + obj_flags = CONDUCTS_ELECTRICITY | UNIQUE_RENAME force = 15 throwforce = 10 demolition_mod = 0.75 //but not metal diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a25dfaada50..37b894e2773 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -10,8 +10,7 @@ density = TRUE anchored = TRUE pass_flags_self = PASSGRILLE | PASSWINDOW - obj_flags = CONDUCTS_ELECTRICITY - obj_flags = CAN_BE_HIT | IGNORE_DENSITY + obj_flags = CONDUCTS_ELECTRICITY | CAN_BE_HIT | IGNORE_DENSITY pressure_resistance = 5*ONE_ATMOSPHERE armor_type = /datum/armor/structure_grille max_integrity = 50