From 7e8e21db9c1233f74d9864ac457242a6d5a79139 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Thu, 16 May 2024 10:55:56 -0400 Subject: [PATCH] [MIRROR] Fixes some atoms conduct electricity flag (#2502) * Fixes some atoms conduct electricity flag (#83230) ## About The Pull Request Fixes: https://github.com/tgstation/tgstation/issues/83229 I think this code was done this way by a little mistake, and a metal sword should conduct electricity anyway (right?). ![Gif](https://c.tenor.com/4quSMOaGcKkAAAAd/tenor.gif) ## Why It's Good For The Game its a fix ## Changelog :cl: Rengan fix: Officers sabre and grilles now conducts electricity as it should. /:cl: * Fixes some atoms conduct electricity flag --------- Co-authored-by: RengaN02 <60517664+RengaN02@users.noreply.github.com> Co-authored-by: NovaBot13 --- code/game/objects/items/melee/misc.dm | 3 +-- code/game/objects/structures/grille.dm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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