From f708bb7bc4bcbd1d665a6703fdd9535bc2a2e041 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 1 Mar 2023 03:28:05 +0100 Subject: [PATCH] [MIRROR] Make glass and bone knives not conduct electricity and shocks from grille [MDB IGNORE] (#19591) * Make glass and bone knives not conduct electricity and shocks from grille (#73679) ## About The Pull Request Just making shivs more consistent with what is expected. It's weird when glass shard allows you to smash grille connected to power while shivs made out of glass dont. Extended to bone knives for the same reason. ## Why It's Good For The Game Immersium ## Changelog :cl: Remuluson2 fix: After pressure from Nanotrasen, Space Wizard Federation made glass and bone knives non-conductive again. /:cl: --------- Co-authored-by: san7890 * Make glass and bone knives not conduct electricity and shocks from grille --------- Co-authored-by: remuluson2 Co-authored-by: san7890 --- code/game/objects/items/knives.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm index 6149e4920a6..c181f6f374f 100644 --- a/code/game/objects/items/knives.dm +++ b/code/game/objects/items/knives.dm @@ -148,6 +148,10 @@ throwforce = 15 custom_materials = null +/obj/item/knife/combat/bone/Initialize(mapload) + flags_1 &= ~CONDUCT_1 + return ..() + /obj/item/knife/combat/cyborg name = "cyborg knife" icon = 'icons/obj/items_cyborg.dmi' @@ -169,6 +173,10 @@ armor_type = /datum/armor/none custom_materials = list(/datum/material/glass=400) +/obj/item/knife/shiv/Initialize(mapload) + flags_1 &= ~CONDUCT_1 + return ..() + /obj/item/knife/shiv/plasma name = "plasma shiv" icon_state = "plasmashiv"