[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
🆑 Remuluson2
fix: After pressure from Nanotrasen, Space Wizard Federation made glass
and bone knives non-conductive again.
/🆑

---------

Co-authored-by: san7890 <the@ san7890.com>

* Make glass and bone knives not conduct electricity and shocks from grille

---------

Co-authored-by: remuluson2 <remuluson2@gmail.com>
Co-authored-by: san7890 <the@ san7890.com>
This commit is contained in:
SkyratBot
2023-03-01 03:28:05 +01:00
committed by GitHub
parent 2fdff0b56a
commit f708bb7bc4
+8
View File
@@ -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"